Merge tag 'renesas-dt-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "Renesas ARM Based SoC DT Updates for v3.20" from Simon Horman:

* Use clock-indices instead of deprecated renesas,clock-indices
* Prepare for r8a73a4 multiplatform support
* Increase clock coverage for r8a779[014]
* Correct r8a7779 clock usage
* Correct LAN9220 VDDVARIO voltage on ape6evm
* Correct QSPI SPI-Flash mode of lager and koelsch
* Correct flash partition label and size on koelsch
* Correct mask for GIC PPI interrupts on r8a779[14]
* Correct BSC bus range on ape6evm-reference

* tag 'renesas-dt-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits)
  ARM: shmobile: r8a7791: add MLB+ clock
  ARM: shmobile: r8a7790: add MLB+ clock
  ARM: shmobile: ape6evm: Fix LAN9220 VDDVARIO voltage
  ARM: shmobile: r8a73a4: Add r8a73a4-ape6evm.dtb to ARCH_SHMOBILE_MULTI
  ARM: shmobile: ape6evm: Add keypad to the device tree
  ARM: shmobile: ape6evm: Add LEDs to the device tree
  ARM: shmobile: ape6evm: synchronize dts with reference platform
  ARM: shmobile: ape6evm: fix compatible string for Ethernet controller
  ARM: shmobile: r8a7794: Add MMCIF clock to device tree
  ARM: shmobile: r8a7794: Add SDHI clocks to device tree
  ARM: shmobile: r8a7794: Add I2C clocks to device tree
  ARM: shmobile: r8a7779: Add TWD device to DTS
  ARM: shmobile: r8a7779: Use MSTP for SCIF clocks
  ARM: shmobile: r8a7779: Use R8A7779_CLK_P as SCIF parent clock
  ARM: shmobile: r8a7794: Add QSPI clock to device tree
  ARM: shmobile: lager: Fix QSPI mode of SPI-Flash into mode3
  ARM: shmobile: r8a7794: Add SYS-DMAC clocks to device tree
  ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree
  ARM: shmobile: koelsch: Fix QSPI mode of SPI-Flash into mode3
  ARM: shmobile: r8a7794: Add USBDMAC[01] clocks to device tree
  ...

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

diff --combined arch/arm/boot/dts/r8a7790-lager.dts
index 56e66bb536573cf08de30ad8cc3f0a30bf80fa0d,bc257e8b1bf29d2ee836166782614a5b0d59786d..d588e36729db2a2420ea1eaf9c431efa2c2f0f0c
--- 1/arch/arm/boot/dts/r8a7790-lager.dts
--- 2/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@@ -355,7 -355,7 +355,7 @@@
  
        phy-handle = <&phy1>;
        renesas,ether-link-active-low;
 -      status = "ok";
 +      status = "okay";
  
        phy1: ethernet-phy@1 {
                reg = <1>;
@@@ -366,7 -366,7 +366,7 @@@
  };
  
  &cmt0 {
 -      status = "ok";
 +      status = "okay";
  };
  
  &mmcif1 {
@@@ -397,6 -397,8 +397,8 @@@
                spi-max-frequency = <30000000>;
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
+               spi-cpha;
+               spi-cpol;
                m25p,fast-read;
  
                partition@0 {
@@@ -470,17 -472,17 +472,17 @@@
  };
  
  &iic0 {
 -      status = "ok";
 +      status = "okay";
  };
  
  &iic1 {
 -      status = "ok";
 +      status = "okay";
        pinctrl-0 = <&iic1_pins>;
        pinctrl-names = "default";
  };
  
  &iic2 {
 -      status = "ok";
 +      status = "okay";
        pinctrl-0 = <&iic2_pins>;
        pinctrl-names = "default";
  
@@@ -562,7 -564,7 +564,7 @@@
        pinctrl-0 = <&vin1_pins>;
        pinctrl-names = "default";
  
 -      status = "ok";
 +      status = "okay";
  
        port {
                #address-cells = <1>;

diff --combined arch/arm/boot/dts/r8a7791-koelsch.dts
index e2faa62610580b00a91e7ce06dc51bfa67c2af84,691e4c635564ba9f3e2f1c98a0e8224fe875b3c0..64fd044e114788573ac639a7ff8d9375fddf2feb
--- 1/arch/arm/boot/dts/r8a7791-koelsch.dts
--- 2/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@@ -366,7 -366,7 +366,7 @@@
  
        phy-handle = <&phy1>;
        renesas,ether-link-active-low;
 -      status = "ok";
 +      status = "okay";
  
        phy1: ethernet-phy@1 {
                reg = <1>;
@@@ -377,7 -377,7 +377,7 @@@
  };
  
  &cmt0 {
 -      status = "ok";
 +      status = "okay";
  };
  
  &sata0 {
@@@ -444,6 -444,8 +444,8 @@@
                spi-max-frequency = <30000000>;
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
+               spi-cpha;
+               spi-cpol;
                m25p,fast-read;
  
                partition@0 {
@@@ -452,13 -454,13 +454,13 @@@
                        read-only;
                };
                partition@80000 {
-                       label = "bootenv";
-                       reg = <0x00080000 0x00080000>;
+                       label = "user";
+                       reg = <0x00080000 0x00580000>;
                        read-only;
                };
-               partition@100000 {
-                       label = "data";
-                       reg = <0x00100000 0x03f00000>;
+               partition@600000 {
+                       label = "flash";
+                       reg = <0x00600000 0x03a00000>;
                };
        };
  };
@@@ -563,7 -565,7 +565,7 @@@
  
  /* composite video input */
  &vin1 {
 -      status = "ok";
 +      status = "okay";
        pinctrl-0 = <&vin1_pins>;
        pinctrl-names = "default";