diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 10:44:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 10:44:16 -0500 |
commit | aebb2afd5420c860b7fbc3882a323ef1247fbf16 (patch) | |
tree | 05ee0efcebca5ec421de44de7a6d6271088c64a8 /arch/mips/Kconfig | |
parent | 8eae508b7c6ff502a71d0293b69e97c5505d5840 (diff) | |
parent | edb15d83a875a1f4b1576188844db5c330c3267d (diff) |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
o Add basic support for the Mediatek/Ralink Wireless SoC family.
o The Qualcomm Atheros platform is extended by support for the new
QCA955X SoC series as well as a bunch of patches that get the code
ready for OF support.
o Lantiq and BCM47XX platform have a few improvements and bug fixes.
o MIPS has sent a few patches that get the kernel ready for the
upcoming microMIPS support.
o The rest of the series is made up of small bug fixes and cleanups
that relate to various parts of the MIPS code. The biggy in there is
a whitespace cleanup. After I was sent another set of whitespace
cleanup patches I decided it was the time to clean the whitespace
"issues" for once and and that touches many files below arch/mips/.
Fix up silly conflicts, mostly due to whitespace cleanups.
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
MIPS: remove broken conditional inside vpe loader code
MIPS: SMTC: fix implicit declaration of set_vi_handler
MIPS: early_printk: drop __init annotations
MIPS: Probe for and report hardware virtualization support.
MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
MIPS: ath79: add USB controller registration code for the QCA955X SoCs
MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
MIPS: ath79: add WMAC registration code for the QCA955X SoCs
MIPS: ath79: register UART for the QCA955X SoCs
MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
MIPS: ath79: add GPIO setup code for the QCA955X SoCs
MIPS: ath79: add IRQ handling code for the QCA955X SoCs
MIPS: ath79: add clock setup code for the QCA955X SoCs
MIPS: ath79: add SoC detection code for the QCA955X SoCs
MIPS: ath79: add early printk support for the QCA955X SoCs
MIPS: ath79: fix WMAC IRQ resource assignment
mips: reserve elfcorehdr
mips: Make sure kernel memory is in iomem
MIPS: ath79: use dynamically allocated USB platform devices
...
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1eabe5753215..ae9c716c46bb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -108,12 +108,14 @@ config ATH79 | |||
108 | config BCM47XX | 108 | config BCM47XX |
109 | bool "Broadcom BCM47XX based boards" | 109 | bool "Broadcom BCM47XX based boards" |
110 | select ARCH_WANT_OPTIONAL_GPIOLIB | 110 | select ARCH_WANT_OPTIONAL_GPIOLIB |
111 | select BOOT_RAW | ||
111 | select CEVT_R4K | 112 | select CEVT_R4K |
112 | select CSRC_R4K | 113 | select CSRC_R4K |
113 | select DMA_NONCOHERENT | 114 | select DMA_NONCOHERENT |
114 | select FW_CFE | 115 | select FW_CFE |
115 | select HW_HAS_PCI | 116 | select HW_HAS_PCI |
116 | select IRQ_CPU | 117 | select IRQ_CPU |
118 | select NO_EXCEPT_FILL | ||
117 | select SYS_SUPPORTS_32BIT_KERNEL | 119 | select SYS_SUPPORTS_32BIT_KERNEL |
118 | select SYS_SUPPORTS_LITTLE_ENDIAN | 120 | select SYS_SUPPORTS_LITTLE_ENDIAN |
119 | select SYS_HAS_EARLY_PRINTK | 121 | select SYS_HAS_EARLY_PRINTK |
@@ -295,6 +297,7 @@ config MIPS_MALTA | |||
295 | select BOOT_RAW | 297 | select BOOT_RAW |
296 | select CEVT_R4K | 298 | select CEVT_R4K |
297 | select CSRC_R4K | 299 | select CSRC_R4K |
300 | select CSRC_GIC | ||
298 | select DMA_NONCOHERENT | 301 | select DMA_NONCOHERENT |
299 | select GENERIC_ISA_DMA | 302 | select GENERIC_ISA_DMA |
300 | select HAVE_PCSPKR_PLATFORM | 303 | select HAVE_PCSPKR_PLATFORM |
@@ -354,6 +357,7 @@ config MIPS_SEAD3 | |||
354 | select USB_ARCH_HAS_EHCI | 357 | select USB_ARCH_HAS_EHCI |
355 | select USB_EHCI_BIG_ENDIAN_DESC | 358 | select USB_EHCI_BIG_ENDIAN_DESC |
356 | select USB_EHCI_BIG_ENDIAN_MMIO | 359 | select USB_EHCI_BIG_ENDIAN_MMIO |
360 | select USE_OF | ||
357 | help | 361 | help |
358 | This enables support for the MIPS Technologies SEAD3 evaluation | 362 | This enables support for the MIPS Technologies SEAD3 evaluation |
359 | board. | 363 | board. |
@@ -385,16 +389,6 @@ config NXP_STB225 | |||
385 | help | 389 | help |
386 | Support for NXP Semiconductors STB225 Development Board. | 390 | Support for NXP Semiconductors STB225 Development Board. |
387 | 391 | ||
388 | config PNX8550_JBS | ||
389 | bool "NXP PNX8550 based JBS board" | ||
390 | select PNX8550 | ||
391 | select SYS_SUPPORTS_LITTLE_ENDIAN | ||
392 | |||
393 | config PNX8550_STB810 | ||
394 | bool "NXP PNX8550 based STB810 board" | ||
395 | select PNX8550 | ||
396 | select SYS_SUPPORTS_LITTLE_ENDIAN | ||
397 | |||
398 | config PMC_MSP | 392 | config PMC_MSP |
399 | bool "PMC-Sierra MSP chipsets" | 393 | bool "PMC-Sierra MSP chipsets" |
400 | select CEVT_R4K | 394 | select CEVT_R4K |
@@ -434,6 +428,22 @@ config POWERTV | |||
434 | help | 428 | help |
435 | This enables support for the Cisco PowerTV Platform. | 429 | This enables support for the Cisco PowerTV Platform. |
436 | 430 | ||
431 | config RALINK | ||
432 | bool "Ralink based machines" | ||
433 | select CEVT_R4K | ||
434 | select CSRC_R4K | ||
435 | select BOOT_RAW | ||
436 | select DMA_NONCOHERENT | ||
437 | select IRQ_CPU | ||
438 | select USE_OF | ||
439 | select SYS_HAS_CPU_MIPS32_R1 | ||
440 | select SYS_HAS_CPU_MIPS32_R2 | ||
441 | select SYS_SUPPORTS_32BIT_KERNEL | ||
442 | select SYS_SUPPORTS_LITTLE_ENDIAN | ||
443 | select SYS_HAS_EARLY_PRINTK | ||
444 | select HAVE_MACH_CLKDEV | ||
445 | select CLKDEV_LOOKUP | ||
446 | |||
437 | config SGI_IP22 | 447 | config SGI_IP22 |
438 | bool "SGI IP22 (Indy/Indigo2)" | 448 | bool "SGI IP22 (Indy/Indigo2)" |
439 | select FW_ARC | 449 | select FW_ARC |
@@ -835,8 +845,9 @@ source "arch/mips/jazz/Kconfig" | |||
835 | source "arch/mips/jz4740/Kconfig" | 845 | source "arch/mips/jz4740/Kconfig" |
836 | source "arch/mips/lantiq/Kconfig" | 846 | source "arch/mips/lantiq/Kconfig" |
837 | source "arch/mips/lasat/Kconfig" | 847 | source "arch/mips/lasat/Kconfig" |
838 | source "arch/mips/pmc-sierra/Kconfig" | 848 | source "arch/mips/pmcs-msp71xx/Kconfig" |
839 | source "arch/mips/powertv/Kconfig" | 849 | source "arch/mips/powertv/Kconfig" |
850 | source "arch/mips/ralink/Kconfig" | ||
840 | source "arch/mips/sgi-ip27/Kconfig" | 851 | source "arch/mips/sgi-ip27/Kconfig" |
841 | source "arch/mips/sibyte/Kconfig" | 852 | source "arch/mips/sibyte/Kconfig" |
842 | source "arch/mips/txx9/Kconfig" | 853 | source "arch/mips/txx9/Kconfig" |
@@ -917,6 +928,9 @@ config CSRC_POWERTV | |||
917 | config CSRC_R4K | 928 | config CSRC_R4K |
918 | bool | 929 | bool |
919 | 930 | ||
931 | config CSRC_GIC | ||
932 | bool | ||
933 | |||
920 | config CSRC_SB1250 | 934 | config CSRC_SB1250 |
921 | bool | 935 | bool |
922 | 936 | ||
@@ -1103,19 +1117,6 @@ config SOC_PNX8335 | |||
1103 | bool | 1117 | bool |
1104 | select SOC_PNX833X | 1118 | select SOC_PNX833X |
1105 | 1119 | ||
1106 | config PNX8550 | ||
1107 | bool | ||
1108 | select SOC_PNX8550 | ||
1109 | |||
1110 | config SOC_PNX8550 | ||
1111 | bool | ||
1112 | select DMA_NONCOHERENT | ||
1113 | select HW_HAS_PCI | ||
1114 | select SYS_HAS_CPU_MIPS32_R1 | ||
1115 | select SYS_HAS_EARLY_PRINTK | ||
1116 | select SYS_SUPPORTS_32BIT_KERNEL | ||
1117 | select GENERIC_GPIO | ||
1118 | |||
1119 | config SWAP_IO_SPACE | 1120 | config SWAP_IO_SPACE |
1120 | bool | 1121 | bool |
1121 | 1122 | ||