From: Arnd Bergmann Date: Fri, 19 Apr 2013 11:35:57 +0000 (+0200) Subject: Merge branch 'samsung/exynos-multiplatform' into next/multiplatform X-Git-Tag: v3.10-rc1~122^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56b690481c4baed815b9e4acf5ea89eadb58ba17;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'samsung/exynos-multiplatform' into next/multiplatform These patches get us closer to adding multiplatform support on the Exynos platform, they are part of a longer series of patches. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these. A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to * The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform. * The irqchip (combiner), clk and clksource patches are all based on top of other changesets we pulled in from your trees, so I would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully. * A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there. Signed-off-by: Arnd Bergmann --- 56b690481c4baed815b9e4acf5ea89eadb58ba17 diff --cc arch/arm/Kconfig.debug index e00bd4d,59ce26a..54d6fdc --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -605,8 -587,7 +612,9 @@@ endchoic config DEBUG_LL_INCLUDE string + default "debug/bcm2835.S" if DEBUG_BCM2835 + default "debug/cns3xxx.S" if DEBUG_CNS3XXX + default "debug/exynos.S" if DEBUG_EXYNOS_UART default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/imx.S" if DEBUG_IMX1_UART || \ DEBUG_IMX25_UART || \ diff --cc arch/arm/mach-exynos/Kconfig index 54cf73e,1d69c62..9cfbb33 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -20,9 -33,11 +34,12 @@@ config ARCH_EXYNOS help Samsung EXYNOS4 SoCs based systems + config ARCH_EXYNOS4_SINGLE + def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE + config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" + select HAVE_ARM_SCU if SMP select HAVE_SMP help Samsung EXYNOS5 (Cortex-A15) SoC based systems