[PATCH v2 1/3] arm64: dts: amlogic: meson-g12: Fix thermal-zones indent
Subsystems:
arm/amlogic meson soc support , the rest
STALE1721d
LANDED
Landed in mainline as cdc509169459 on 2021-11-15.
5 messages,
2 authors,
2021-11-15
· open the first message on its own page
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 <redacted>
---
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 --
2.33.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Starting with commit 94274f20f6bf ("dt-bindings: opp: Convert to DT
schema") the opp node name has a mandatory pattern. This change
fixes the dtbs_check warning:
gpu-opp-table: $nodename:0: 'gpu-opp-table' does not match
'^opp-table(-[a-z0-9]+)?$'
Put the 'gpu' part at the end to match the pattern.
Fixes: 916a0edc43f0 ("arm64: dts: amlogic: meson-g12: add the Mali OPP table and use DVFS")
Reviewed-by: Neil Armstrong <redacted>
Signed-off-by: Alexander Stein <redacted>
---
Changes in v2:
* Separated from DT bindings patch in v1 (PATCH 1/4)
* Added Reviewed-by: Neil Armstrong tag
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index ff987e7ccff2..517519e6e87f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -58,7 +58,7 @@ efuse: efuse {
secure-monitor = <& sm > ;
};
- gpu_opp_table : gpu-opp-table {
+ gpu_opp_table : opp-table-gpu {
compatible = "operating-points-v2" ;
opp-124999998 { --
2.33.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Fix the schema warning: "spi-flash@0: $nodename:0: 'spi-flash@0' does
not match '^flash(@.*)?$'" from jedec,spi-nor.yaml
Fixes: a084eaf3096c ("arm64: dts: meson-g12b-odroid-n2: add SPIFC controller node")
Reviewed-by: Neil Armstrong <redacted>
Signed-off-by: Alexander Stein <redacted>
---
Changes in v2:
* Separated from DT bindings patch in v1 (PATCH 1/4)
* Added Reviewed-by: Neil Armstrong tag
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
index 6e9ff5076b38..9c05c83453f5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -611,7 +611,7 @@ &spifc {
pinctrl-0 = <& nor_pins > ;
pinctrl-names = "default" ;
- mx25u64 : spi-flash @ 0 {
+ mx25u64 : flash @ 0 {
#address-cells = < 1 > ;
#size-cells = < 1 > ;
compatible = "mxicy,mx25u6435f" , "jedec,spi-nor" ; --
2.33.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 26/10/2021 20:28, Alexander Stein wrote: quoted hunk 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 <redacted>
---
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 <redacted>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
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
--
Neil
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel