Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device-tree changes from Olof Johansson:
 "Unlike the board branch, this keeps having large sets of changes for
  every release, but that's quite expected and is so far working well.

  Most of this is plumbing for various device bindings and new
  platforms, but there's also a bit of cleanup and code removal for
  things that are moved from platform code to DT contents (some OMAP
  clock code in particular).

  There's also a pinctrl driver for tegra here (appropriately acked),
  that's introduced this way to make it more bisectable.

  I'm happy to say that there were no conflicts at all with this branch
  this release, which means that changes are flowing through our tree as
  expected instead of merged through driver maintainers (or at least not
  done with conflicts).

  There are several new boards added, and a couple of SoCs.  In no
  particular order:

   - Rockchip RK3288 SoC support, including DTS for a dev board that
     they have seeded with some community developers.
   - Better support for Hardkernel Exynos4-based ODROID boards.
   - CCF conversions (and dtsi contents) for several Renesas platforms.
   - Gumstix Pepper (TI AM335x) board support
   - TI eval board support for AM437x
   - Allwinner A23 SoC, very similar to existing ones which mostly has
     resulted in DT changes for support.  Also includes support for an
     Ippo tablet with the chipset.
   - Allwinner A31 Hummingbird board support, not to be confused with
     the SolidRun i.MX-based Hummingboard.
   - Tegra30 Apalis board support"

* tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (334 commits)
  ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
  ARM: dts: add rk3288 ehci usb devices
  ARM: dts: Turn on USB host vbus on rk3288-evb
  ARM: tegra: apalis t30: fix device tree compatible node
  ARM: tegra: paz00: Fix some indentation inconsistencies
  ARM: zynq: DT: Clarify Xilinx Zynq platform
  ARM: dts: rockchip: add watchdog node
  ARM: dts: rockchip: remove pinctrl setting from radxarock uart2
  ARM: dts: Add missing pinctrl for uart0/1 for exynos3250
  ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250
  ARM: dts: Add TMU dt node to monitor the temperature for exynos3250
  ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250
  ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
  ARM: dts: max77686 is exynos5250-snow only
  ARM: zynq: DT: Remove DMA from board DTs
  ARM: zynq: DT: Add CAN node
  ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table
  ARM: dts: Add PMU DT node for exynos5260 SoC
  ARM: EXYNOS: Add support for Exynos5410 PMU
  ARM: dts: Add PMU to exynos5410
  ...

diff --cc Documentation/devicetree/bindings/arm/samsung/pmu.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index edaf62737bc276f78a24d28748bed84d529363ae,e43b838bae4bac7c588925d828886864a617c84a..b11ad54f8d17fa6bfcdc388cbba397814d349bed
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1167,8 -1149,10 +1176,9 @@@ config DEBUG_UART_VIR
        default 0xfec02000 if DEBUG_SOCFPGA_UART
        default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
+       default 0xfec90000 if DEBUG_RK32_UART2
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
 -      default 0xfed12000 if ARCH_KIRKWOOD
        default 0xfed60000 if DEBUG_RK29_UART0
        default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

diff --cc arch/arm/boot/dts/Makefile
index 74f2906211a94085df2e79d03008e23f2e3ab6a7,0afe09a6bf51f4cfb775db6afc02a87909ace834..b8c5cd3ddeb9c0f10e18cff41f8b0aaf33396765
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -91,8 -94,10 +95,9 @@@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integr
  dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
        k2l-evm.dtb \
        k2e-evm.dtb
 -kirkwood := \
 -      kirkwood-b3.dtb \
 +dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
        kirkwood-cloudbox.dtb \
+       kirkwood-d2net.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos3250.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4210.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4x12.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
Simple merge

diff --cc arch/arm/boot/dts/exynos5260.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5410.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5420.dtsi
index 08dd681c0019f6c118a5e1fd9516270e96516fcb,b69de266101192dde4db72af97cdacc593a1a41c..95ec37dff3e85fca734a36061072d6ef07444224
--- 1/arch/arm/boot/dts/exynos5420.dtsi
--- 2/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@@ -520,28 -515,7 +515,27 @@@
                phy-names = "dp";
        };
  
 +      mipi_phy: video-phy@10040714 {
 +              compatible = "samsung,s5pv210-mipi-video-phy";
 +              reg = <0x10040714 12>;
 +              #phy-cells = <1>;
 +      };
 +
 +      dsi@14500000 {
 +              compatible = "samsung,exynos5410-mipi-dsi";
 +              reg = <0x14500000 0x10000>;
 +              interrupts = <0 82 0>;
 +              samsung,power-domain = <&disp_pd>;
 +              phys = <&mipi_phy 1>;
 +              phy-names = "dsim";
 +              clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
 +              clock-names = "bus_clk", "pll_clk";
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              status = "disabled";
 +      };
 +
        fimd: fimd@14400000 {
-               samsung,power-domain = <&disp_pd>;
                clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                clock-names = "sclk_fimd", "fimd";
        };

diff --cc arch/arm/boot/dts/omap2420.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap2430.dtsi
Simple merge

diff --cc arch/arm/boot/dts/r8a7779.dtsi
Simple merge

diff --cc arch/arm/boot/dts/r8a7791.dtsi
Simple merge

diff --cc arch/arm/boot/dts/socfpga.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra124.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/exynos.c
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/clock.c
Simple merge

diff --cc arch/arm/mach-omap2/clock.h
Simple merge

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-omap2/pm24xx.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a73a4.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7778.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a73a4.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7778.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
Simple merge

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/pinctrl/Makefile
Simple merge