[PATCH v5 05/11] arm: tegra: set hot trips for Tegra124

2016-05-11 Thread Wei Ni
Enable throttle function for SOC_THERM.
Set "hot" trips for cpu and gpu thermal zones, which
can trigger the SOC_THERM hardware throttle.

Signed-off-by: Wei Ni 
---
 arch/arm/boot/dts/tegra124.dtsi | 39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 08c7f85ea2c8..0a47a29406ce 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -846,7 +846,9 @@
 
soctherm: thermal-sensor@0,700e2000 {
compatible = "nvidia,tegra124-soctherm";
-   reg = <0x0 0x700e2000 0x0 0x1000>;
+   reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */
+   0x0 0x60006000 0x0 0x400>; /* CAR reg_base */
+   reg-names = "soctherm-reg", "car-reg";
interrupts = ;
clocks = <_car TEGRA124_CLK_TSENSOR>,
<_car TEGRA124_CLK_SOC_THERM>;
@@ -854,6 +856,15 @@
resets = <_car 78>;
reset-names = "soctherm";
#thermal-sensor-cells = <1>;
+
+   throttle-cfgs {
+   throttle_heavy: heavy {
+   nvidia,priority = <100>;
+   nvidia,cpu-throt-percent = <85>;
+
+   #cooling-cells = <2>;
+   };
+   };
};
 
dfll: clock@0,7011 {
@@ -1156,13 +1167,18 @@
hysteresis = <0>;
type = "critical";
};
+   cpu_throttle_trip: throttle-trip {
+   temperature = <10>;
+   hysteresis = <1000>;
+   type = "hot";
+   };
};
 
cooling-maps {
-   /*
-* There are currently no cooling maps,
-* because there are no cooling devices.
-*/
+   map0 {
+   trip = <_throttle_trip>;
+   cooling-device = <_heavy 1 1>;
+   };
};
};
 
@@ -1202,13 +1218,18 @@
hysteresis = <0>;
type = "critical";
};
+   gpu_throttle_trip: throttle-trip {
+   temperature = <99000>;
+   hysteresis = <1000>;
+   type = "hot";
+   };
};
 
cooling-maps {
-   /*
-* There are currently no cooling maps,
-* because there are no cooling devices.
-*/
+   map0 {
+   trip = <_throttle_trip>;
+   cooling-device = <_heavy 1 1>;
+   };
};
};
 
-- 
1.9.1



[PATCH v5 05/11] arm: tegra: set hot trips for Tegra124

2016-05-11 Thread Wei Ni
Enable throttle function for SOC_THERM.
Set "hot" trips for cpu and gpu thermal zones, which
can trigger the SOC_THERM hardware throttle.

Signed-off-by: Wei Ni 
---
 arch/arm/boot/dts/tegra124.dtsi | 39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 08c7f85ea2c8..0a47a29406ce 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -846,7 +846,9 @@
 
soctherm: thermal-sensor@0,700e2000 {
compatible = "nvidia,tegra124-soctherm";
-   reg = <0x0 0x700e2000 0x0 0x1000>;
+   reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */
+   0x0 0x60006000 0x0 0x400>; /* CAR reg_base */
+   reg-names = "soctherm-reg", "car-reg";
interrupts = ;
clocks = <_car TEGRA124_CLK_TSENSOR>,
<_car TEGRA124_CLK_SOC_THERM>;
@@ -854,6 +856,15 @@
resets = <_car 78>;
reset-names = "soctherm";
#thermal-sensor-cells = <1>;
+
+   throttle-cfgs {
+   throttle_heavy: heavy {
+   nvidia,priority = <100>;
+   nvidia,cpu-throt-percent = <85>;
+
+   #cooling-cells = <2>;
+   };
+   };
};
 
dfll: clock@0,7011 {
@@ -1156,13 +1167,18 @@
hysteresis = <0>;
type = "critical";
};
+   cpu_throttle_trip: throttle-trip {
+   temperature = <10>;
+   hysteresis = <1000>;
+   type = "hot";
+   };
};
 
cooling-maps {
-   /*
-* There are currently no cooling maps,
-* because there are no cooling devices.
-*/
+   map0 {
+   trip = <_throttle_trip>;
+   cooling-device = <_heavy 1 1>;
+   };
};
};
 
@@ -1202,13 +1218,18 @@
hysteresis = <0>;
type = "critical";
};
+   gpu_throttle_trip: throttle-trip {
+   temperature = <99000>;
+   hysteresis = <1000>;
+   type = "hot";
+   };
};
 
cooling-maps {
-   /*
-* There are currently no cooling maps,
-* because there are no cooling devices.
-*/
+   map0 {
+   trip = <_throttle_trip>;
+   cooling-device = <_heavy 1 1>;
+   };
};
};
 
-- 
1.9.1