niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ARM: shmobile: r8a7740: tidyup DT node naming

Browse source 
According to ePAPR spec,
this patch tidies up DT node name and related clock.

This patch also adds missing SDHI2 entry

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Kuninori Morimoto 2013-10-21 19:35:08 -07:00 • committed by Simon Horman
parent 00bf591c3f
commit 7d907894bf
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/boot/dts/r8a7740.dtsi
View file

@ -162,7 +162,7 @@
#pwm-cells = <3>; #pwm-cells = <3>;
}; };
mmcif0: mmcif@e6bd0000 { mmcif0: mmc@e6bd0000 {
compatible = "renesas,sh-mmcif"; compatible = "renesas,sh-mmcif";
reg = <0xe6bd0000 0x100>; reg = <0xe6bd0000 0x100>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -171,7 +171,7 @@
status = "disabled"; status = "disabled";
}; };
sdhi0: sdhi@e6850000 { sdhi0: sd@e6850000 {
compatible = "renesas,sdhi-r8a7740"; compatible = "renesas,sdhi-r8a7740";
reg = <0xe6850000 0x100>; reg = <0xe6850000 0x100>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -183,7 +183,7 @@
status = "disabled"; status = "disabled";
}; };
sdhi1: sdhi@e6860000 { sdhi1: sd@e6860000 {
compatible = "renesas,sdhi-r8a7740"; compatible = "renesas,sdhi-r8a7740";
reg = <0xe6860000 0x100>; reg = <0xe6860000 0x100>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -194,4 +194,16 @@
cap-sdio-irq; cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
sdhi2: sd@e6870000 {
compatible = "renesas,sdhi-r8a7740";
reg = <0xe6870000 0x100>;
interrupt-parent = <&gic>;
interrupts = <0 125 4
0 126 4
0 127 4>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled";
};
}; };

8
arch/arm/mach-shmobile/clock-r8a7740.c
View file

@ -590,18 +590,18 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("e6c20000.i2c", &mstp_clks[MSTP323]), CLKDEV_DEV_ID("e6c20000.i2c", &mstp_clks[MSTP323]),
CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP320]), CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP320]),
CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
CLKDEV_DEV_ID("e6850000.sdhi", &mstp_clks[MSTP314]), CLKDEV_DEV_ID("e6850000.sd", &mstp_clks[MSTP314]),
CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
CLKDEV_DEV_ID("e6860000.sdhi", &mstp_clks[MSTP313]), CLKDEV_DEV_ID("e6860000.sd", &mstp_clks[MSTP313]),
CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("e6bd0000.mmc", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]), CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]),
CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]), CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]),
CLKDEV_DEV_ID("renesas-tpu-pwm", &mstp_clks[MSTP304]), CLKDEV_DEV_ID("renesas-tpu-pwm", &mstp_clks[MSTP304]),
CLKDEV_DEV_ID("e6600000.pwm", &mstp_clks[MSTP304]), CLKDEV_DEV_ID("e6600000.pwm", &mstp_clks[MSTP304]),
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]), CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),
CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]), CLKDEV_DEV_ID("e6870000.sd", &mstp_clks[MSTP415]),
/* ICK */ /* ICK */
CLKDEV_ICK_ID("host", "renesas_usbhs", &mstp_clks[MSTP416]), CLKDEV_ICK_ID("host", "renesas_usbhs", &mstp_clks[MSTP416]),