From: Kevin Hilman Date: Wed, 8 Jan 2014 21:55:26 +0000 (-0800) Subject: Merge branch 'hisi/soc' into next/soc X-Git-Tag: firefly_0821_release~176^2~4589^2~9 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0f2a5ba07ac8dc671c0acb89d0114352b41e936;p=firefly-linux-kernel-4.4.55.git Merge branch 'hisi/soc' into next/soc * hisi/soc: ARM: dts: rename hi4511 dts file ARM: hisi: remove init_time ARM: hisi: rename hi3xxx to hisi ARM: dts: enable clock binding on Hi3620 ARM: hi3xxx: add hotplug support ARM: hi3xxx: add smp support ARM: config: add defconfig for Hi3xxx ARM: config: enable hi3xxx in multi_v7_defconfig ARM: dts: enable hi4511 with device tree ARM: hi3xxx: add board support with device tree Signed-off-by: Kevin Hilman --- d0f2a5ba07ac8dc671c0acb89d0114352b41e936 diff --cc arch/arm/configs/multi_v7_defconfig index 7e3f5cba7cfd,7910d2206634..0ae6dc35209f --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -7,11 -7,9 +7,12 @@@ CONFIG_MACH_ARMADA_370= CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_MOBILE=y +CONFIG_ARCH_BERLIN=y +CONFIG_MACH_BERLIN_BG2=y +CONFIG_MACH_BERLIN_BG2CD=y CONFIG_GPIO_PCA953X=y CONFIG_ARCH_HIGHBANK=y + CONFIG_ARCH_HI3xxx=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_MXC=y CONFIG_MACH_IMX51_DT=y