Commit 661a7335 authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'heads/soc2' into boards2-base 

Conflicts:
	arch/arm/mach-shmobile/board-lager.c
parents 63862f14 687c27b0

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+10 −7
Original line number Original line Diff line number Diff line
@@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as 
described in mmc.txt, can be used. Additionally the following tmio_mmc-specific

described in mmc.txt, can be used. Additionally the following tmio_mmc-specific

optional bindings can be used.

optional bindings can be used.





Required properties:

- compatible:	"renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit

		"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC

		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC

		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC

		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC

		"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC

		"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC

		"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC



Optional properties:

Optional properties:

- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
 
- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
 


When used with Renesas SDHI hardware, the following compatibility strings

configure various model-specific properties:



"renesas,sh7372-sdhi":	(default) compatible with SH7372

"renesas,r8a7740-sdhi":	compatible with R8A7740: certain MMC/SD commands have to

			wait for the interface to become idle.

arch/arm/boot/dts/r8a73a4.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -193,7 +193,7 @@ 
	};

	};





	sdhi0: sdhi@ee100000 {

	sdhi0: sdhi@ee100000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee100000 0 0x100>;

		reg = <0 0xee100000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 165 4>;

		interrupts = <0 165 4>;
@@ -202,7 +202,7 @@ 
	};

	};





	sdhi1: sdhi@ee120000 {

	sdhi1: sdhi@ee120000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee120000 0 0x100>;

		reg = <0 0xee120000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 166 4>;

		interrupts = <0 166 4>;
@@ -211,7 +211,7 @@ 
	};

	};





	sdhi2: sdhi@ee140000 {

	sdhi2: sdhi@ee140000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee140000 0 0x100>;

		reg = <0 0xee140000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 167 4>;

		interrupts = <0 167 4>;

arch/arm/boot/dts/r8a7778.dtsi

+0 −1
Original line number Original line Diff line number Diff line
@@ -96,6 +96,5 @@ 
	pfc: pfc@fffc0000 {

	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7778";

		compatible = "renesas,pfc-r8a7778";

		reg = <0xfffc000 0x118>;

		reg = <0xfffc000 0x118>;

		#gpio-range-cells = <3>;

	};

	};

};
 
};

arch/arm/boot/dts/r8a7779.dtsi

+0 −1
Original line number Original line Diff line number Diff line
@@ -188,7 +188,6 @@ 
	pfc: pfc@fffc0000 {

	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7779";

		compatible = "renesas,pfc-r8a7779";

		reg = <0xfffc0000 0x23c>;

		reg = <0xfffc0000 0x23c>;

		#gpio-range-cells = <3>;

	};

	};





	thermal@ffc48000 {

	thermal@ffc48000 {

arch/arm/boot/dts/r8a7790.dtsi

+4 −5
Original line number Original line Diff line number Diff line
@@ -148,11 +148,10 @@ 
	pfc: pfc@e6060000 {

	pfc: pfc@e6060000 {

		compatible = "renesas,pfc-r8a7790";

		compatible = "renesas,pfc-r8a7790";

		reg = <0 0xe6060000 0 0x250>;

		reg = <0 0xe6060000 0 0x250>;

		#gpio-range-cells = <3>;

	};

	};





	sdhi0: sdhi@ee100000 {

	sdhi0: sdhi@ee100000 {

		compatible = "renesas,r8a7790-sdhi";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee100000 0 0x100>;

		reg = <0 0xee100000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 165 4>;

		interrupts = <0 165 4>;
@@ -161,7 +160,7 @@ 
	};

	};





	sdhi1: sdhi@ee120000 {

	sdhi1: sdhi@ee120000 {

		compatible = "renesas,r8a7790-sdhi";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee120000 0 0x100>;

		reg = <0 0xee120000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 166 4>;

		interrupts = <0 166 4>;
@@ -170,7 +169,7 @@ 
	};

	};





	sdhi2: sdhi@ee140000 {

	sdhi2: sdhi@ee140000 {

		compatible = "renesas,r8a7790-sdhi";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee140000 0 0x100>;

		reg = <0 0xee140000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 167 4>;

		interrupts = <0 167 4>;
@@ -179,7 +178,7 @@ 
	};

	};





	sdhi3: sdhi@ee160000 {

	sdhi3: sdhi@ee160000 {

		compatible = "renesas,r8a7790-sdhi";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee160000 0 0x100>;

		reg = <0 0xee160000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 168 4>;

		interrupts = <0 168 4>;