MIPS: remove the HT_PCI config option

This option is always selected from LOONGSON_MACH3X.  Switch to just
seleting PCI from that option and definining LOONGSON_PCIIO_BASE based
on CONFIG_LOONGSON_MACH3X.  PCI already selects PCI_DOMAINS.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 8272ea4c72645777b0174907f621d57040857599..7d28c9dd75d04f12950f4cdf8ac95f6aab4327b5 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3040,17 +3040,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 
-config HT_PCI
-       bool "Support for HT-linked PCI"
-       default y
-       depends on CPU_LOONGSON3
-       select PCI
-       select PCI_DOMAINS
-       help
-         Loongson family machines use Hyper-Transport bus for inter-core
-         connection and device connection. The PCI bus is a subordinate
-         linked at HT. Choose Y for Loongson-3 based machines.
-
 config PCI_DOMAINS
        bool
 

diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h
index d0ae5d55413b68f48c8aaa3703bdb3217c9919c1..b6870fec0f99f9c86f4231b26ef9516bb3dd635c 100644 (file)
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void)
 #define LOONGSON_PCICFG_SIZE   0x00000800      /* 2K */
 #define LOONGSON_PCICFG_TOP    (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1)
 
-#if defined(CONFIG_HT_PCI)
+#ifdef CONFIG_CPU_LOONGSON3
 #define LOONGSON_PCIIO_BASE    loongson_sysconf.pci_io_base
 #else
 #define LOONGSON_PCIIO_BASE    0x1fd00000

diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig
index c865b4b9b77503b6a8ae6ce4d8cad25c26ef41ad..781a5156ab21feb3e510bede389e5cf9b01a9edf 100644 (file)
--- a/arch/mips/loongson64/Kconfig
+++ b/arch/mips/loongson64/Kconfig
@@ -76,7 +76,7 @@ config LOONGSON_MACH3X
        select CPU_HAS_WB
        select HW_HAS_PCI
        select ISA
-       select HT_PCI
+       select PCI
        select I8259
        select IRQ_MIPS_CPU
        select NR_CPUS_DEFAULT_4