When commit 64f9147d914d ("arm64: dts: ti: am654: Add thermal
zones") introduced thermal-zones for am654, it defined as under the
common am65-wakeup bus segment, when it is am654 specific (other SoC
spins can have slightly different thermal characteristics). Futher,
thermal-zones is introduced under simple-bus node, when it has no
actual register or base address.
So, move it to it's rightful place under am654 SoC dtsi under the base
node.
Signed-off-by: Nishanth Menon <[email protected]>
---
NOTE:
1. This is a cosmetic fixup, so skip the "Fixes" tag.
2. This fixes up noisy dtbs_check warning around thermal.
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 ----
arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index 9d21cdf6fce8..9c69d0917f69 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -100,8 +100,4 @@ wkup_vtm0: temperature-sensor@42050000 {
power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;
#thermal-sensor-cells = <1>;
};
-
- thermal_zones: thermal-zones {
- #include "k3-am654-industrial-thermal.dtsi"
- };
};
diff --git a/arch/arm64/boot/dts/ti/k3-am654.dtsi b/arch/arm64/boot/dts/ti/k3-am654.dtsi
index f0a6541b8042..a89257900047 100644
--- a/arch/arm64/boot/dts/ti/k3-am654.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am654.dtsi
@@ -112,4 +112,8 @@ msmc_l3: l3-cache0 {
compatible = "cache";
cache-level = <3>;
};
+
+ thermal_zones: thermal-zones {
+ #include "k3-am654-industrial-thermal.dtsi"
+ };
};
--
2.32.0
On 9/16/2021 11:48 PM, Nishanth Menon wrote:
> When commit 64f9147d914d ("arm64: dts: ti: am654: Add thermal
> zones") introduced thermal-zones for am654, it defined as under the
> common am65-wakeup bus segment, when it is am654 specific (other SoC
> spins can have slightly different thermal characteristics). Futher,
> thermal-zones is introduced under simple-bus node, when it has no
> actual register or base address.
>
> So, move it to it's rightful place under am654 SoC dtsi under the base
> node.
Reviewed-by: Keerthy <[email protected]>
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
>
> NOTE:
> 1. This is a cosmetic fixup, so skip the "Fixes" tag.
> 2. This fixes up noisy dtbs_check warning around thermal.
>
> arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 ----
> arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 ++++
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> index 9d21cdf6fce8..9c69d0917f69 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> @@ -100,8 +100,4 @@ wkup_vtm0: temperature-sensor@42050000 {
> power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;
> #thermal-sensor-cells = <1>;
> };
> -
> - thermal_zones: thermal-zones {
> - #include "k3-am654-industrial-thermal.dtsi"
> - };
> };
> diff --git a/arch/arm64/boot/dts/ti/k3-am654.dtsi b/arch/arm64/boot/dts/ti/k3-am654.dtsi
> index f0a6541b8042..a89257900047 100644
> --- a/arch/arm64/boot/dts/ti/k3-am654.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am654.dtsi
> @@ -112,4 +112,8 @@ msmc_l3: l3-cache0 {
> compatible = "cache";
> cache-level = <3>;
> };
> +
> + thermal_zones: thermal-zones {
> + #include "k3-am654-industrial-thermal.dtsi"
> + };
> };
>
On Thu, 16 Sep 2021 13:18:01 -0500, Nishanth Menon wrote:
> When commit 64f9147d914d ("arm64: dts: ti: am654: Add thermal
> zones") introduced thermal-zones for am654, it defined as under the
> common am65-wakeup bus segment, when it is am654 specific (other SoC
> spins can have slightly different thermal characteristics). Futher,
> thermal-zones is introduced under simple-bus node, when it has no
> actual register or base address.
>
> [...]
Hi Nishanth Menon,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/1] arm64: dts: ti: k3-am65: Relocate thermal-zones to SoC specific location
commit: 6037c75b193ac7aec33f131cd48744549b552604
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D