[PATCH 13/69] ARM: shmobile: bockw: fixup MMC pin conflict on DTS
Simon Horman
horms+renesas at verge.net.au
Thu Dec 12 21:30:47 EST 2013
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index c6b834f..4d997f8 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -51,10 +51,6 @@
vdd33a-supply = <&fixedregulator3v3>;
};
- mmc_pins: mmc {
- renesas,groups = "mmc_data8", "mmc_ctrl";
- renesas,function = "mmc";
- };
};
&mmcif {
@@ -79,4 +75,9 @@
renesas,groups = "scif0_data_a", "scif0_ctrl";
renesas,function = "scif0";
};
+
+ mmc_pins: mmc {
+ renesas,groups = "mmc_data8", "mmc_ctrl";
+ renesas,function = "mmc";
+ };
};
--
1.8.4
More information about the linux-arm-kernel
mailing list