diff options
author | Wei Ni <wni@nvidia.com> | 2016-05-11 06:20:20 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2016-09-27 02:02:32 -0400 |
commit | e12b048c3060975203225b6ebd30a4fe85082bab (patch) | |
tree | 393fe80ce24851f95274e493e52daaf8561cbc7b | |
parent | 40823f8e267f913d15003975429cffb008f98c75 (diff) |
arm: tegra: set hot trips for Tegra124
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 <wni@nvidia.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r-- | arch/arm/boot/dts/tegra124.dtsi | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 61c36a36f0c9..187a36c6d0fc 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi | |||
@@ -851,7 +851,9 @@ | |||
851 | 851 | ||
852 | soctherm: thermal-sensor@700e2000 { | 852 | soctherm: thermal-sensor@700e2000 { |
853 | compatible = "nvidia,tegra124-soctherm"; | 853 | compatible = "nvidia,tegra124-soctherm"; |
854 | reg = <0x0 0x700e2000 0x0 0x1000>; | 854 | reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */ |
855 | 0x0 0x60006000 0x0 0x400>; /* CAR reg_base */ | ||
856 | reg-names = "soctherm-reg", "car-reg"; | ||
855 | interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; | 857 | interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; |
856 | clocks = <&tegra_car TEGRA124_CLK_TSENSOR>, | 858 | clocks = <&tegra_car TEGRA124_CLK_TSENSOR>, |
857 | <&tegra_car TEGRA124_CLK_SOC_THERM>; | 859 | <&tegra_car TEGRA124_CLK_SOC_THERM>; |
@@ -859,6 +861,15 @@ | |||
859 | resets = <&tegra_car 78>; | 861 | resets = <&tegra_car 78>; |
860 | reset-names = "soctherm"; | 862 | reset-names = "soctherm"; |
861 | #thermal-sensor-cells = <1>; | 863 | #thermal-sensor-cells = <1>; |
864 | |||
865 | throttle-cfgs { | ||
866 | throttle_heavy: heavy { | ||
867 | nvidia,priority = <100>; | ||
868 | nvidia,cpu-throt-percent = <85>; | ||
869 | |||
870 | #cooling-cells = <2>; | ||
871 | }; | ||
872 | }; | ||
862 | }; | 873 | }; |
863 | 874 | ||
864 | dfll: clock@70110000 { | 875 | dfll: clock@70110000 { |
@@ -1161,13 +1172,18 @@ | |||
1161 | hysteresis = <0>; | 1172 | hysteresis = <0>; |
1162 | type = "critical"; | 1173 | type = "critical"; |
1163 | }; | 1174 | }; |
1175 | cpu_throttle_trip: throttle-trip { | ||
1176 | temperature = <100000>; | ||
1177 | hysteresis = <1000>; | ||
1178 | type = "hot"; | ||
1179 | }; | ||
1164 | }; | 1180 | }; |
1165 | 1181 | ||
1166 | cooling-maps { | 1182 | cooling-maps { |
1167 | /* | 1183 | map0 { |
1168 | * There are currently no cooling maps, | 1184 | trip = <&cpu_throttle_trip>; |
1169 | * because there are no cooling devices. | 1185 | cooling-device = <&throttle_heavy 1 1>; |
1170 | */ | 1186 | }; |
1171 | }; | 1187 | }; |
1172 | }; | 1188 | }; |
1173 | 1189 | ||
@@ -1207,13 +1223,18 @@ | |||
1207 | hysteresis = <0>; | 1223 | hysteresis = <0>; |
1208 | type = "critical"; | 1224 | type = "critical"; |
1209 | }; | 1225 | }; |
1226 | gpu_throttle_trip: throttle-trip { | ||
1227 | temperature = <99000>; | ||
1228 | hysteresis = <1000>; | ||
1229 | type = "hot"; | ||
1230 | }; | ||
1210 | }; | 1231 | }; |
1211 | 1232 | ||
1212 | cooling-maps { | 1233 | cooling-maps { |
1213 | /* | 1234 | map0 { |
1214 | * There are currently no cooling maps, | 1235 | trip = <&gpu_throttle_trip>; |
1215 | * because there are no cooling devices. | 1236 | cooling-device = <&throttle_heavy 1 1>; |
1216 | */ | 1237 | }; |
1217 | }; | 1238 | }; |
1218 | }; | 1239 | }; |
1219 | 1240 | ||