| From a93972349a90fe8303e84ab456aa46a2ea195786 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 20 Nov 2013 09:05:53 +0900 |
| Subject: ARM: shmobile: Use r8a7790 suffix for MMCIF compat string |
| |
| Add "renesas,mmcif-r8a7790" to the compatible string for MMCIF |
| in case of r8a7790. This makes the MMCIF follow the same style |
| as the other devices and also makes it more future proof. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 063e85607ddf26e5ede36b7454eddc8e87544540) |
| (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/r8a7790.dtsi | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 2245d91fb6da..cfb0f8b70e53 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -230,7 +230,7 @@ |
| }; |
| |
| mmcif0: mmcif@ee200000 { |
| - compatible = "renesas,sh-mmcif"; |
| + compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif"; |
| reg = <0 0xee200000 0 0x80>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; |
| @@ -239,7 +239,7 @@ |
| }; |
| |
| mmcif1: mmc@ee220000 { |
| - compatible = "renesas,sh-mmcif"; |
| + compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif"; |
| reg = <0 0xee220000 0 0x80>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; |
| -- |
| 1.8.5.rc3 |
| |
