Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b718aa44 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman
Browse files

ARM: shmobile: r8a7790: tidyup DT node naming 



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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 2624705c

arch/arm/boot/dts/r8a7790.dtsi

+5 −5
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	mmcif1: mmcif@ee220000 {

	mmcif1: mmc@ee220000 {

		compatible = "renesas,sh-mmcif";

		compatible = "renesas,sh-mmcif";

		reg = <0 0xee220000 0 0x80>;

		reg = <0 0xee220000 0 0x80>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;
@@ -239,7 +239,7 @@ 
		reg = <0 0xe6060000 0 0x250>;

		reg = <0 0xe6060000 0 0x250>;

	};

	};





	sdhi0: sdhi@ee100000 {

	sdhi0: sd@ee100000 {

		compatible = "renesas,sdhi-r8a7790";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee100000 0 0x100>;

		reg = <0 0xee100000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;
@@ -248,7 +248,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	sdhi1: sdhi@ee120000 {

	sdhi1: sd@ee120000 {

		compatible = "renesas,sdhi-r8a7790";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee120000 0 0x100>;

		reg = <0 0xee120000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;
@@ -257,7 +257,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	sdhi2: sdhi@ee140000 {

	sdhi2: sd@ee140000 {

		compatible = "renesas,sdhi-r8a7790";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee140000 0 0x100>;

		reg = <0 0xee140000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;
@@ -266,7 +266,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	sdhi3: sdhi@ee160000 {

	sdhi3: sd@ee160000 {

		compatible = "renesas,sdhi-r8a7790";

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee160000 0 0x100>;

		reg = <0 0xee160000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupt-parent = <&gic>;

arch/arm/mach-shmobile/clock-r8a7790.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -298,17 +298,17 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),

	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),

	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),

	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),

	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),

	CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("ee120000.sd", &mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("ee140000.sd", &mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),

	CLKDEV_DEV_ID("ee160000.sd", &mstp_clks[MSTP311]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),

	CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),

	CLKDEV_DEV_ID("ee220000.mmc", &mstp_clks[MSTP305]),

	CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),

	CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),

	CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),

	CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),

	CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),

	CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),