Merge tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "second bunch of dts changes for 3.18" from Heiko Stubner:

More peripheral support for Rockchip SoCs
- dwc2 usb controllers
- spi controllers
- emmc controller

* tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock
  ARM: dts: rockchip: fix rk3188 emmc pull references
  ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references
  ARM: dts: rockchip: clean up rk3xxx mmc nodes
  ARM: dts: rockchip: add emmc nodes for rk3066 and rk3188
  ARM: dts: rockchip: add Cortex-A9 SPI controller nodes
  ARM: dts: rockchip: enable usb ports on Radxa Rock
  ARM: dts: rockchip: add dwc2 controllers for rk3066 and rk3188
  ARM: dts: rockchip: remove rockchip,bus-index from rk3xxx i2c0
  ARM: dts: Switch i2c0 to 400kHz on rk3288-evb-rk808
  ARM: dts: Add rk808 PMIC to rk3288-evb-rk808
  ARM: dts: Add mshc aliases for rk3288
  ARM: dts: Add SPI nodes to rk3288
  ARM: dts: Enable USB host1(dwc) on rk3288-evb
  ARM: dts: add rk3288 dwc2 controller support
  ARM: dts: Add sdio0 and sdio1 to the rk3288

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

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
Simple merge

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

diff --cc arch/arm/boot/dts/rk3xxx.dtsi
index bdc92a42def890dbc2dadea3016ea83d84e30eda,9945bb9b6c149e620054740254ef8c8df59c5649..7332d12eb565a43822b5cfcaa9e4023c3fca7770
--- 1/arch/arm/boot/dts/rk3xxx.dtsi
--- 2/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@@ -26,46 -26,13 +26,51 @@@
                i2c2 = &i2c2;
                i2c3 = &i2c3;
                i2c4 = &i2c4;
+               mshc0 = &emmc;
+               mshc1 = &mmc0;
+               mshc2 = &mmc1;
+               spi0 = &spi0;
+               spi1 = &spi1;
        };
  
 +      amba {
 +              compatible = "arm,amba-bus";
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              dmac1_s: dma-controller@20018000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x20018000 0x4000>;
 +                      interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
 +                      #dma-cells = <1>;
 +                      clocks = <&cru ACLK_DMA1>;
 +                      clock-names = "apb_pclk";
 +              };
 +
 +              dmac1_ns: dma-controller@2001c000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x2001c000 0x4000>;
 +                      interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
 +                      #dma-cells = <1>;
 +                      clocks = <&cru ACLK_DMA1>;
 +                      clock-names = "apb_pclk";
 +                      status = "disabled";
 +              };
 +
 +              dmac2: dma-controller@20078000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x20078000 0x4000>;
 +                      interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
 +                      #dma-cells = <1>;
 +                      clocks = <&cru ACLK_DMA2>;
 +                      clock-names = "apb_pclk";
 +              };
 +      };
 +
        xin24m: oscillator {
                compatible = "fixed-clock";
                clock-frequency = <24000000>;