From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 19 Dec 2013 11:25:16 +0000 (+0900)
Subject: Merge branch 'heads/dt3' into devel
X-Git-Tag: next-20140106~106^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fab4f88bb1cc8b75d1ceaf0a20bb36048ae01a3f;p=karo-tx-linux.git

Merge branch 'heads/dt3' into devel
---

fab4f88bb1cc8b75d1ceaf0a20bb36048ae01a3f
diff --cc arch/arm/boot/dts/r8a7790.dtsi
index c6001032d9a7,71ec31c6d9b6..28e946081797
--- a/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";
  	};