aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-21 22:36:22 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 03:27:00 -0500
commit33f6be3bf6b79c2b9b7c8cd1387e8e7d4b839d9e (patch)
tree8a704d005f735765bab16e1499ce20f6da50f0e3 /arch
parentb718aa448378a83c698f92073a4aa24df0d9444b (diff)
ARM: shmobile: sh73a0: 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sh73a0.dtsi8
-rw-r--r--arch/arm/mach-shmobile/clock-sh73a0.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index fcf26889a8a0..78f7201aeb24 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -190,7 +190,7 @@
190 status = "disabled"; 190 status = "disabled";
191 }; 191 };
192 192
193 mmcif: mmcif@e6bd0000 { 193 mmcif: mmc@e6bd0000 {
194 compatible = "renesas,sh-mmcif"; 194 compatible = "renesas,sh-mmcif";
195 reg = <0xe6bd0000 0x100>; 195 reg = <0xe6bd0000 0x100>;
196 interrupt-parent = <&gic>; 196 interrupt-parent = <&gic>;
@@ -200,7 +200,7 @@
200 status = "disabled"; 200 status = "disabled";
201 }; 201 };
202 202
203 sdhi0: sdhi@ee100000 { 203 sdhi0: sd@ee100000 {
204 compatible = "renesas,sdhi-r8a7740"; 204 compatible = "renesas,sdhi-r8a7740";
205 reg = <0xee100000 0x100>; 205 reg = <0xee100000 0x100>;
206 interrupt-parent = <&gic>; 206 interrupt-parent = <&gic>;
@@ -212,7 +212,7 @@
212 }; 212 };
213 213
214 /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ 214 /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
215 sdhi1: sdhi@ee120000 { 215 sdhi1: sd@ee120000 {
216 compatible = "renesas,sdhi-r8a7740"; 216 compatible = "renesas,sdhi-r8a7740";
217 reg = <0xee120000 0x100>; 217 reg = <0xee120000 0x100>;
218 interrupt-parent = <&gic>; 218 interrupt-parent = <&gic>;
@@ -223,7 +223,7 @@
223 status = "disabled"; 223 status = "disabled";
224 }; 224 };
225 225
226 sdhi2: sdhi@ee140000 { 226 sdhi2: sd@ee140000 {
227 compatible = "renesas,sdhi-r8a7740"; 227 compatible = "renesas,sdhi-r8a7740";
228 reg = <0xee140000 0x100>; 228 reg = <0xee140000 0x100>;
229 interrupt-parent = <&gic>; 229 interrupt-parent = <&gic>;
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index c92c023f0d27..96cc7daed0a6 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -663,13 +663,13 @@ static struct clk_lookup lookups[] = {
663 CLKDEV_DEV_ID("e6822000.i2c", &mstp_clks[MSTP323]), /* I2C1 */ 663 CLKDEV_DEV_ID("e6822000.i2c", &mstp_clks[MSTP323]), /* I2C1 */
664 CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP322]), /* USB */ 664 CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP322]), /* USB */
665 CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */ 665 CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */
666 CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]), /* SDHI0 */ 666 CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]), /* SDHI0 */
667 CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */ 667 CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */
668 CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]), /* SDHI1 */ 668 CLKDEV_DEV_ID("ee120000.sd", &mstp_clks[MSTP313]), /* SDHI1 */
669 CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */ 669 CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */
670 CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), /* MMCIF0 */ 670 CLKDEV_DEV_ID("e6bd0000.mmc", &mstp_clks[MSTP312]), /* MMCIF0 */
671 CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), /* SDHI2 */ 671 CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), /* SDHI2 */
672 CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP311]), /* SDHI2 */ 672 CLKDEV_DEV_ID("ee140000.sd", &mstp_clks[MSTP311]), /* SDHI2 */
673 CLKDEV_DEV_ID("renesas-tpu-pwm.0", &mstp_clks[MSTP304]), /* TPU0 */ 673 CLKDEV_DEV_ID("renesas-tpu-pwm.0", &mstp_clks[MSTP304]), /* TPU0 */
674 CLKDEV_DEV_ID("renesas-tpu-pwm.1", &mstp_clks[MSTP303]), /* TPU1 */ 674 CLKDEV_DEV_ID("renesas-tpu-pwm.1", &mstp_clks[MSTP303]), /* TPU1 */
675 CLKDEV_DEV_ID("renesas-tpu-pwm.2", &mstp_clks[MSTP302]), /* TPU2 */ 675 CLKDEV_DEV_ID("renesas-tpu-pwm.2", &mstp_clks[MSTP302]), /* TPU2 */