From: Kevin Hilman Date: Tue, 20 Aug 2013 22:34:49 +0000 (-0700) Subject: Merge tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4cb635d705a32f3592f420c92ba4ccd4b177b860;p=linux-beck.git Merge tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt From: Linus Walleij: Ux500 device tree enablement base for the v3.12 development cycle: - Various cleanups like remove non-existant hardware from the Snowball device tree, prefix all files with "ste-*" - External regulators - Documentation updates - Delete some minor dangling platform data - Pin control settings for U8540 through DT * tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (22 commits) ARM: ux500: fix devicetree builds ARM: ux500: Remove u9540.dts as it's been replaced ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi ARM: ux500: Apply a ste-* prefix onto stuib.dtsi ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones ARM: ux500: Apply a ste-* prefix onto href.dtsi ARM: ux500: Apply a ste-* prefix onto ccu9540.dts ARM: ux500: Apply a ste-* prefix onto ccu8540.dts ARM: ux500: Apply a ste-* prefix onto snowball.dts ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor ARM: ux500: Remove Snowball DTS entry for TPS61052 chip ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5 ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2 ARM: ux500: Stop passing MMC's platform data for Device Tree boots Documentation: Update binding for Nomadik and DBx5x based platforms ARM: ux500: Supply external regulator names for Snowball's DT ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use ... --- 4cb635d705a32f3592f420c92ba4ccd4b177b860 diff --cc arch/arm/boot/dts/Makefile index f3861de9fd4e,efee128a9d1f..c2977ef59943 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -176,14 -176,13 +176,14 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242 am43x-epos-evm.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 \ - hrefprev60.dtb \ - hrefv60plus.dtb \ - ccu8540.dtb \ - ccu9540.dtb + dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ + ste-hrefprev60.dtb \ + ste-hrefv60plus.dtb \ + ste-ccu8540.dtb \ + ste-ccu9540.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ + emev2-kzm9d-reference.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7740-armadillo800eva-reference.dtb \