| Message ID | 20211026182813.900775-1-alexander.stein@mailbox.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/3] arm64: dts: amlogic: meson-g12: Fix thermal-zones indent | expand |
On 26/10/2021 20:28, Alexander Stein wrote: > This node is currently at /soc/thermal-zones, but the later introduced > bindings in commit 1202a442a31f ("dt-bindings: thermal: Add yaml bindings > for thermal zones") put this at /thermal-zones. > Fix dtb_check warning by moving the thermal-zones node to / > > Signed-off-by: Alexander Stein <alexander.stein@mailbox.org> > --- > Changes in v2: > * Separated from DT bindings patch in v1 (PATCH 1/4) > * Dropped the Fixes tag > > .../boot/dts/amlogic/meson-g12-common.dtsi | 110 +++++++++--------- > 1 file changed, 55 insertions(+), 55 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > index 00c6f53290d4..ff987e7ccff2 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > @@ -159,61 +159,6 @@ &clkc CLKID_PCIE_COMB > status = "disabled"; > }; > > - thermal-zones { > - cpu_thermal: cpu-thermal { > - polling-delay = <1000>; > - polling-delay-passive = <100>; > - thermal-sensors = <&cpu_temp>; > - > - trips { > - cpu_passive: cpu-passive { > - temperature = <85000>; /* millicelsius */ > - hysteresis = <2000>; /* millicelsius */ > - type = "passive"; > - }; > - > - cpu_hot: cpu-hot { > - temperature = <95000>; /* millicelsius */ > - hysteresis = <2000>; /* millicelsius */ > - type = "hot"; > - }; > - > - cpu_critical: cpu-critical { > - temperature = <110000>; /* millicelsius */ > - hysteresis = <2000>; /* millicelsius */ > - type = "critical"; > - }; > - }; > - }; > - > - ddr_thermal: ddr-thermal { > - polling-delay = <1000>; > - polling-delay-passive = <100>; > - thermal-sensors = <&ddr_temp>; > - > - trips { > - ddr_passive: ddr-passive { > - temperature = <85000>; /* millicelsius */ > - hysteresis = <2000>; /* millicelsius */ > - type = "passive"; > - }; > - > - ddr_critical: ddr-critical { > - temperature = <110000>; /* millicelsius */ > - hysteresis = <2000>; /* millicelsius */ > - type = "critical"; > - }; > - }; > - > - cooling-maps { > - map { > - trip = <&ddr_passive>; > - cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > - }; > - }; > - }; > - }; > - > ethmac: ethernet@ff3f0000 { > compatible = "amlogic,meson-g12a-dwmac", > "snps,dwmac-3.70a", > @@ -2415,6 +2360,61 @@ mali: gpu@ffe40000 { > }; > }; > > + thermal-zones { > + cpu_thermal: cpu-thermal { > + polling-delay = <1000>; > + polling-delay-passive = <100>; > + thermal-sensors = <&cpu_temp>; > + > + trips { > + cpu_passive: cpu-passive { > + temperature = <85000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "passive"; > + }; > + > + cpu_hot: cpu-hot { > + temperature = <95000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "hot"; > + }; > + > + cpu_critical: cpu-critical { > + temperature = <110000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "critical"; > + }; > + }; > + }; > + > + ddr_thermal: ddr-thermal { > + polling-delay = <1000>; > + polling-delay-passive = <100>; > + thermal-sensors = <&ddr_temp>; > + > + trips { > + ddr_passive: ddr-passive { > + temperature = <85000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "passive"; > + }; > + > + ddr_critical: ddr-critical { > + temperature = <110000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "critical"; > + }; > + }; > + > + cooling-maps { > + map { > + trip = <&ddr_passive>; > + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > + }; > + }; > + }; > + }; > + > timer { > compatible = "arm,armv8-timer"; > interrupts = <GIC_PPI 13 > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Hi, On Tue, 26 Oct 2021 20:28:11 +0200, Alexander Stein wrote: > This node is currently at /soc/thermal-zones, but the later introduced > bindings in commit 1202a442a31f ("dt-bindings: thermal: Add yaml bindings > for thermal zones") put this at /thermal-zones. > Fix dtb_check warning by moving the thermal-zones node to / > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.17/dt64) [1/3] arm64: dts: amlogic: meson-g12: Fix thermal-zones indent https://git.kernel.org/amlogic/c/cdc5091694595606f0e38d651135d5d67fd397d0 [2/3] arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name https://git.kernel.org/amlogic/c/bb98a6fd0b0e227cefb2ba91cea2b55455f203b7 [3/3] arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+ https://git.kernel.org/amlogic/c/95d35256b564aca33fb661eac77dc94bfcffc8df
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 00c6f53290d4..ff987e7ccff2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -159,61 +159,6 @@ &clkc CLKID_PCIE_COMB status = "disabled"; }; - thermal-zones { - cpu_thermal: cpu-thermal { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&cpu_temp>; - - trips { - cpu_passive: cpu-passive { - temperature = <85000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "passive"; - }; - - cpu_hot: cpu-hot { - temperature = <95000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "hot"; - }; - - cpu_critical: cpu-critical { - temperature = <110000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "critical"; - }; - }; - }; - - ddr_thermal: ddr-thermal { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&ddr_temp>; - - trips { - ddr_passive: ddr-passive { - temperature = <85000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "passive"; - }; - - ddr_critical: ddr-critical { - temperature = <110000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "critical"; - }; - }; - - cooling-maps { - map { - trip = <&ddr_passive>; - cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; - }; - }; - ethmac: ethernet@ff3f0000 { compatible = "amlogic,meson-g12a-dwmac", "snps,dwmac-3.70a", @@ -2415,6 +2360,61 @@ mali: gpu@ffe40000 { }; }; + thermal-zones { + cpu_thermal: cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_passive: cpu-passive { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + + cpu_hot: cpu-hot { + temperature = <95000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + }; + + ddr_thermal: ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_passive: ddr-passive { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_passive>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 13
This node is currently at /soc/thermal-zones, but the later introduced bindings in commit 1202a442a31f ("dt-bindings: thermal: Add yaml bindings for thermal zones") put this at /thermal-zones. Fix dtb_check warning by moving the thermal-zones node to / Signed-off-by: Alexander Stein <alexander.stein@mailbox.org> --- Changes in v2: * Separated from DT bindings patch in v1 (PATCH 1/4) * Dropped the Fixes tag .../boot/dts/amlogic/meson-g12-common.dtsi | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-)