| From 9d3520da2d8b9e734cb9068ef55c1f129b3a3347 Mon Sep 17 00:00:00 2001 |
| From: Ulrich Hecht <ulrich.hecht@gmail.com> |
| Date: Thu, 27 Mar 2014 11:45:44 +0100 |
| Subject: ARM: shmobile: Use r8a7740 suffix for i2c, mmcif, fsi2 compat strings |
| |
| Add "renesas,*-r8a7740" to the compatible strings for consistency with other |
| devices. |
| |
| Signed-off-by: Ulrich Hecht <ulrich.hecht@gmail.com> |
| Acked-by: Wolfram Sang <wsa@the-dreams.de> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5c53f50c50badff499568a703467c3c9f23f9bfd) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740.dtsi | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi |
| index 2551e9438d35..3834b94dc02a 100644 |
| --- a/arch/arm/boot/dts/r8a7740.dtsi |
| +++ b/arch/arm/boot/dts/r8a7740.dtsi |
| @@ -125,7 +125,7 @@ |
| i2c0: i2c@fff20000 { |
| #address-cells = <1>; |
| #size-cells = <0>; |
| - compatible = "renesas,rmobile-iic"; |
| + compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic"; |
| reg = <0xfff20000 0x425>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH |
| @@ -138,7 +138,7 @@ |
| i2c1: i2c@e6c20000 { |
| #address-cells = <1>; |
| #size-cells = <0>; |
| - compatible = "renesas,rmobile-iic"; |
| + compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic"; |
| reg = <0xe6c20000 0x425>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH |
| @@ -173,7 +173,7 @@ |
| }; |
| |
| mmcif0: mmc@e6bd0000 { |
| - compatible = "renesas,sh-mmcif"; |
| + compatible = "renesas,mmcif-r8a7740", "renesas,sh-mmcif"; |
| reg = <0xe6bd0000 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH |
| @@ -219,7 +219,7 @@ |
| |
| sh_fsi2: sound@fe1f0000 { |
| #sound-dai-cells = <1>; |
| - compatible = "renesas,sh_fsi2"; |
| + compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2"; |
| reg = <0xfe1f0000 0x400>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 9 0x4>; |
| -- |
| 2.1.2 |
| |
