| From 88cd034e849658dc1ceb49c2c7b332c80088cbfb Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 21 Oct 2013 19:35:31 -0700 |
| Subject: ARM: shmobile: r8a73a4: 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 43304a5f51066a7ef851732c35b4582a8d6a5bc0) |
| (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/r8a73a4.dtsi | 10 +++++----- |
| arch/arm/mach-shmobile/clock-r8a73a4.c | 10 +++++----- |
| 2 files changed, 10 insertions(+), 10 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi |
| index 287e047592a0..e079c994fd70 100644 |
| --- a/arch/arm/boot/dts/r8a73a4.dtsi |
| +++ b/arch/arm/boot/dts/r8a73a4.dtsi |
| @@ -219,7 +219,7 @@ |
| status = "disabled"; |
| }; |
| |
| - mmcif0: mmcif@ee200000 { |
| + mmcif0: mmc@ee200000 { |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee200000 0 0x80>; |
| interrupt-parent = <&gic>; |
| @@ -228,7 +228,7 @@ |
| status = "disabled"; |
| }; |
| |
| - mmcif1: mmcif@ee220000 { |
| + mmcif1: mmc@ee220000 { |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee220000 0 0x80>; |
| interrupt-parent = <&gic>; |
| @@ -244,7 +244,7 @@ |
| #gpio-cells = <2>; |
| }; |
| |
| - sdhi0: sdhi@ee100000 { |
| + sdhi0: sd@ee100000 { |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee100000 0 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -253,7 +253,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi1: sdhi@ee120000 { |
| + sdhi1: sd@ee120000 { |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee120000 0 0x100>; |
| interrupt-parent = <&gic>; |
| @@ -262,7 +262,7 @@ |
| status = "disabled"; |
| }; |
| |
| - sdhi2: sdhi@ee140000 { |
| + sdhi2: sd@ee140000 { |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee140000 0 0x100>; |
| interrupt-parent = <&gic>; |
| diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c |
| index 571409b611d3..7348d58f500e 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a73a4.c |
| @@ -584,15 +584,15 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), |
| CLKDEV_DEV_ID("e6520000.i2c", &mstp_clks[MSTP300]), |
| CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]), |
| - CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]), |
| + CLKDEV_DEV_ID("ee220000.mmc", &mstp_clks[MSTP305]), |
| CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]), |
| - CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]), |
| + CLKDEV_DEV_ID("ee140000.sd", &mstp_clks[MSTP312]), |
| CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), |
| - CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]), |
| + CLKDEV_DEV_ID("ee120000.sd", &mstp_clks[MSTP313]), |
| CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), |
| - CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]), |
| + CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]), |
| CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]), |
| - CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]), |
| + CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]), |
| CLKDEV_DEV_ID("e6550000.i2c", &mstp_clks[MSTP316]), |
| CLKDEV_DEV_ID("e6560000.i2c", &mstp_clks[MSTP317]), |
| CLKDEV_DEV_ID("e6500000.i2c", &mstp_clks[MSTP318]), |
| -- |
| 1.8.5.rc3 |
| |