Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 546e5d3e authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Simon Horman
Browse files

ARM: shmobile: sh73a0: move SDHI and MMCIF DT nodes to sh73a0.dtsi 



To avoid having to repeat common DT node properties in all .dts files
move them to SoC's .dtsi file, setting their status to "disabled."
Individual boards will pick up devices, that they want to use and
change their DT node status to enabled.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c791c036

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts

+15 −26
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 */



/dts-v1/;

/include/ "sh73a0-reference.dtsi"

/include/ "sh73a0.dtsi"



/ {

	model = "KZM-A9-GT";
@@ -44,34 +44,23 @@ 
		regulator-always-on;

		regulator-boot-on;

	};

};



&mmcif {

	bus-width = <8>;

	vmmc-supply = <&reg_1p8v>;

	status = "okay";

};



	sdhi0: sdhi@0xee100000 {

		compatible = "renesas,shmobile-sdhi";

		reg = <0xee100000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 83 4

				0 84 4

				0 85 4>;

&sdhi0 {

	vmmc-supply = <&reg_3p3v>;

	bus-width = <4>;

		toshiba,mmc-has-idle-wait;

	status = "okay";

};



	sdhi2: sdhi@0xee140000 {

		compatible = "renesas,shmobile-sdhi";

		reg = <0xee140000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 104 4

				0 105 4>;

&sdhi2 {

	vmmc-supply = <&reg_3p3v>;

	bus-width = <4>;

	broken-cd;

		toshiba,mmc-wrprotect-disable;

		toshiba,mmc-has-idle-wait;

	};

};



&mmcif {

	bus-width = <8>;

	vmmc-supply = <&reg_1p8v>;

	status = "okay";

};

arch/arm/boot/dts/sh73a0-reference.dtsi

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the SH73A0 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "sh73a0.dtsi"



/ {

	compatible = "renesas,sh73a0";



	mmcif: mmcif@0x10010000 {

		compatible = "renesas,sh-mmcif";

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 140 0x4

			      0 141 0x4>;

		reg-io-width = <4>;

	};

};

arch/arm/boot/dts/sh73a0.dtsi

+44 −0
Original line number Diff line number Diff line
@@ -97,4 +97,48 @@ 
			      0 189 0x4

			      0 190 0x4>;

	};



	mmcif: mmcif@0x10010000 {

		compatible = "renesas,sh-mmcif";

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 140 0x4

			      0 141 0x4>;

		reg-io-width = <4>;

		status = "disabled";

	};



	sdhi0: sdhi@0xee100000 {

		compatible = "renesas,shmobile-sdhi";

		reg = <0xee100000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 83 4

				0 84 4

				0 85 4>;

		toshiba,mmc-has-idle-wait;

		status = "disabled";

	};



	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */

	sdhi1: sdhi@0xee120000 {

		compatible = "renesas,shmobile-sdhi";

		reg = <0xee120000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 88 4

				0 89 4>;

		toshiba,mmc-wrprotect-disable;

		toshiba,mmc-has-idle-wait;

		status = "disabled";

	};



	sdhi2: sdhi@0xee140000 {

		compatible = "renesas,shmobile-sdhi";

		reg = <0xee140000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 104 4

				0 105 4>;

		toshiba,mmc-wrprotect-disable;

		toshiba,mmc-has-idle-wait;

		status = "disabled";

	};

};