ARM: dts: renesas: Move enable-method to CPU nodes
According to Documentation/devicetree/bindings/arm/cpus.yaml, the "enable-method" property should be a property of the individual CPU nodes, and not of the parent "cpus" container node. However, on R-Car Gen2 and RZ/G1 SoCs, the property is tied to the "cpus" node instead. Secondary CPU bringup and CPU hot (un)plug work regardless, as arm_dt_init_cpu_maps() falls back to looking in the "cpus" node. The cpuidle code does not have such a fallback, so it does not detect the enable-method. Note that cpuidle does not support the "renesas,apmu" enable-method yet, so for now this does not make any difference. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/35fcfedf9de9269185c48ca5a6dfcba7cdd3484b.1621427319.git.geert+renesas@glider.be
This commit is contained in:
Родитель
ebc666f39f
Коммит
a499e40a39
|
@ -47,7 +47,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -56,6 +55,7 @@
|
|||
clock-frequency = <1400000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7742_CLK_Z>;
|
||||
power-domains = <&sysc R8A7742_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -77,6 +77,7 @@
|
|||
clock-frequency = <1400000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7742_CLK_Z>;
|
||||
power-domains = <&sysc R8A7742_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -98,6 +99,7 @@
|
|||
clock-frequency = <1400000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7742_CLK_Z>;
|
||||
power-domains = <&sysc R8A7742_PD_CA15_CPU2>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -119,6 +121,7 @@
|
|||
clock-frequency = <1400000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7742_CLK_Z>;
|
||||
power-domains = <&sysc R8A7742_PD_CA15_CPU3>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -59,6 +58,7 @@
|
|||
clocks = <&cpg CPG_CORE R8A7743_CLK_Z>;
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
power-domains = <&sysc R8A7743_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
|
||||
/* kHz - uV - OPPs unknown yet */
|
||||
|
@ -78,6 +78,7 @@
|
|||
clocks = <&cpg CPG_CORE R8A7743_CLK_Z>;
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
power-domains = <&sysc R8A7743_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
|
||||
/* kHz - uV - OPPs unknown yet */
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -59,6 +58,7 @@
|
|||
clocks = <&cpg CPG_CORE R8A7744_CLK_Z>;
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
power-domains = <&sysc R8A7744_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
|
||||
/* kHz - uV - OPPs unknown yet */
|
||||
|
@ -78,6 +78,7 @@
|
|||
clocks = <&cpg CPG_CORE R8A7744_CLK_Z>;
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
power-domains = <&sysc R8A7744_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
|
||||
/* kHz - uV - OPPs unknown yet */
|
||||
|
|
|
@ -64,7 +64,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -73,6 +72,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7745_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7745_PD_CA7_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
@ -83,6 +83,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7745_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7745_PD_CA7_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -34,6 +33,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A77470_CLK_Z2>;
|
||||
power-domains = <&sysc R8A77470_PD_CA7_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
@ -44,6 +44,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A77470_CLK_Z2>;
|
||||
power-domains = <&sysc R8A77470_PD_CA7_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
|
|
@ -69,7 +69,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -78,6 +77,7 @@
|
|||
clock-frequency = <1300000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z>;
|
||||
power-domains = <&sysc R8A7790_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -99,6 +99,7 @@
|
|||
clock-frequency = <1300000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z>;
|
||||
power-domains = <&sysc R8A7790_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -120,6 +121,7 @@
|
|||
clock-frequency = <1300000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z>;
|
||||
power-domains = <&sysc R8A7790_PD_CA15_CPU2>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -141,6 +143,7 @@
|
|||
clock-frequency = <1300000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z>;
|
||||
power-domains = <&sysc R8A7790_PD_CA15_CPU3>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
capacity-dmips-mhz = <1024>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
|
@ -162,6 +165,7 @@
|
|||
clock-frequency = <780000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7790_PD_CA7_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
capacity-dmips-mhz = <539>;
|
||||
};
|
||||
|
@ -173,6 +177,7 @@
|
|||
clock-frequency = <780000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7790_PD_CA7_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
capacity-dmips-mhz = <539>;
|
||||
};
|
||||
|
@ -184,6 +189,7 @@
|
|||
clock-frequency = <780000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7790_PD_CA7_CPU2>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
capacity-dmips-mhz = <539>;
|
||||
};
|
||||
|
@ -195,6 +201,7 @@
|
|||
clock-frequency = <780000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7790_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7790_PD_CA7_CPU3>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
capacity-dmips-mhz = <539>;
|
||||
};
|
||||
|
|
|
@ -68,7 +68,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -77,6 +76,7 @@
|
|||
clock-frequency = <1500000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7791_CLK_Z>;
|
||||
power-domains = <&sysc R8A7791_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
|
@ -97,6 +97,7 @@
|
|||
clock-frequency = <1500000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7791_CLK_Z>;
|
||||
power-domains = <&sysc R8A7791_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -54,6 +53,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7792_CLK_Z>;
|
||||
power-domains = <&sysc R8A7792_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
};
|
||||
|
||||
|
@ -64,6 +64,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7792_CLK_Z>;
|
||||
power-domains = <&sysc R8A7792_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA15>;
|
||||
};
|
||||
|
||||
|
|
|
@ -60,7 +60,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -69,6 +68,7 @@
|
|||
clock-frequency = <1500000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7793_CLK_Z>;
|
||||
power-domains = <&sysc R8A7793_PD_CA15_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
|
||||
|
@ -89,6 +89,7 @@
|
|||
clock-frequency = <1500000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7793_CLK_Z>;
|
||||
power-domains = <&sysc R8A7793_PD_CA15_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
voltage-tolerance = <1>; /* 1% */
|
||||
clock-latency = <300000>; /* 300 us */
|
||||
|
||||
|
|
|
@ -62,7 +62,6 @@
|
|||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
enable-method = "renesas,apmu";
|
||||
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
|
@ -71,6 +70,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7794_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7794_PD_CA7_CPU0>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
@ -81,6 +81,7 @@
|
|||
clock-frequency = <1000000000>;
|
||||
clocks = <&cpg CPG_CORE R8A7794_CLK_Z2>;
|
||||
power-domains = <&sysc R8A7794_PD_CA7_CPU1>;
|
||||
enable-method = "renesas,apmu";
|
||||
next-level-cache = <&L2_CA7>;
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче