Skip to content

L
linux
Commit 60c0745a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files
Options

ARM: shmobile: r8a7794 dtsi: Add CPG/MSTP Clock Domain 

Add an appropriate "#power-domain-cells" property to the cpg_clocks
device node, to create the CPG/MSTP Clock Domain.

Add "power-domains" properties to all device nodes for devices that are
part of the CPG/MSTP Clock Domain and can be power-managed through an
MSTP clock.  This applies to most on-SoC devices, which have a
one-to-one mapping from SoC device to DT device node.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 4b31bad5
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 0 deletions
arch/arm/boot/dts/r8a7794.dtsi
View file @ 60c0745a
...@@ -57,6 +57,7 @@ cmt0: timer@ffca0000 { ...@@ -57,6 +57,7 @@ cmt0: timer@ffca0000 {
<0 143 IRQ_TYPE_LEVEL_HIGH>; <0 143 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7794_CLK_CMT0>; clocks = <&mstp1_clks R8A7794_CLK_CMT0>;
clock-names = "fck"; clock-names = "fck";
power-domains = <&cpg_clocks>;
renesas,channels-mask = <0x60>; renesas,channels-mask = <0x60>;
...@@ -76,6 +77,7 @@ cmt1: timer@e6130000 { ...@@ -76,6 +77,7 @@ cmt1: timer@e6130000 {
<0 127 IRQ_TYPE_LEVEL_HIGH>; <0 127 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7794_CLK_CMT1>; clocks = <&mstp3_clks R8A7794_CLK_CMT1>;
clock-names = "fck"; clock-names = "fck";
power-domains = <&cpg_clocks>;
renesas,channels-mask = <0xff>; renesas,channels-mask = <0xff>;
...@@ -106,6 +108,7 @@ irqc0: interrupt-controller@e61c0000 { ...@@ -106,6 +108,7 @@ irqc0: interrupt-controller@e61c0000 {
<0 16 IRQ_TYPE_LEVEL_HIGH>, <0 16 IRQ_TYPE_LEVEL_HIGH>,
<0 17 IRQ_TYPE_LEVEL_HIGH>; <0 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp4_clks R8A7794_CLK_IRQC>; clocks = <&mstp4_clks R8A7794_CLK_IRQC>;
power-domains = <&cpg_clocks>;
}; };
pfc: pin-controller@e6060000 { pfc: pin-controller@e6060000 {
...@@ -140,6 +143,7 @@ dmac0: dma-controller@e6700000 { ...@@ -140,6 +143,7 @@ dmac0: dma-controller@e6700000 {
"ch12", "ch13", "ch14"; "ch12", "ch13", "ch14";
clocks = <&mstp2_clks R8A7794_CLK_SYS_DMAC0>; clocks = <&mstp2_clks R8A7794_CLK_SYS_DMAC0>;
clock-names = "fck"; clock-names = "fck";
power-domains = <&cpg_clocks>;
#dma-cells = <1>; #dma-cells = <1>;
dma-channels = <15>; dma-channels = <15>;
}; };
...@@ -170,6 +174,7 @@ dmac1: dma-controller@e6720000 { ...@@ -170,6 +174,7 @@ dmac1: dma-controller@e6720000 {
"ch12", "ch13", "ch14"; "ch12", "ch13", "ch14";
clocks = <&mstp2_clks R8A7794_CLK_SYS_DMAC1>; clocks = <&mstp2_clks R8A7794_CLK_SYS_DMAC1>;
clock-names = "fck"; clock-names = "fck";
power-domains = <&cpg_clocks>;
#dma-cells = <1>; #dma-cells = <1>;
dma-channels = <15>; dma-channels = <15>;
}; };
...@@ -182,6 +187,7 @@ scifa0: serial@e6c40000 { ...@@ -182,6 +187,7 @@ scifa0: serial@e6c40000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x21>, <&dmac0 0x22>; dmas = <&dmac0 0x21>, <&dmac0 0x22>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -193,6 +199,7 @@ scifa1: serial@e6c50000 { ...@@ -193,6 +199,7 @@ scifa1: serial@e6c50000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x25>, <&dmac0 0x26>; dmas = <&dmac0 0x25>, <&dmac0 0x26>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -204,6 +211,7 @@ scifa2: serial@e6c60000 { ...@@ -204,6 +211,7 @@ scifa2: serial@e6c60000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x27>, <&dmac0 0x28>; dmas = <&dmac0 0x27>, <&dmac0 0x28>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -215,6 +223,7 @@ scifa3: serial@e6c70000 { ...@@ -215,6 +223,7 @@ scifa3: serial@e6c70000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x1b>, <&dmac0 0x1c>; dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -226,6 +235,7 @@ scifa4: serial@e6c78000 { ...@@ -226,6 +235,7 @@ scifa4: serial@e6c78000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x1f>, <&dmac0 0x20>; dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -237,6 +247,7 @@ scifa5: serial@e6c80000 { ...@@ -237,6 +247,7 @@ scifa5: serial@e6c80000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x23>, <&dmac0 0x24>; dmas = <&dmac0 0x23>, <&dmac0 0x24>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -248,6 +259,7 @@ scifb0: serial@e6c20000 { ...@@ -248,6 +259,7 @@ scifb0: serial@e6c20000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x3d>, <&dmac0 0x3e>; dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -259,6 +271,7 @@ scifb1: serial@e6c30000 { ...@@ -259,6 +271,7 @@ scifb1: serial@e6c30000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x19>, <&dmac0 0x1a>; dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -270,6 +283,7 @@ scifb2: serial@e6ce0000 { ...@@ -270,6 +283,7 @@ scifb2: serial@e6ce0000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x1d>, <&dmac0 0x1e>; dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -281,6 +295,7 @@ scif0: serial@e6e60000 { ...@@ -281,6 +295,7 @@ scif0: serial@e6e60000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x29>, <&dmac0 0x2a>; dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -292,6 +307,7 @@ scif1: serial@e6e68000 { ...@@ -292,6 +307,7 @@ scif1: serial@e6e68000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x2d>, <&dmac0 0x2e>; dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -303,6 +319,7 @@ scif2: serial@e6e58000 { ...@@ -303,6 +319,7 @@ scif2: serial@e6e58000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x2b>, <&dmac0 0x2c>; dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -314,6 +331,7 @@ scif3: serial@e6ea8000 { ...@@ -314,6 +331,7 @@ scif3: serial@e6ea8000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x2f>, <&dmac0 0x30>; dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -325,6 +343,7 @@ scif4: serial@e6ee0000 { ...@@ -325,6 +343,7 @@ scif4: serial@e6ee0000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0xfb>, <&dmac0 0xfc>; dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -336,6 +355,7 @@ scif5: serial@e6ee8000 { ...@@ -336,6 +355,7 @@ scif5: serial@e6ee8000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0xfd>, <&dmac0 0xfe>; dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -347,6 +367,7 @@ hscif0: serial@e62c0000 { ...@@ -347,6 +367,7 @@ hscif0: serial@e62c0000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x39>, <&dmac0 0x3a>; dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -358,6 +379,7 @@ hscif1: serial@e62c8000 { ...@@ -358,6 +379,7 @@ hscif1: serial@e62c8000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x4d>, <&dmac0 0x4e>; dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -369,6 +391,7 @@ hscif2: serial@e62d0000 { ...@@ -369,6 +391,7 @@ hscif2: serial@e62d0000 {
clock-names = "sci_ick"; clock-names = "sci_ick";
dmas = <&dmac0 0x3b>, <&dmac0 0x3c>; dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -377,6 +400,7 @@ ether: ethernet@ee700000 { ...@@ -377,6 +400,7 @@ ether: ethernet@ee700000 {
reg = <0 0xee700000 0 0x400>; reg = <0 0xee700000 0 0x400>;
interrupts = <0 162 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 162 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7794_CLK_ETHER>; clocks = <&mstp8_clks R8A7794_CLK_ETHER>;
power-domains = <&cpg_clocks>;
phy-mode = "rmii"; phy-mode = "rmii";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -390,6 +414,7 @@ mmcif0: mmc@ee200000 { ...@@ -390,6 +414,7 @@ mmcif0: mmc@ee200000 {
clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>; clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>;
dmas = <&dmac0 0xd1>, <&dmac0 0xd2>; dmas = <&dmac0 0xd1>, <&dmac0 0xd2>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&cpg_clocks>;
reg-io-width = <4>; reg-io-width = <4>;
status = "disabled"; status = "disabled";
}; };
...@@ -399,6 +424,7 @@ sdhi0: sd@ee100000 { ...@@ -399,6 +424,7 @@ sdhi0: sd@ee100000 {
reg = <0 0xee100000 0 0x200>; reg = <0 0xee100000 0 0x200>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7794_CLK_SDHI0>; clocks = <&mstp3_clks R8A7794_CLK_SDHI0>;
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -407,6 +433,7 @@ sdhi1: sd@ee140000 { ...@@ -407,6 +433,7 @@ sdhi1: sd@ee140000 {
reg = <0 0xee140000 0 0x100>; reg = <0 0xee140000 0 0x100>;
interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7794_CLK_SDHI1>; clocks = <&mstp3_clks R8A7794_CLK_SDHI1>;
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -415,6 +442,7 @@ sdhi2: sd@ee160000 { ...@@ -415,6 +442,7 @@ sdhi2: sd@ee160000 {
reg = <0 0xee160000 0 0x100>; reg = <0 0xee160000 0 0x100>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7794_CLK_SDHI2>; clocks = <&mstp3_clks R8A7794_CLK_SDHI2>;
power-domains = <&cpg_clocks>;
status = "disabled"; status = "disabled";
}; };
...@@ -441,6 +469,7 @@ cpg_clocks: cpg_clocks@e6150000 { ...@@ -441,6 +469,7 @@ cpg_clocks: cpg_clocks@e6150000 {
#clock-cells = <1>; #clock-cells = <1>;
clock-output-names = "main", "pll0", "pll1", "pll3", clock-output-names = "main", "pll0", "pll1", "pll3",
"lb", "qspi", "sdh", "sd0", "z"; "lb", "qspi", "sdh", "sd0", "z";
#power-domain-cells = <0>;
}; };
/* Variable factor clocks */ /* Variable factor clocks */
sd2_clk: sd2_clk@e6150078 { sd2_clk: sd2_clk@e6150078 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7