Skip to contentSkip to conversation

ARM: tegra: Hook up edp interrupt on Tegra124 SOCTHERM

PATCH In review Thierry Reding 3 participants 4 messages Nov 20, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: tegra: Hook up edp interrupt on Tegra124 SOCTHERM

From: Thierry Reding <[email protected]>

For some reason this was never hooked up. Do it now so that over-current interrupts can be logged.

---
 arch/arm/boot/dts/tegra124.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra124.dtsi +3 -1
index 64f488ba1e72..d2714419d823 100644
@@ -898,7 +898,9 @@ soctherm: thermal-sensor@700e2000 {
 		reg = <0x0 0x700e2000 0x0 0x600>, /* SOC_THERM reg_base */
 		      <0x0 0x60006000 0x0 0x400>; /* CAR reg_base */
 		reg-names = "soctherm-reg", "car-reg";
-		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "thermal", "edp";
 		clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
 			<&tegra_car TEGRA124_CLK_SOC_THERM>;
 		clock-names = "tsensor", "soctherm";
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/2 arm64: tegra: Hook up edp interrupt on Tegra132 SOCTHERM

From: Thierry Reding <[email protected]>

For some reason this was never hooked up. Do it now so that over-current interrupts can be logged.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +3 -1
index e40281510c0c..de420a117e59 100644
@@ -865,7 +865,9 @@ soctherm: thermal-sensor@700e2000 {
 		reg = <0x0 0x700e2000 0x0 0x600>, /* 0: SOC_THERM reg_base */
 		      <0x0 0x70040000 0x0 0x200>; /* 2: CCROC reg_base */
 		reg-names = "soctherm-reg", "ccroc-reg";
-		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIT_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "thermal", "edp";
 		clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
 		         <&tegra_car TEGRA124_CLK_SOC_THERM>;
 		clock-names = "tsensor", "soctherm";
Signature · 1 line
2.29.2
maintainer
#2 lore raw

Re: [PATCH 2/2] arm64: tegra: Hook up edp interrupt on Tegra132 SOCTHERM

Quoted 17 lines · Thierry Reding

From: Thierry Reding <[email protected]>

For some reason this was never hooked up. Do it now so that over-current interrupts can be logged.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +0 -0
index e40281510c0c..de420a117e59 100644

arch/arm64/boot/dts/nvidia/tegra132.dtsi soctherm: thermal-sensor@700e2000 { · line 869

Quoted 6 lines
arch/arm64/boot/dts/nvidia/tegra132.dtsi +2 -1
@@ -865,7 +865,9 @@ soctherm: thermal-sensor@700e2000 {
 		reg = <0x0 0x700e2000 0x0 0x600>, /* 0: SOC_THERM reg_base */
 		      <0x0 0x70040000 0x0 0x200>; /* 2: CCROC reg_base */
 		reg-names = "soctherm-reg", "ccroc-reg";
-		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIT_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

Looks like you got your GIT and GIC mixed up :-)

Error: /dvs/git/dirty/git-master_l4t-upstream/kernel/arch/arm64/boot/dts/nvidia/tegra132.dtsi:869.10-11 syntax error FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:326: recipe for target 'arch/arm64/boot/dts/nvidia/tegra132-norrin.dtb' failed make[3]: *** [arch/arm64/boot/dts/nvidia/tegra132-norrin.dtb] Error 1

Jon

Signature · 1 line
nvpublic
#3 lore raw
In reply to Thierry Reding
Quoted 18 lines · Thierry Reding

From: Thierry Reding <[email protected]>

For some reason this was never hooked up. Do it now so that over-current interrupts can be logged.

---
 arch/arm/boot/dts/tegra124.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra124.dtsi +0 -0
index 64f488ba1e72..d2714419d823 100644

arch/arm/boot/dts/tegra124.dtsi soctherm: thermal-sensor@700e2000 { · line 906

Quoted 10 lines
arch/arm/boot/dts/tegra124.dtsi +3 -1
@@ -898,7 +898,9 @@ soctherm: thermal-sensor@700e2000 {
                reg = <0x0 0x700e2000 0x0 0x600>, /* SOC_THERM reg_base */
                      <0x0 0x60006000 0x0 0x400>; /* CAR reg_base */
                reg-names = "soctherm-reg", "car-reg";
-               interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "thermal", "edp";
                clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
                        <&tegra_car TEGRA124_CLK_SOC_THERM>;
                clock-names = "tsensor", "soctherm";

Thanks for the fix. I confirm the interrupt is present on jetson-tk1. cat /proc/interrupts |grep therm
101: 0 0 0 0 LIC 48 Level
700e2000.thermal-sensor
102: 0 0 0 0 LIC 51 Level
soctherm_edp