summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-11 10:34:33 +0400
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 12:26:55 +0400
commit9ebe54baf8a166384201b4a78c649106047ebc75 (patch)
tree3d6fa02c8b69bcea4270591b96937b8a0e49be57 /arch/arm/boot/dts
parent14cdd83a6df84849c369b201ce248e0213d735e0 (diff)
downloadlinux-9ebe54baf8a166384201b4a78c649106047ebc75.tar.xz
ARM: shmobile: bockw: fixup MMC pin conflict on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/r8a7778-bockw-reference.dts9
1 files 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 c6b834f01817..4d997f81f379 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";
+ };
};