Merge branch 'heads/dt3' into devel

diff --cc arch/arm/boot/dts/r8a7790.dtsi
index c6001032d9a7cb28eb28ffa403a64222edd16b66,71ec31c6d9b6fa859d4a87da34f0de76a6ca7b62..28e9460817971ad58111e135cb736ef1fbae4306
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -254,18 -261,20 +261,20 @@@
  
        sdhi0: sd@ee100000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee100000 0 0x100>;
 +              reg = <0 0xee100000 0 0x200>;
                interrupt-parent = <&gic>;
                interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
                cap-sd-highspeed;
                status = "disabled";
        };
  
        sdhi1: sd@ee120000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee120000 0 0x100>;
 +              reg = <0 0xee120000 0 0x200>;
                interrupt-parent = <&gic>;
                interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
                cap-sd-highspeed;
                status = "disabled";
        };