From 42c49c99d4061c0f7ee14eb78451f4ff8c75cdef Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 21 Jul 2023 10:15:37 +0000 Subject: [PATCH] tegra234: Rearrange pwm-fan node align to mainline Rearrange the pwm-fan node to align to mainline. Cherry picked from e63472eda5ea84424e4bff2b809389b0ba266613 Change: Selected alignment for pwm-fan node Bug 4204736 Change-Id: I2ba2f3c57e59663559bc278972bbd339f2cefbc7 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2940481 GVS: Gerrit_Virtual_Submit --- tegra234-p3737-0000+p3701-0000.dts | 4 ---- tegra234-p3737-0000.dtsi | 6 ++++++ tegra234-p3768-0000+p3767-0000.dts | 5 +---- tegra234-p3768-0000.dtsi | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tegra234-p3737-0000+p3701-0000.dts b/tegra234-p3737-0000+p3701-0000.dts index ef2ce47..f8b5efc 100644 --- a/tegra234-p3737-0000+p3701-0000.dts +++ b/tegra234-p3737-0000+p3701-0000.dts @@ -2283,11 +2283,7 @@ }; pwm-fan { - compatible = "pwm-fan"; - pwms = <&pwm3 0 45334>; - cooling-levels = <0 95 178 255>; - #cooling-cells = <2>; }; serial { diff --git a/tegra234-p3737-0000.dtsi b/tegra234-p3737-0000.dtsi index 022a540..d94147f 100644 --- a/tegra234-p3737-0000.dtsi +++ b/tegra234-p3737-0000.dtsi @@ -33,6 +33,12 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + pwms = <&pwm3 0 45334>; + #cooling-cells = <2>; + }; + vdd_1v8_sys: regulator-vdd-1v8-sys { compatible = "regulator-fixed"; regulator-name = "VDD_1V8_SYS"; diff --git a/tegra234-p3768-0000+p3767-0000.dts b/tegra234-p3768-0000+p3767-0000.dts index 7dfbc38..cadb249 100644 --- a/tegra234-p3768-0000+p3767-0000.dts +++ b/tegra234-p3768-0000+p3767-0000.dts @@ -112,11 +112,8 @@ }; }; - fan: pwm-fan { - compatible = "pwm-fan"; - pwms = <&pwm3 0 45334>; + pwm-fan { cooling-levels = <0 95 178 255>; - #cooling-cells = <2>; }; vdd_3v3_pcie: regulator-vdd-3v3-pcie { diff --git a/tegra234-p3768-0000.dtsi b/tegra234-p3768-0000.dtsi index aee2142..8360481 100644 --- a/tegra234-p3768-0000.dtsi +++ b/tegra234-p3768-0000.dtsi @@ -209,7 +209,6 @@ fan: pwm-fan { compatible = "pwm-fan"; pwms = <&pwm3 0 45334>; - cooling-levels = <0 95 178 255>; #cooling-cells = <2>; };