| From 1f12f7a99052779e5677c94c2f9bd03d5d0498da Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 10 Oct 2013 23:34:33 -0700 |
| Subject: 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> |
| (cherry picked from commit 9ebe54baf8a166384201b4a78c649106047ebc75) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@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 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"; |
| + }; |
| }; |
| -- |
| 1.8.5.rc3 |
| |
