NVIDIA Tegra ARM32 device-tree improvements
Subsystems (2)
v3 cover NVIDIA Tegra ARM32 device-tree improvements
Hi,
This series is partially factored out from [1] since the DT patches could be applied separately. In addition I added couple more new patches and implemented suggestion given by Daniel Lezcano to [1], see "Specify all CPU cores as cooling devices" patches.
[1] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=221130
Please note that this patchset enables voltage scaling for a few boards, but currently voltage scaling is limited in kernel by the regulator coupler drivers, so it's safe to change the device-trees. Voltage scaling will be fully unlocked once [1] will be merged.
Changelog:
v3: - Added new "Specify tps65911 as wakeup source" patch, which previously
was a part of series that added wakeup-source support to TPS65911 RTC driver [1]. The RTC series was partially applied, excluding the DT patch.
[1] https://lore.kernel.org/linux-rtc/[email protected]/
v2: - The "acer-a500: Rename avdd to vdda of touchscreen node" patch
now shouldn't have merge conflicts with the upstream kernel since v1 was based on a patch that adds a new atmel,wakeup-method property, which is not supported by upstream yet.
- Fixed unwrapped commit description in the "cardhu: Support CPU frequency and voltage" patch.
Dmitry Osipenko (14):
ARM: tegra: ventana: Support CPU and Core voltage scaling
ARM: tegra: ventana: Support CPU thermal throttling
ARM: tegra: cardhu: Support CPU frequency and voltage scaling on all
board variants
ARM: tegra: cardhu: Support CPU thermal throttling
ARM: tegra: paz00: Enable full voltage scaling ranges for CPU and Core
domains
ARM: tegra: acer-a500: Enable core voltage scaling
ARM: tegra: acer-a500: Reduce thermal throttling hysteresis to 0.2C
ARM: tegra: acer-a500: Specify all CPU cores as cooling devices
ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
ARM: tegra: nexus7: Specify all CPU cores as cooling devices
ARM: tegra: ouya: Specify all CPU cores as cooling devices
ARM: tegra: Specify CPU suspend OPP in device-tree
ARM: tegra: Specify memory suspend OPP in device-tree
ARM: tegra: Specify tps65911 as wakeup source
.../boot/dts/tegra124-peripherals-opp.dtsi | 5 ++ .../boot/dts/tegra20-acer-a500-picasso.dts | 14 ++-- arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 2 + arch/arm/boot/dts/tegra20-paz00.dts | 14 ++-- .../arm/boot/dts/tegra20-peripherals-opp.dtsi | 1 + arch/arm/boot/dts/tegra20-ventana.dts | 78 ++++++++++++++--- arch/arm/boot/dts/tegra30-apalis.dtsi | 1 + .../tegra30-asus-nexus7-grouper-common.dtsi | 14 +++- .../tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 1 + arch/arm/boot/dts/tegra30-beaver.dts | 1 + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 ----------- arch/arm/boot/dts/tegra30-cardhu.dtsi | 84 ++++++++++++++++++- arch/arm/boot/dts/tegra30-colibri.dtsi | 1 + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 3 + arch/arm/boot/dts/tegra30-ouya.dts | 16 +++- .../arm/boot/dts/tegra30-peripherals-opp.dtsi | 3 + 16 files changed, 202 insertions(+), 84 deletions(-)
Signature · 1 line
2.29.2
PATCH v3 1/14 ARM: tegra: ventana: Support CPU and Core voltage scaling
Support CPU and Core voltage scaling on Tegra20 Ventana board.
--- arch/arm/boot/dts/tegra20-ventana.dts | 37 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-)
arch/arm/boot/dts/tegra20-ventana.dts +28 -9
@@ -4,6 +4,7 @@ #include <dt-bindings/input/input.h> #include "tegra20.dtsi" #include "tegra20-cpu-opp.dtsi" +#include "tegra20-cpu-opp-microvolt.dtsi" / { model = "NVIDIA Tegra20 Ventana evaluation board";
@@ -420,18 +421,28 @@ sys_reg: sys { regulator-always-on; }; - sm0 { + vdd_core: sm0 { regulator-name = "vdd_sm0,vdd_core"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; + regulator-coupled-with = <&rtc_vdd &vdd_cpu>; + regulator-coupled-max-spread = <170000 550000>; regulator-always-on; + regulator-boot-on; + + nvidia,tegra-core-regulator; }; - sm1 { + vdd_cpu: sm1 { regulator-name = "vdd_sm1,vdd_cpu"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1125000>; + regulator-coupled-with = <&vdd_core &rtc_vdd>; + regulator-coupled-max-spread = <550000 550000>; regulator-always-on; + regulator-boot-on; + + nvidia,tegra-cpu-regulator; }; sm2_reg: sm2 {
@@ -450,10 +461,16 @@ ldo1 { regulator-always-on; }; - ldo2 { + rtc_vdd: ldo2 { regulator-name = "vdd_ldo2,vdd_rtc"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; + regulator-coupled-with = <&vdd_core &vdd_cpu>; + regulator-coupled-max-spread = <170000 550000>; + regulator-always-on; + regulator-boot-on; + + nvidia,tegra-rtc-regulator; }; ldo3 {
@@ -595,10 +612,12 @@ clk32k_in: clock@0 { cpus { cpu0: cpu@0 { + cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; }; cpu@1 { + cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; }; };
Signature · 1 line
2.29.2
PATCH v3 2/14 ARM: tegra: ventana: Support CPU thermal throttling
In reply to Dmitry OsipenkoEnable CPU thermal throttling on Tegra20 Ventana board.
--- arch/arm/boot/dts/tegra20-ventana.dts | 41 +++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra20-ventana.dts +39 -2
@@ -2,6 +2,7 @@ /dts-v1/; #include <dt-bindings/input/input.h> +#include <dt-bindings/thermal/thermal.h> #include "tegra20.dtsi" #include "tegra20-cpu-opp.dtsi" #include "tegra20-cpu-opp-microvolt.dtsi"
@@ -528,9 +529,10 @@ ldo_rtc { }; }; - temperature-sensor@4c { + nct1008: temperature-sensor@4c { compatible = "onnn,nct1008"; reg = <0x4c>; + #thermal-sensor-cells = <1>; }; };
@@ -614,11 +616,13 @@ cpus { cpu0: cpu@0 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; - cpu@1 { + cpu1: cpu@1 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; };
@@ -716,4 +720,37 @@ sound { <&tegra_car TEGRA20_CLK_CDEV1>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; + + thermal-zones { + cpu-thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <5000>; /* milliseconds */ + + thermal-sensors = <&nct1008 1>; + + trips { + trip0: cpu-alert0 { + /* start throttling at 50C */ + temperature = <50000>; + hysteresis = <200>; + type = "passive"; + }; + + trip1: cpu-crit { + /* shut down at 60C */ + temperature = <60000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&trip0>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; };
Signature · 1 line
2.29.2
PATCH v3 3/14 ARM: tegra: cardhu: Support CPU frequency and voltage scaling on all board variants
In reply to Dmitry OsipenkoEnable CPU frequency and voltage scaling on all Tegra30 Cardhu board variants.
--- arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 ------------------------ arch/arm/boot/dts/tegra30-cardhu.dtsi | 40 ++++++++++++++++++-- 2 files changed, 37 insertions(+), 51 deletions(-)
arch/arm/boot/dts/tegra30-cardhu-a04.dts +0 -48
@@ -2,8 +2,6 @@ /dts-v1/; #include "tegra30-cardhu.dtsi" -#include "tegra30-cpu-opp.dtsi" -#include "tegra30-cpu-opp-microvolt.dtsi" /* This dts file support the cardhu A04 and later versions of board */
@@ -92,50 +90,4 @@ vdd_bl2_reg: regulator@106 { enable-active-high; gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>; }; - - i2c@7000d000 { - pmic: tps65911@2d { - regulators { - vddctrl_reg: vddctrl { - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1125000>; - regulator-coupled-with = <&vddcore_reg>; - regulator-coupled-max-spread = <300000>; - regulator-max-step-microvolt = <100000>; - - nvidia,tegra-cpu-regulator; - }; - }; - }; - - vddcore_reg: tps62361@60 { - regulator-coupled-with = <&vddctrl_reg>; - regulator-coupled-max-spread = <300000>; - regulator-max-step-microvolt = <100000>; - - nvidia,tegra-core-regulator; - }; - }; - - cpus { - cpu0: cpu@0 { - cpu-supply = <&vddctrl_reg>; - operating-points-v2 = <&cpu0_opp_table>; - }; - - cpu@1 { - cpu-supply = <&vddctrl_reg>; - operating-points-v2 = <&cpu0_opp_table>; - }; - - cpu@2 { - cpu-supply = <&vddctrl_reg>; - operating-points-v2 = <&cpu0_opp_table>; - }; - - cpu@3 { - cpu-supply = <&vddctrl_reg>; - operating-points-v2 = <&cpu0_opp_table>; - }; - }; };
arch/arm/boot/dts/tegra30-cardhu.dtsi +37 -3
@@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> #include "tegra30.dtsi" +#include "tegra30-cpu-opp.dtsi" +#include "tegra30-cpu-opp-microvolt.dtsi" /** * This file contains common DT entry for all fab version of Cardhu.
@@ -272,9 +274,14 @@ vdd2_reg: vdd2 { vddctrl_reg: vddctrl { regulator-name = "vdd_cpu,vdd_sys"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1250000>; + regulator-coupled-with = <&vdd_core>; + regulator-coupled-max-spread = <300000>; + regulator-max-step-microvolt = <100000>; regulator-always-on; + + nvidia,tegra-cpu-regulator; }; vio_reg: vio {
@@ -342,17 +349,22 @@ temperature-sensor@4c { interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_LEVEL_LOW>; }; - tps62361@60 { + vdd_core: tps62361@60 { compatible = "ti,tps62361"; reg = <0x60>; regulator-name = "tps62361-vout"; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1500000>; + regulator-coupled-with = <&vddctrl_reg>; + regulator-coupled-max-spread = <300000>; + regulator-max-step-microvolt = <100000>; regulator-boot-on; regulator-always-on; ti,vsel0-state-high; ti,vsel1-state-high; + + nvidia,tegra-core-regulator; }; };
@@ -424,6 +436,28 @@ clk32k_in: clock@0 { #clock-cells = <0>; }; + cpus { + cpu0: cpu@0 { + cpu-supply = <&vddctrl_reg>; + operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu1: cpu@1 { + cpu-supply = <&vddctrl_reg>; + operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu2: cpu@2 { + cpu-supply = <&vddctrl_reg>; + operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu3: cpu@3 { + cpu-supply = <&vddctrl_reg>; + operating-points-v2 = <&cpu0_opp_table>; + }; + }; + panel: panel { compatible = "chunghwa,claa101wb01"; ddc-i2c-bus = <&panelddc>;
Signature · 1 line
2.29.2
PATCH v3 4/14 ARM: tegra: cardhu: Support CPU thermal throttling
In reply to Dmitry OsipenkoEnable CPU thermal throttling on Tegra30 Cardhu board.
--- arch/arm/boot/dts/tegra30-cardhu.dtsi | 43 ++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-cardhu.dtsi +42 -1
@@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> +#include <dt-bindings/thermal/thermal.h> #include "tegra30.dtsi" #include "tegra30-cpu-opp.dtsi" #include "tegra30-cpu-opp-microvolt.dtsi"
@@ -341,12 +342,13 @@ ldo8_reg: ldo8 { }; }; - temperature-sensor@4c { + nct1008: temperature-sensor@4c { compatible = "onnn,nct1008"; reg = <0x4c>; vcc-supply = <&sys_3v3_reg>; interrupt-parent = <&gpio>; interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; }; vdd_core: tps62361@60 {
@@ -440,21 +442,25 @@ cpus { cpu0: cpu@0 { cpu-supply = <&vddctrl_reg>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu1: cpu@1 { cpu-supply = <&vddctrl_reg>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu2: cpu@2 { cpu-supply = <&vddctrl_reg>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu3: cpu@3 { cpu-supply = <&vddctrl_reg>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; };
@@ -637,6 +643,41 @@ sound { <&tegra_car TEGRA30_CLK_EXTERN1>; }; + thermal-zones { + cpu-thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <5000>; /* milliseconds */ + + thermal-sensors = <&nct1008 1>; + + trips { + trip0: cpu-alert0 { + /* throttle at 57C until temperature drops to 56.8C */ + temperature = <57000>; + hysteresis = <200>; + type = "passive"; + }; + + trip1: cpu-crit { + /* shut down at 60C */ + temperature = <60000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&trip0>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + gpio-keys { compatible = "gpio-keys";
Signature · 1 line
2.29.2
PATCH v3 5/14 ARM: tegra: paz00: Enable full voltage scaling ranges for CPU and Core domains
In reply to Dmitry OsipenkoEnable full voltage scaling ranges for CPU and Core power domains.
--- arch/arm/boot/dts/tegra20-paz00.dts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/tegra20-paz00.dts +7 -7
@@ -387,10 +387,10 @@ sys_reg: sys { core_vdd_reg: sm0 { regulator-name = "+1.2vs_sm0,vdd_core"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1225000>; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; regulator-coupled-with = <&rtc_vdd_reg &cpu_vdd_reg>; - regulator-coupled-max-spread = <170000 450000>; + regulator-coupled-max-spread = <170000 550000>; regulator-always-on; nvidia,tegra-core-regulator;
@@ -401,7 +401,7 @@ cpu_vdd_reg: sm1 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1100000>; regulator-coupled-with = <&core_vdd_reg &rtc_vdd_reg>; - regulator-coupled-max-spread = <450000 450000>; + regulator-coupled-max-spread = <550000 550000>; regulator-always-on; nvidia,tegra-cpu-regulator;
@@ -425,10 +425,10 @@ ldo1 { rtc_vdd_reg: ldo2 { regulator-name = "+1.2vs_ldo2,vdd_rtc"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1225000>; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; regulator-coupled-with = <&core_vdd_reg &cpu_vdd_reg>; - regulator-coupled-max-spread = <170000 450000>; + regulator-coupled-max-spread = <170000 550000>; regulator-always-on; nvidia,tegra-rtc-regulator;
Signature · 1 line
2.29.2
PATCH v3 6/14 ARM: tegra: acer-a500: Enable core voltage scaling
In reply to Dmitry OsipenkoAllow lower core voltages on Acer A500.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +2 -2
@@ -578,7 +578,7 @@ sys_reg: sys { vdd_core: sm0 { regulator-name = "vdd_sm0,vdd_core"; - regulator-min-microvolt = <1200000>; + regulator-min-microvolt = <950000>; regulator-max-microvolt = <1300000>; regulator-coupled-with = <&rtc_vdd &vdd_cpu>; regulator-coupled-max-spread = <170000 550000>;
@@ -619,7 +619,7 @@ ldo1 { rtc_vdd: ldo2 { regulator-name = "vdd_ldo2,vdd_rtc"; - regulator-min-microvolt = <1200000>; + regulator-min-microvolt = <950000>; regulator-max-microvolt = <1300000>; regulator-coupled-with = <&vdd_core &vdd_cpu>; regulator-coupled-max-spread = <170000 550000>;
Signature · 1 line
2.29.2
PATCH v3 7/14 ARM: tegra: acer-a500: Reduce thermal throttling hysteresis to 0.2C
In reply to Dmitry OsipenkoThe 2C hysteresis is a bit too high, although CPU never gets hot on A500. Nevertheless, let's reduce thermal throttling hysteresis to 0.2C, which is a much more reasonable value.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1 -1
@@ -1058,7 +1058,7 @@ trips { trip0: cpu-alert0 { /* start throttling at 50C */ temperature = <50000>; - hysteresis = <3000>; + hysteresis = <200>; type = "passive"; };
Signature · 1 line
2.29.2
PATCH v3 8/14 ARM: tegra: acer-a500: Specify all CPU cores as cooling devices
In reply to Dmitry OsipenkoIf CPU0 is unplugged the cooling device can not rebind to CPU1. And if CPU0 is plugged in again, the cooling device may fail to initialize.
If the CPUs are mapped with the physical CPU0 to Linux numbering CPU1, the cooling device mapping will fail.
Hence specify all CPU cores as a cooling devices in the device-tree.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +4 -2
@@ -841,9 +841,10 @@ cpu0: cpu@0 { #cooling-cells = <2>; }; - cpu@1 { + cpu1: cpu@1 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; };
@@ -1073,7 +1074,8 @@ trip1: cpu-crit { cooling-maps { map0 { trip = <&trip0>; - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; }; };
Signature · 1 line
2.29.2
PATCH v3 9/14 ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
In reply to Dmitry OsipenkoRename avdd supply to vdda of the touchscreen node. The old supply name was incorrect.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1 -1
@@ -449,7 +449,7 @@ touchscreen@4c { reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>; - avdd-supply = <&vdd_3v3_sys>; + vdda-supply = <&vdd_3v3_sys>; vdd-supply = <&vdd_3v3_sys>; atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>;
Signature · 1 line
2.29.2
Re: [PATCH v3 09/14] ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
Quoted 7 lines · Dmitry Osipenko
Rename avdd supply to vdda of the touchscreen node. The old supply name was incorrect.
Signed-off-by Dmitry Osipenko <[email protected]>--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
This one didn't apply cleanly, but applying it manually was fine...
Quoted 6 lines
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +0
-0
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts touchscreen@4c { · line 455
Quoted 8 lines
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1
-1@@ -449,7 +449,7 @@ touchscreen@4c { reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>; - avdd-supply = <&vdd_3v3_sys>; + vdda-supply = <&vdd_3v3_sys>; vdd-supply = <&vdd_3v3_sys>; atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>;
Looks like this line is not upstream. Did I miss a patch somewhere?
Thierry
Re: [PATCH v3 09/14] ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
24.03.2021 18:11, Thierry Reding пишет:
Quoted 10 lines · Dmitry Osipenko
Quoted 7 lines
Rename avdd supply to vdda of the touchscreen node. The old supply name was incorrect.
Signed-off-by Dmitry Osipenko <[email protected]>--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)This one didn't apply cleanly, but applying it manually was fine...
Great, thank you. This is the correct fix for this trouble.
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +0
-0@@ -449,7 +449,7 @@ touchscreen@4c { reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>;
Quoted 7 lines
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts touchscreen@4c { · line 455
Quoted 5 lines
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1
-1- avdd-supply = <&vdd_3v3_sys>; + vdda-supply = <&vdd_3v3_sys>; vdd-supply = <&vdd_3v3_sys>; atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>;Looks like this line is not upstream. Did I miss a patch somewhere?
Indeed! I kept forgetting to rebase this patch properly, nevertheless that line already got into -next a day ago [1].
This [1] patch should be in yours inbox.
PATCH v3 10/14 ARM: tegra: nexus7: Specify all CPU cores as cooling devices
In reply to Dmitry OsipenkoIf CPU0 is unplugged the cooling device can not rebind to CPU1. And if CPU0 is plugged in again, the cooling device may fail to initialize.
If the CPUs are mapped with the physical CPU0 to Linux numbering CPU1, the cooling device mapping will fail.
Hence specify all CPU cores as a cooling devices in the device-tree.
--- .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi +10 -4
@@ -1056,19 +1056,22 @@ cpu0: cpu@0 { #cooling-cells = <2>; }; - cpu@1 { + cpu1: cpu@1 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; - cpu@2 { + cpu2: cpu@2 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; - cpu@3 { + cpu3: cpu@3 { cpu-supply = <&vdd_cpu>; operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; };
@@ -1281,7 +1284,10 @@ trip1: cpu-crit { cooling-maps { map0 { trip = <&trip0>; - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; }; };
Signature · 1 line
2.29.2
PATCH v3 11/14 ARM: tegra: ouya: Specify all CPU cores as cooling devices
In reply to Dmitry OsipenkoIf CPU0 is unplugged the cooling device can not rebind to CPU1. And if CPU0 is plugged in again, the cooling device may fail to initialize.
If the CPUs are mapped with the physical CPU0 to Linux numbering CPU1, the cooling device mapping will fail.
Hence specify all CPU cores as a cooling devices in the device-tree.
--- arch/arm/boot/dts/tegra30-ouya.dts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-ouya.dts +11 -4
@@ -391,19 +391,23 @@ cpu0: cpu@0 { cpu-supply = <&vdd_cpu>; #cooling-cells = <2>; }; - cpu@1 { + + cpu1: cpu@1 { operating-points-v2 = <&cpu0_opp_table>; cpu-supply = <&vdd_cpu>; + #cooling-cells = <2>; }; - cpu@2 { + cpu2: cpu@2 { operating-points-v2 = <&cpu0_opp_table>; cpu-supply = <&vdd_cpu>; + #cooling-cells = <2>; }; - cpu@3 { + cpu3: cpu@3 { operating-points-v2 = <&cpu0_opp_table>; cpu-supply = <&vdd_cpu>; + #cooling-cells = <2>; }; };
@@ -455,7 +459,10 @@ map0 { }; map1 { trip = <&cpu_alert1>; - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; }; };
Signature · 1 line
2.29.2
PATCH v3 12/14 ARM: tegra: Specify CPU suspend OPP in device-tree
In reply to Dmitry OsipenkoSpecify CPU suspend OPP in a device-tree, just for consistency. Now CPU will always suspend on the same frequency.
--- arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 2 ++ arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 3 +++ 2 files changed, 5 insertions(+)
arch/arm/boot/dts/tegra20-cpu-opp.dtsi +2 -0
@@ -9,12 +9,14 @@ opp@216000000,750 { clock-latency-ns = <400000>; opp-supported-hw = <0x0F 0x0003>; opp-hz = /bits/ 64 <216000000>; + opp-suspend; }; opp@216000000,800 { clock-latency-ns = <400000>; opp-supported-hw = <0x0F 0x0004>; opp-hz = /bits/ 64 <216000000>; + opp-suspend; }; opp@312000000,750 {
arch/arm/boot/dts/tegra30-cpu-opp.dtsi +3 -0
@@ -45,18 +45,21 @@ opp@204000000,800 { clock-latency-ns = <100000>; opp-supported-hw = <0x1F 0x31FE>; opp-hz = /bits/ 64 <204000000>; + opp-suspend; }; opp@204000000,850 { clock-latency-ns = <100000>; opp-supported-hw = <0x1F 0x0C01>; opp-hz = /bits/ 64 <204000000>; + opp-suspend; }; opp@204000000,912 { clock-latency-ns = <100000>; opp-supported-hw = <0x1F 0x0200>; opp-hz = /bits/ 64 <204000000>; + opp-suspend; }; opp@312000000,850 {
Signature · 1 line
2.29.2
PATCH v3 13/14 ARM: tegra: Specify memory suspend OPP in device-tree
In reply to Dmitry OsipenkoSpecify memory suspend OPP in a device-tree, just for consistency. Now memory will always suspend on the same frequency.
--- arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 5 +++++ arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 1 + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 3 +++ 3 files changed, 9 insertions(+)
arch/arm/boot/dts/tegra124-peripherals-opp.dtsi +5 -0
@@ -128,24 +128,28 @@ opp@204000000,800 { opp-microvolt = <800000 800000 1150000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0003>; + opp-suspend; }; opp@204000000,950 { opp-microvolt = <950000 950000 1150000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0008>; + opp-suspend; }; opp@204000000,1050 { opp-microvolt = <1050000 1050000 1150000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0010>; + opp-suspend; }; opp@204000000,1110 { opp-microvolt = <1110000 1110000 1150000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0004>; + opp-suspend; }; opp@264000000,800 {
@@ -360,6 +364,7 @@ opp@204000000 { opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x001F>; opp-peak-kBps = <3264000>; + opp-suspend; }; opp@264000000 {
arch/arm/boot/dts/tegra20-peripherals-opp.dtsi +1 -0
@@ -68,6 +68,7 @@ opp@216000000 { opp-microvolt = <1000000 1000000 1300000>; opp-hz = /bits/ 64 <216000000>; opp-supported-hw = <0x000F>; + opp-suspend; }; opp@300000000 {
arch/arm/boot/dts/tegra30-peripherals-opp.dtsi +3 -0
@@ -128,12 +128,14 @@ opp@204000000,1000 { opp-microvolt = <1000000 1000000 1350000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0007>; + opp-suspend; }; opp@204000000,1250 { opp-microvolt = <1250000 1250000 1350000>; opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x0008>; + opp-suspend; }; opp@333500000,1000 {
@@ -312,6 +314,7 @@ opp@204000000 { opp-hz = /bits/ 64 <204000000>; opp-supported-hw = <0x000F>; opp-peak-kBps = <1632000>; + opp-suspend; }; opp@333500000 {
Signature · 1 line
2.29.2
PATCH v3 14/14 ARM: tegra: Specify tps65911 as wakeup source
In reply to Dmitry OsipenkoSpecify TPS65911 as wakeup source on Tegra devices in order to allow its RTC to wake up system from suspend by default instead of requiring wakeup to be enabled manually via sysfs.
--- arch/arm/boot/dts/tegra30-apalis.dtsi | 1 + arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 1 + arch/arm/boot/dts/tegra30-beaver.dts | 1 + arch/arm/boot/dts/tegra30-cardhu.dtsi | 1 + arch/arm/boot/dts/tegra30-colibri.dtsi | 1 + arch/arm/boot/dts/tegra30-ouya.dts | 1 + 6 files changed, 6 insertions(+)
arch/arm/boot/dts/tegra30-apalis.dtsi +1 -0
@@ -860,6 +860,7 @@ pmic: pmic@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,system-power-controller;
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi +1 -0
@@ -12,6 +12,7 @@ pmic: pmic@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>; ti,system-power-controller;
arch/arm/boot/dts/tegra30-beaver.dts +1 -0
@@ -1776,6 +1776,7 @@ pmic: tps65911@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,system-power-controller;
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -0
@@ -243,6 +243,7 @@ pmic: tps65911@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,system-power-controller;
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -0
@@ -737,6 +737,7 @@ pmic: pmic@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,system-power-controller;
arch/arm/boot/dts/tegra30-ouya.dts +1 -0
@@ -139,6 +139,7 @@ pmic: pmic@2d { interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <2>; interrupt-controller; + wakeup-source; ti,en-gpio-sleep = <0 1 1 1 1 1 0 0 1>; ti,system-power-controller;
Signature · 1 line
2.29.2
Quoted 58 lines · Dmitry Osipenko
Hi,
This series is partially factored out from [1] since the DT patches could be applied separately. In addition I added couple more new patches and implemented suggestion given by Daniel Lezcano to [1], see "Specify all CPU cores as cooling devices" patches.
[1] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=221130
Please note that this patchset enables voltage scaling for a few boards, but currently voltage scaling is limited in kernel by the regulator coupler drivers, so it's safe to change the device-trees. Voltage scaling will be fully unlocked once [1] will be merged.
Changelog:
v3: - Added new "Specify tps65911 as wakeup source" patch, which previously
was a part of series that added wakeup-source support to TPS65911 RTC driver [1]. The RTC series was partially applied, excluding the DT patch.[1] https://lore.kernel.org/linux-rtc/[email protected]/
v2: - The "acer-a500: Rename avdd to vdda of touchscreen node" patch
now shouldn't have merge conflicts with the upstream kernel since v1 was based on a patch that adds a new atmel,wakeup-method property, which is not supported by upstream yet.- Fixed unwrapped commit description in the "cardhu: Support CPU frequency and voltage" patch.
Dmitry Osipenko (14):
ARM: tegra: ventana: Support CPU and Core voltage scaling
ARM: tegra: ventana: Support CPU thermal throttling
ARM: tegra: cardhu: Support CPU frequency and voltage scaling on all
board variants
ARM: tegra: cardhu: Support CPU thermal throttling
ARM: tegra: paz00: Enable full voltage scaling ranges for CPU and Core
domains
ARM: tegra: acer-a500: Enable core voltage scaling
ARM: tegra: acer-a500: Reduce thermal throttling hysteresis to 0.2C
ARM: tegra: acer-a500: Specify all CPU cores as cooling devices
ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
ARM: tegra: nexus7: Specify all CPU cores as cooling devices
ARM: tegra: ouya: Specify all CPU cores as cooling devices
ARM: tegra: Specify CPU suspend OPP in device-tree
ARM: tegra: Specify memory suspend OPP in device-tree
ARM: tegra: Specify tps65911 as wakeup source.../boot/dts/tegra124-peripherals-opp.dtsi | 5 ++ .../boot/dts/tegra20-acer-a500-picasso.dts | 14 ++-- arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 2 + arch/arm/boot/dts/tegra20-paz00.dts | 14 ++-- .../arm/boot/dts/tegra20-peripherals-opp.dtsi | 1 + arch/arm/boot/dts/tegra20-ventana.dts | 78 ++++++++++++++--- arch/arm/boot/dts/tegra30-apalis.dtsi | 1 + .../tegra30-asus-nexus7-grouper-common.dtsi | 14 +++- .../tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 1 +
Quoted 8 lines
arch/arm/boot/dts/tegra30-beaver.dts | 1 + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 ----------- arch/arm/boot/dts/tegra30-cardhu.dtsi | 84 ++++++++++++++++++- arch/arm/boot/dts/tegra30-colibri.dtsi | 1 + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 3 + arch/arm/boot/dts/tegra30-ouya.dts | 16 +++- .../arm/boot/dts/tegra30-peripherals-opp.dtsi | 3 + 16 files changed, 202 insertions(+), 84 deletions(-)
All of these applied, thanks.
Thierry