| From 4fbcf56bcfe039ca0c8c928f90d192eda681cacf Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 21 Oct 2013 19:36:02 -0700 |
| Subject: ARM: shmobile: r8a7779: 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 2624705ceb7b139cffdb409682d3e1bc480abec7) |
| (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/r8a7779.dtsi | 8 ++++---- |
| arch/arm/mach-shmobile/clock-r8a7779.c | 8 ++++---- |
| 2 files changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi |
| index be737efb02b6..05fd41c6012f 100644 |
| --- a/arch/arm/boot/dts/r8a7779.dtsi |
| +++ b/arch/arm/boot/dts/r8a7779.dtsi |
| @@ -207,7 +207,7 @@ |
| interrupts = <0 100 0x4>; |
| }; |
| |
| - sdhi0: sdhi@ffe4c000 { |
| + sdhi0: sd@ffe4c000 { |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4c000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -217,7 +217,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi1: sdhi@ffe4d000 { |
| + sdhi1: sd@ffe4d000 { |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4d000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -227,7 +227,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi2: sdhi@ffe4e000 { |
| + sdhi2: sd@ffe4e000 { |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4e000 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -237,7 +237,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi3: sdhi@ffe4f000 { |
| + sdhi3: sd@ffe4f000 { |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4f000 0x100>; |
| interrupt-parent = <&gic>; |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c |
| index b545c8dbb818..f1fb89b76786 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7779.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7779.c |
| @@ -204,13 +204,13 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */ |
| CLKDEV_DEV_ID("fffc6000.spi", &mstp_clks[MSTP007]), /* HSPI2 */ |
| 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("ffe4e000.sdhi", &mstp_clks[MSTP321]), /* SDHI2 */ |
| + CLKDEV_DEV_ID("ffe4e000.sd", &mstp_clks[MSTP321]), /* SDHI2 */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */ |
| - CLKDEV_DEV_ID("ffe4f000.sdhi", &mstp_clks[MSTP320]), /* SDHI3 */ |
| + CLKDEV_DEV_ID("ffe4f000.sd", &mstp_clks[MSTP320]), /* SDHI3 */ |
| CLKDEV_DEV_ID("rcar-du-r8a7779", &mstp_clks[MSTP103]), /* DU */ |
| }; |
| |
| -- |
| 1.8.5.rc3 |
| |