diff options
| -rw-r--r-- | arch/mips/Kconfig | 11 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-loongson64/loongson.h | 2 | ||||
| -rw-r--r-- | arch/mips/loongson64/Kconfig | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8272ea4c7264..7d28c9dd75d0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -3040,17 +3040,6 @@ config PCI | |||
| 3040 | your box. Other bus systems are ISA, EISA, or VESA. If you have PCI, | 3040 | your box. Other bus systems are ISA, EISA, or VESA. If you have PCI, |
| 3041 | say Y, otherwise N. | 3041 | say Y, otherwise N. |
| 3042 | 3042 | ||
| 3043 | config HT_PCI | ||
| 3044 | bool "Support for HT-linked PCI" | ||
| 3045 | default y | ||
| 3046 | depends on CPU_LOONGSON3 | ||
| 3047 | select PCI | ||
| 3048 | select PCI_DOMAINS | ||
| 3049 | help | ||
| 3050 | Loongson family machines use Hyper-Transport bus for inter-core | ||
| 3051 | connection and device connection. The PCI bus is a subordinate | ||
| 3052 | linked at HT. Choose Y for Loongson-3 based machines. | ||
| 3053 | |||
| 3054 | config PCI_DOMAINS | 3043 | config PCI_DOMAINS |
| 3055 | bool | 3044 | bool |
| 3056 | 3045 | ||
diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h index d0ae5d55413b..b6870fec0f99 100644 --- 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) | |||
| 113 | #define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */ | 113 | #define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */ |
| 114 | #define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1) | 114 | #define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1) |
| 115 | 115 | ||
| 116 | #if defined(CONFIG_HT_PCI) | 116 | #ifdef CONFIG_CPU_LOONGSON3 |
| 117 | #define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base | 117 | #define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base |
| 118 | #else | 118 | #else |
| 119 | #define LOONGSON_PCIIO_BASE 0x1fd00000 | 119 | #define LOONGSON_PCIIO_BASE 0x1fd00000 |
diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig index c865b4b9b775..781a5156ab21 100644 --- a/arch/mips/loongson64/Kconfig +++ b/arch/mips/loongson64/Kconfig | |||
| @@ -76,7 +76,7 @@ config LOONGSON_MACH3X | |||
| 76 | select CPU_HAS_WB | 76 | select CPU_HAS_WB |
| 77 | select HW_HAS_PCI | 77 | select HW_HAS_PCI |
| 78 | select ISA | 78 | select ISA |
| 79 | select HT_PCI | 79 | select PCI |
| 80 | select I8259 | 80 | select I8259 |
| 81 | select IRQ_MIPS_CPU | 81 | select IRQ_MIPS_CPU |
| 82 | select NR_CPUS_DEFAULT_4 | 82 | select NR_CPUS_DEFAULT_4 |
