From: Linus Torvalds Date: Tue, 2 Oct 2012 01:48:30 +0000 (-0700) Subject: Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: MMI-PSA29.97-13-9~15880 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95360fd63606918167a5365b770a6d28d333f0ed;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'boards' of git://git./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 --- 95360fd63606918167a5365b770a6d28d333f0ed diff --cc arch/arm/mach-msm/Kconfig index b2740c800e8c,03c549369ce3..7902de151cc5 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@@ -36,8 -40,12 +40,10 @@@ config ARCH_QSD8X5 select GPIO_MSM_V1 select MSM_PROC_COMM + endchoice + 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 @@@ -55,10 -63,7 +61,8 @@@ config ARCH_MSM896 select MSM_V2_TLMM select MSM_GPIOMUX select MSM_SCM if SMP + select USE_OF - endchoice - config MSM_HAS_DEBUG_UART_HS bool diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c index 45b33e02dff5,81dfb88ce813..9615a78d30b2 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@@ -902,8 -924,9 +925,9 @@@ static struct platform_device *eva_devi &camera_device, &ceu0_device, &fsi_device, - &fsi_hdmi_device, &fsi_wm8978_device, + &fsi_hdmi_device, + &i2c_gpio_device, }; static void __init eva_clock_init(void)