forked from Minki/linux
95360fd636
Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up to
maintain it).
- Qualcomm has added DT-only board support for a couple of their newer SoCs.
- misc other updates for Samsung and Freescale boards.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJQaO5+AAoJEIwa5zzehBx34OAP/00W1eziYwliv08FeQ4M6Rum
OSFI1qBXubCZwyzczyM7r6ArnhdmJz0e2p1WEbS1hIQRjYR+pTwzBOSRsU460WsM
Hy3CYV7SQb551rEC3yPoVst24TgBoDJah3UORfEmi0hIMoWDPqEV/erpI2+sSLzz
KbQpI6C8V4MvLELSM1YxljorT50cRmoD+J1bdO6jI68bAwIMWBVPhezqg4/k8Gkh
TqfP2zoc/O9jlc6zgMJc1T+M/CLyFYJeV63dNQ4ER54NFdUs+NdHItNHjJlGAOSQ
2e4NDUKKklxLUno+kyTiTkWkFEgxu9W8XLZi6CLNGCO4gsiM8ljVAdW0xuWeXFkX
1OucFrBYEMonKEEWURvtNpYyEu9/Wz5WCInmqM5u92w/+GIzBYzr6sbircCOAXBv
UlVmvIltrhpTPkAuLkG/hL6KVV2UiNcr2hgALlhhnQ68hTzGGZrvUWuNCB6zjrHF
okl1bmo6kjtj9A09YmXFEPL8l8q9hRWirWTnyLWAjoeDY1juy+SdVx+8CJy/2ua5
QllqN3SGOX2WVMuBo6C24lwRa21cQ7Ax8GCavuKKB0eyIrWer1pVhO6xZCwii1gG
iZgpaOZpeOe4lms1oD2RqjV8GlW6DQAaLINlqHzj3G/BcRTMN4S/QD2S47yMgCPc
Kf1zsyukeBhfVWTUULEE
=fe76
-----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc board specific updates from Olof Johansson:
"Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up
to maintain it).
- Qualcomm has added DT-only board support for a couple of their
newer SoCs.
- misc other updates for Samsung and Freescale boards."
Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
due to gpio device data being added next to hdmi device data that got moved.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: msm: Allow 8960 and 8660 to compile together
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Use generic pwm driver in Origen board
ARM: shmobile: armadillo800eva: Add support RTC
ARM: ks8695: add board support for the OpenGear boards based on the KS8695
ARM: ks8695: add board support for the SnapGear boards based on the KS8695
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
ARM: mmp: enable debug uart port in defconfig
ARM: mmp: implement DEBUG_LL port choice
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
ARM: mx27pdk: Add audio support
ARM: ttc_dkb: add nand support
138 lines
2.3 KiB
Plaintext
138 lines
2.3 KiB
Plaintext
if ARCH_MSM
|
|
|
|
comment "Qualcomm MSM SoC Type"
|
|
depends on (ARCH_MSM8X60 || ARCH_MSM8960)
|
|
|
|
choice
|
|
prompt "Qualcomm MSM SoC Type"
|
|
default ARCH_MSM7X00A
|
|
depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
|
|
|
|
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
|
|
|
|
endchoice
|
|
|
|
config ARCH_MSM8X60
|
|
bool "MSM8X60"
|
|
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
|
|
select USE_OF
|
|
|
|
config ARCH_MSM8960
|
|
bool "MSM8960"
|
|
select ARCH_MSM_SCORPIONMP
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select MSM_V2_TLMM
|
|
select MSM_GPIOMUX
|
|
select MSM_SCM if SMP
|
|
select USE_OF
|
|
|
|
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.
|
|
|
|
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
|