summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-03-19 13:47:43 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-03-21 11:35:16 +0100
commit546e5d3ef6f2f17c63de01f1cf43cdb51c1e9a6b (patch)
tree16ec702ee3b9e9127fb035cd7cf4b9ebc0f006de /arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
parentARM: shmobile: kzm9g: SDHI0 and SDHI1 use a 3.3V power supply (diff)
downloadlinux-546e5d3ef6f2f17c63de01f1cf43cdb51c1e9a6b.tar.xz
linux-546e5d3ef6f2f17c63de01f1cf43cdb51c1e9a6b.zip
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: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/sh73a0-kzm9g-reference.dts')
-rw-r--r--arch/arm/boot/dts/sh73a0-kzm9g-reference.dts41
1 files changed, 15 insertions, 26 deletions
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index cadcf30e9641..f33b5ccb7446 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -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;
};
-
- sdhi0: sdhi@0xee100000 {
- compatible = "renesas,shmobile-sdhi";
- reg = <0xee100000 0x100>;
- interrupt-parent = <&gic>;
- interrupts = <0 83 4
- 0 84 4
- 0 85 4>;
- vmmc-supply = <&reg_3p3v>;
- bus-width = <4>;
- toshiba,mmc-has-idle-wait;
- };
-
- sdhi2: sdhi@0xee140000 {
- compatible = "renesas,shmobile-sdhi";
- reg = <0xee140000 0x100>;
- interrupt-parent = <&gic>;
- interrupts = <0 104 4
- 0 105 4>;
- 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";
+};
+
+&sdhi0 {
+ vmmc-supply = <&reg_3p3v>;
+ bus-width = <4>;
+ status = "okay";
+};
+
+&sdhi2 {
+ vmmc-supply = <&reg_3p3v>;
+ bus-width = <4>;
+ broken-cd;
+ status = "okay";
};