Skip to content

Commit 90624f5

Browse files
author
Herton R. Krzesinski
committed
Merge: arm64: tegra: Add PWM fan for Jetson AGX Orin
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1817 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2144639 Depends: https://bugzilla.redhat.com/show_bug.cgi?id=2135064 Tested: Simple boot tests and CKI Minor change for DTS bindings and the use of those bindings. Signed-off-by: Al Stone <ahs3@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: Mark Salter <msalter@redhat.com> Approved-by: Craig Magina <cmagina@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 4eb023e + 142535f commit 90624f5

File tree

2 files changed

+92
-2
lines changed

2 files changed

+92
-2
lines changed

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,6 +2007,12 @@
20072007
status = "okay";
20082008
};
20092009

2010+
pwm@32a0000 {
2011+
assigned-clocks = <&bpmp TEGRA234_CLK_PWM3>;
2012+
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
2013+
status = "okay";
2014+
};
2015+
20102016
hda@3510000 {
20112017
nvidia,model = "NVIDIA Jetson AGX Orin HDA";
20122018
status = "okay";
@@ -2184,4 +2190,12 @@
21842190
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
21852191
"p2u-5", "p2u-6", "p2u-7";
21862192
};
2193+
2194+
pwm-fan {
2195+
compatible = "pwm-fan";
2196+
pwms = <&pwm3 0 45334>;
2197+
2198+
cooling-levels = <0 95 178 255>;
2199+
#cooling-cells = <2>;
2200+
};
21872201
};

arch/arm64/boot/dts/nvidia/tegra234.dtsi

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,7 @@
870870
};
871871

872872
pwm1: pwm@3280000 {
873-
compatible = "nvidia,tegra194-pwm",
874-
"nvidia,tegra186-pwm";
873+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
875874
reg = <0x3280000 0x10000>;
876875
clocks = <&bpmp TEGRA234_CLK_PWM1>;
877876
clock-names = "pwm";
@@ -881,6 +880,72 @@
881880
#pwm-cells = <2>;
882881
};
883882

883+
pwm2: pwm@3290000 {
884+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
885+
reg = <0x3290000 0x10000>;
886+
clocks = <&bpmp TEGRA234_CLK_PWM2>;
887+
clock-names = "pwm";
888+
resets = <&bpmp TEGRA234_RESET_PWM2>;
889+
reset-names = "pwm";
890+
status = "disabled";
891+
#pwm-cells = <2>;
892+
};
893+
894+
pwm3: pwm@32a0000 {
895+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
896+
reg = <0x32a0000 0x10000>;
897+
clocks = <&bpmp TEGRA234_CLK_PWM3>;
898+
clock-names = "pwm";
899+
resets = <&bpmp TEGRA234_RESET_PWM3>;
900+
reset-names = "pwm";
901+
status = "disabled";
902+
#pwm-cells = <2>;
903+
};
904+
905+
pwm5: pwm@32c0000 {
906+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
907+
reg = <0x32c0000 0x10000>;
908+
clocks = <&bpmp TEGRA234_CLK_PWM5>;
909+
clock-names = "pwm";
910+
resets = <&bpmp TEGRA234_RESET_PWM5>;
911+
reset-names = "pwm";
912+
status = "disabled";
913+
#pwm-cells = <2>;
914+
};
915+
916+
pwm6: pwm@32d0000 {
917+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
918+
reg = <0x32d0000 0x10000>;
919+
clocks = <&bpmp TEGRA234_CLK_PWM6>;
920+
clock-names = "pwm";
921+
resets = <&bpmp TEGRA234_RESET_PWM6>;
922+
reset-names = "pwm";
923+
status = "disabled";
924+
#pwm-cells = <2>;
925+
};
926+
927+
pwm7: pwm@32e0000 {
928+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
929+
reg = <0x32e0000 0x10000>;
930+
clocks = <&bpmp TEGRA234_CLK_PWM7>;
931+
clock-names = "pwm";
932+
resets = <&bpmp TEGRA234_RESET_PWM7>;
933+
reset-names = "pwm";
934+
status = "disabled";
935+
#pwm-cells = <2>;
936+
};
937+
938+
pwm8: pwm@32f0000 {
939+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
940+
reg = <0x32f0000 0x10000>;
941+
clocks = <&bpmp TEGRA234_CLK_PWM8>;
942+
clock-names = "pwm";
943+
resets = <&bpmp TEGRA234_RESET_PWM8>;
944+
reset-names = "pwm";
945+
status = "disabled";
946+
#pwm-cells = <2>;
947+
};
948+
884949
spi@3300000 {
885950
compatible = "nvidia,tegra234-qspi";
886951
reg = <0x3300000 0x1000>;
@@ -1530,6 +1595,17 @@
15301595
gpio-controller;
15311596
};
15321597

1598+
pwm4: pwm@c340000 {
1599+
compatible = "nvidia,tegra234-pwm", "nvidia,tegra194-pwm";
1600+
reg = <0xc340000 0x10000>;
1601+
clocks = <&bpmp TEGRA234_CLK_PWM4>;
1602+
clock-names = "pwm";
1603+
resets = <&bpmp TEGRA234_RESET_PWM4>;
1604+
reset-names = "pwm";
1605+
status = "disabled";
1606+
#pwm-cells = <2>;
1607+
};
1608+
15331609
pmc: pmc@c360000 {
15341610
compatible = "nvidia,tegra234-pmc";
15351611
reg = <0x0c360000 0x10000>,

0 commit comments

Comments
 (0)