From: Arnd Bergmann Date: Tue, 27 Nov 2012 12:24:45 +0000 (+0100) Subject: Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500... X-Git-Tag: v3.8~350^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64507dd7028e3e0145077e73b8374bd75aea117c;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt From Lee Jones : * 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500: ARM: ux500: Rename dbx500 cpufreq code to be more generic ARM: dts: add missing ux500 device trees ARM: ux500: Stop registering the PCM driver from platform code ARM: ux500: Move board specific GPIO info out to subordinate DTS files ARM: ux500: Disable the MMCI gpio-regulator by default This follows up on the previous ux500 DT changes. Most importantly, it resolves a build error in the dts files that was the result of referring to a board specific device node from the common dtsi file. Signed-off-by: Arnd Bergmann --- 64507dd7028e3e0145077e73b8374bd75aea117c diff --cc arch/arm/boot/dts/Makefile index d9cf734,01433b9..89dcc14 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -90,11 -72,12 +90,14 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242 omap4-sdp.dtb \ omap5-evm.dtb \ am335x-evm.dtb \ + am335x-evmsk.dtb \ am335x-bone.dtb +dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb - dtb-$(CONFIG_ARCH_U8500) += snowball.dtb + dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ + hrefprev60.dtb \ + hrefv60plus.dtb \ + ccu9540.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ r8a7740-armadillo800eva.dtb \ sh73a0-kzm9g.dtb