diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-10-11 02:34:33 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 03:26:55 -0500 |
commit | 9ebe54baf8a166384201b4a78c649106047ebc75 (patch) | |
tree | 3d6fa02c8b69bcea4270591b96937b8a0e49be57 /arch/arm | |
parent | 14cdd83a6df84849c369b201ce248e0213d735e0 (diff) |
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')
-rw-r--r-- | arch/arm/boot/dts/r8a7778-bockw-reference.dts | 9 |
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 @@ | |||
51 | vdd33a-supply = <&fixedregulator3v3>; | 51 | vdd33a-supply = <&fixedregulator3v3>; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | mmc_pins: mmc { | ||
55 | renesas,groups = "mmc_data8", "mmc_ctrl"; | ||
56 | renesas,function = "mmc"; | ||
57 | }; | ||
58 | }; | 54 | }; |
59 | 55 | ||
60 | &mmcif { | 56 | &mmcif { |
@@ -79,4 +75,9 @@ | |||
79 | renesas,groups = "scif0_data_a", "scif0_ctrl"; | 75 | renesas,groups = "scif0_data_a", "scif0_ctrl"; |
80 | renesas,function = "scif0"; | 76 | renesas,function = "scif0"; |
81 | }; | 77 | }; |
78 | |||
79 | mmc_pins: mmc { | ||
80 | renesas,groups = "mmc_data8", "mmc_ctrl"; | ||
81 | renesas,function = "mmc"; | ||
82 | }; | ||
82 | }; | 83 | }; |