From: Olof Johansson <olof@lixom.net>
Date: Tue, 4 Nov 2014 22:32:21 +0000 (-0800)
Subject: Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v3.19-rc1~57^2~28
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=5d3e1cf2452e847ef3ddf8ff042c7f1ac17ede31;hp=-c

Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  - The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile

* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9d dts: Add chosen/stdout-path
  ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
  ARM: shmobile: alt dts: Add chosen/stdout-path
  ARM: shmobile: koelsch dts: Add chosen/stdout-path
  ARM: shmobile: henninger dts: Add chosen/stdout-path
  ARM: shmobile: lager dts: Add chosen/stdout-path
  ARM: shmobile: marzen dts: Add chosen/stdout-path
  ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
  ARM: shmobile: genmai dts: Add chosen/stdout-path
  ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  ARM: shmobile: emev2 dtsi: Use generic names for device nodes
  ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a73a4: sort dtsi file by address
  ARM: shmobile: kzm9d: sort dts file by address
  ARM: shmobile: r7s72100: sort dtsi file by address
  ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
  ARM: dts: Sort SHMOBILE dtbs alphabetically

Signed-off-by: Olof Johansson <olof@lixom.net>
---

5d3e1cf2452e847ef3ddf8ff042c7f1ac17ede31
diff --combined arch/arm/boot/dts/Makefile
index 818c63e90ee3,59b6d3e5aaf0..387b69114036
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -81,7 -81,6 +81,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
  	exynos5250-arndale.dtb \
  	exynos5250-smdk5250.dtb \
  	exynos5250-snow.dtb \
 +	exynos5250-spring.dtb \
  	exynos5260-xyref5260.dtb \
  	exynos5410-smdk5410.dtb \
  	exynos5420-arndale-octa.dtb \
@@@ -364,7 -363,6 +364,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
  	qcom-msm8660-surf.dtb \
  	qcom-msm8960-cdp.dtb \
  	qcom-msm8974-sony-xperia-honami.dtb
 +dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
  	rk3066a-bqcurie2.dtb \
  	rk3188-radxarock.dtb \
@@@ -378,25 -376,25 +378,25 @@@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-a
  	s5pv210-smdkc110.dtb \
  	s5pv210-smdkv210.dtb \
  	s5pv210-torbreck.dtb
- dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
+ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
+ 	r8a73a4-ape6evm.dtb \
+ 	r8a73a4-ape6evm-reference.dtb \
  	r8a7740-armadillo800eva.dtb \
  	r8a7778-bockw.dtb \
  	r8a7778-bockw-reference.dtb \
  	r8a7779-marzen.dtb \
- 	r8a7791-koelsch.dtb \
  	r8a7790-lager.dtb \
+ 	r8a7791-koelsch.dtb \
+ 	sh7372-mackerel.dtb \
  	sh73a0-kzm9g.dtb \
- 	sh73a0-kzm9g-reference.dtb \
- 	r8a73a4-ape6evm.dtb \
- 	r8a73a4-ape6evm-reference.dtb \
- 	sh7372-mackerel.dtb
+ 	sh73a0-kzm9g-reference.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
  	r7s72100-genmai.dtb \
  	r8a7740-armadillo800eva.dtb \
+ 	r8a7779-marzen.dtb \
+ 	r8a7790-lager.dtb \
  	r8a7791-henninger.dtb \
  	r8a7791-koelsch.dtb \
- 	r8a7790-lager.dtb \
- 	r8a7779-marzen.dtb \
  	r8a7794-alt.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
  	socfpga_cyclone5_socdk.dtb \