| From 2dc368933b3f7d105a0dc9ed3a12022dbf03a4c5 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 21 Oct 2013 19:35:42 -0700 |
| Subject: ARM: shmobile: r8a7778: tidyup DT node naming |
| |
| According to ePAPR spec, |
| this patch tidies up DT node name and related clock. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 14e1d9147d96e0e6cc7f14eb339a7754404b4b73) |
| (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.dtsi | 8 ++++---- |
| arch/arm/mach-shmobile/clock-r8a7778.c | 8 ++++---- |
| 2 files changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi |
| index 873eeb903b2e..ca88b3bc78e0 100644 |
| --- a/arch/arm/boot/dts/r8a7778.dtsi |
| +++ b/arch/arm/boot/dts/r8a7778.dtsi |
| @@ -157,7 +157,7 @@ |
| status = "disabled"; |
| }; |
| |
| - mmcif: mmcif@ffe4e000 { |
| + mmcif: mmc@ffe4e000 { |
| compatible = "renesas,sh-mmcif"; |
| reg = <0xffe4e000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -165,7 +165,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi0: sdhi@ffe4c000 { |
| + sdhi0: sd@ffe4c000 { |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4c000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -175,7 +175,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi1: sdhi@ffe4d000 { |
| + sdhi1: sd@ffe4d000 { |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4d000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -185,7 +185,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi2: sdhi@ffe4f000 { |
| + sdhi2: sd@ffe4f000 { |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4f000 0x100>; |
| interrupt-parent = <&gic>; |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c |
| index 54064346dafb..4b601bf4ede4 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7778.c |
| @@ -173,13 +173,13 @@ static struct clk_lookup lookups[] = { |
| |
| /* MSTP32 clocks */ |
| CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP331]), /* MMC */ |
| - CLKDEV_DEV_ID("ffe4e000.mmcif", &mstp_clks[MSTP331]), /* MMC */ |
| + CLKDEV_DEV_ID("ffe4e000.mmc", &mstp_clks[MSTP331]), /* MMC */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */ |
| - CLKDEV_DEV_ID("ffe4c000.sdhi", &mstp_clks[MSTP323]), /* SDHI0 */ |
| + CLKDEV_DEV_ID("ffe4c000.sd", &mstp_clks[MSTP323]), /* SDHI0 */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */ |
| - CLKDEV_DEV_ID("ffe4d000.sdhi", &mstp_clks[MSTP322]), /* SDHI1 */ |
| + CLKDEV_DEV_ID("ffe4d000.sd", &mstp_clks[MSTP322]), /* SDHI1 */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */ |
| - CLKDEV_DEV_ID("ffe4f000.sdhi", &mstp_clks[MSTP321]), /* SDHI2 */ |
| + CLKDEV_DEV_ID("ffe4f000.sd", &mstp_clks[MSTP321]), /* SDHI2 */ |
| CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */ |
| CLKDEV_DEV_ID("r8a7778-vin.0", &mstp_clks[MSTP110]), /* VIN0 */ |
| CLKDEV_DEV_ID("r8a7778-vin.1", &mstp_clks[MSTP109]), /* VIN1 */ |
| -- |
| 1.8.5.rc3 |
| |
