forked from luck/tmp_suning_uos_patched
acc952c1f3
Cleanup patches for various ARM platforms and some of their associated drivers, the bulk of these is for mach-91. I ended up pulling in the restart branch from Russell in order to fix up some simple but annoying merge conflicts. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUATwtcbmCrR//JCVInAQLONg/+PnaGQ9gt+dRQD1kzvOl1uE4veBD4KJ3j k3ew36OpcbkjKbcZjkN42tXbM5nBAC5A9w+iKy0RZvvxO+iay8A3IdYhlnpJhMCY LLvv8bUltR3iB5BPJO8MXgUAkHbec/8yGZ+Zu9LfQOC8LvaXW4ARiy7RLuA01MAM EUyL0cSAS5iztlJ1j9qwaQ+k6kReLSVkG1MRcTjPwHu75zWA2ADdQmkfb1jo6v9o 3NF4QX2aw2tpPWn7B443irVLiZFG01gBugktl2z4VcNEHLHaU7eJUddh9146FVFd WZPz6y4qJHXJkAsL2QdEHwCet2yphf32XXAGJVVOSsr5EEqfAawPLQCt8qPaN6Un M+BLVlf3Wtv6JmGC+ECYvHEKdu04Zw1ia43cG7VOCgpoZjdo2HgaHIjL2t96Zj7N OpESMNiSp8++G7Gw+TxovDG93nBT459A12i3xhf/ljz2X1ADDSc6S0h+Vfi17201 XcLH9ctJn17TfO8+KBwSYM3W3V1I6APHoKRN41q4u+fHnxu93jLnMeGDqRyscxRq BWvH1XmbkLBEb0HPtN30rTkVEnOMx4ZozM6/htVrdSRLKO+ss7XCRXLbWZxx3mWb sCvc1E5A1GmPmhOE8P+DqFVZlZXsIVHPsnp/nLjzCZFsIv0x2RdGjd7wXK605z0Z d+u3fNUEiHA= =9q+1 -----END PGP SIGNATURE----- Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Cleanups on various subarchitectures Cleanup patches for various ARM platforms and some of their associated drivers, the bulk of these is for mach-91. Arnd ended up pulling in the restart branch from Russell in order to fix up some simple but annoying merge conflicts. * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits) arm/at91: fix build of stamp9g20 ARM: u300: delete memory.h MAINTAINERS: add maintainer entry for Picochip picoxcell ARM: picoxcell: move io mappings to common.c ARM: picoxcell: don't reserve irq_descs ARM: picoxcell: remove mach/memory.h ARM: at91: delete the pcontrol_g20_defconfig arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC arm/tegra: remove unused defines arm/tegra: fix variable formatting in makefile ARM: davinci: vpif: move code to driver core header from platform ARM: at91/gpio: fix display of number of irq setuped ARM: at91/gpio: drop PIN_BASE ARM: at91/udc: use gpio_is_valid to check the gpio ARM: at91/ohci: use gpio_is_valid to check the gpio ARM: at91/nand: use gpio_is_valid to check the gpio ARM: at91/mmc: use gpio_is_valid to check the gpio ARM: at91/ide: use gpio_is_valid to check the gpio ARM: at91/pata: use gpio_is_valid to check the gpio ARM: at91/soc: use gpio_is_valid to check the gpio ...
171 lines
3.0 KiB
Plaintext
171 lines
3.0 KiB
Plaintext
if ARCH_MSM
|
|
|
|
choice
|
|
prompt "Qualcomm MSM SoC Type"
|
|
default ARCH_MSM7X00A
|
|
|
|
config ARCH_MSM7X00A
|
|
bool "MSM7x00A / MSM7x01A"
|
|
select MACH_TROUT if !MACH_HALIBUT
|
|
select ARCH_MSM_ARM11
|
|
select MSM_SMD
|
|
select MSM_SMD_PKG3
|
|
select CPU_V6
|
|
select GPIO_MSM_V1
|
|
select MSM_PROC_COMM
|
|
|
|
config ARCH_MSM7X30
|
|
bool "MSM7x30"
|
|
select MACH_MSM7X30_SURF # if !
|
|
select ARCH_MSM_SCORPION
|
|
select MSM_SMD
|
|
select MSM_VIC
|
|
select CPU_V7
|
|
select MSM_GPIOMUX
|
|
select GPIO_MSM_V1
|
|
select MSM_PROC_COMM
|
|
|
|
config ARCH_QSD8X50
|
|
bool "QSD8X50"
|
|
select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
|
|
select ARCH_MSM_SCORPION
|
|
select MSM_SMD
|
|
select MSM_VIC
|
|
select CPU_V7
|
|
select MSM_GPIOMUX
|
|
select GPIO_MSM_V1
|
|
select MSM_PROC_COMM
|
|
|
|
config ARCH_MSM8X60
|
|
bool "MSM8X60"
|
|
select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
|
|
&& !MACH_MSM8X60_FFA)
|
|
select ARCH_MSM_SCORPIONMP
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select MSM_V2_TLMM
|
|
select GPIO_MSM_V2
|
|
select MSM_GPIOMUX
|
|
select MSM_SCM if SMP
|
|
|
|
config ARCH_MSM8960
|
|
bool "MSM8960"
|
|
select ARCH_MSM_SCORPIONMP
|
|
select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select MSM_V2_TLMM
|
|
select MSM_GPIOMUX
|
|
select MSM_SCM if SMP
|
|
|
|
endchoice
|
|
|
|
config MSM_HAS_DEBUG_UART_HS
|
|
bool
|
|
|
|
config MSM_SOC_REV_A
|
|
bool
|
|
config ARCH_MSM_SCORPIONMP
|
|
bool
|
|
select HAVE_SMP
|
|
|
|
config ARCH_MSM_ARM11
|
|
bool
|
|
config ARCH_MSM_SCORPION
|
|
bool
|
|
|
|
config MSM_VIC
|
|
bool
|
|
|
|
menu "Qualcomm MSM Board Type"
|
|
|
|
config MACH_HALIBUT
|
|
depends on ARCH_MSM
|
|
depends on ARCH_MSM7X00A
|
|
bool "Halibut Board (QCT SURF7201A)"
|
|
help
|
|
Support for the Qualcomm SURF7201A eval board.
|
|
|
|
config MACH_TROUT
|
|
depends on ARCH_MSM
|
|
depends on ARCH_MSM7X00A
|
|
bool "HTC Dream (aka trout)"
|
|
help
|
|
Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
|
|
|
|
config MACH_MSM7X30_SURF
|
|
depends on ARCH_MSM7X30
|
|
bool "MSM7x30 SURF"
|
|
help
|
|
Support for the Qualcomm MSM7x30 SURF eval board.
|
|
|
|
config MACH_QSD8X50_SURF
|
|
depends on ARCH_QSD8X50
|
|
bool "QSD8x50 SURF"
|
|
help
|
|
Support for the Qualcomm QSD8x50 SURF eval board.
|
|
|
|
config MACH_QSD8X50A_ST1_5
|
|
depends on ARCH_QSD8X50
|
|
select MSM_SOC_REV_A
|
|
bool "QSD8x50A ST1.5"
|
|
help
|
|
Support for the Qualcomm ST1.5.
|
|
|
|
config MACH_MSM8X60_RUMI3
|
|
depends on ARCH_MSM8X60
|
|
bool "MSM8x60 RUMI3"
|
|
help
|
|
Support for the Qualcomm MSM8x60 RUMI3 emulator.
|
|
|
|
config MACH_MSM8X60_SURF
|
|
depends on ARCH_MSM8X60
|
|
bool "MSM8x60 SURF"
|
|
help
|
|
Support for the Qualcomm MSM8x60 SURF eval board.
|
|
|
|
config MACH_MSM8X60_SIM
|
|
depends on ARCH_MSM8X60
|
|
bool "MSM8x60 Simulator"
|
|
help
|
|
Support for the Qualcomm MSM8x60 simulator.
|
|
|
|
config MACH_MSM8X60_FFA
|
|
depends on ARCH_MSM8X60
|
|
bool "MSM8x60 FFA"
|
|
help
|
|
Support for the Qualcomm MSM8x60 FFA eval board.
|
|
|
|
config MACH_MSM8960_SIM
|
|
depends on ARCH_MSM8960
|
|
bool "MSM8960 Simulator"
|
|
help
|
|
Support for the Qualcomm MSM8960 simulator.
|
|
|
|
config MACH_MSM8960_RUMI3
|
|
depends on ARCH_MSM8960
|
|
bool "MSM8960 RUMI3"
|
|
help
|
|
Support for the Qualcomm MSM8960 RUMI3 emulator.
|
|
|
|
endmenu
|
|
|
|
config MSM_SMD_PKG3
|
|
bool
|
|
|
|
config MSM_PROC_COMM
|
|
bool
|
|
|
|
config MSM_SMD
|
|
bool
|
|
|
|
config MSM_GPIOMUX
|
|
bool
|
|
|
|
config MSM_V2_TLMM
|
|
bool
|
|
|
|
config MSM_SCM
|
|
bool
|
|
endif
|