Commit 815bacb5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.13-arm-dt' of... 

Merge tag 'tegra-for-5.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.13-rc1

This contains a couple of improvements and fixes for various 32-bit
Tegra-based boards.

* tag 'tegra-for-5.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: acer-a500: Add atmel,wakeup-method property
  ARM: tegra: Specify tps65911 as wakeup source
  ARM: tegra: Specify memory suspend OPP in device-tree
  ARM: tegra: Specify CPU suspend OPP in device-tree
  ARM: tegra: ouya: Specify all CPU cores as cooling devices
  ARM: tegra: nexus7: Specify all CPU cores as cooling devices
  ARM: tegra: acer-a500: Rename avdd to vdda of touchscreen node
  ARM: tegra: acer-a500: Specify all CPU cores as cooling devices
  ARM: tegra: acer-a500: Reduce thermal throttling hysteresis to 0.2C
  ARM: tegra: acer-a500: Enable core voltage scaling
  ARM: tegra: paz00: Enable full voltage scaling ranges for CPU and Core domains
  ARM: tegra: cardhu: Support CPU thermal throttling
  ARM: tegra: cardhu: Support CPU frequency and voltage scaling on all board variants
  ARM: tegra: ventana: Support CPU thermal throttling
  ARM: tegra: ventana: Support CPU and Core voltage scaling

Link: https://lore.kernel.org/r/20210401172622.3352990-4-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ece61ed9 3a6c267d

arch/arm/boot/dts/tegra124-peripherals-opp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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-acer-a500-picasso.dts

+10 −6
Original line number Diff line number Diff line
@@ -448,8 +448,10 @@ 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 = <1>;

		};



		gyroscope@68 {
@@ -575,7 +577,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>;
@@ -616,7 +618,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>;
@@ -838,9 +840,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>;

		};

	};
@@ -1055,7 +1058,7 @@ trips { 
				trip0: cpu-alert0 {

					/* start throttling at 50C */

					temperature = <50000>;

					hysteresis = <3000>;

					hysteresis = <200>;

					type = "passive";

				};
@@ -1070,7 +1073,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>;

				};

			};

		};

arch/arm/boot/dts/tegra20-cpu-opp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -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/tegra20-paz00.dts

+7 −7
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/tegra20-peripherals-opp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ opp@216000000 { 
			opp-microvolt = <1000000 1000000 1300000>;

			opp-hz = /bits/ 64 <216000000>;

			opp-supported-hw = <0x000F>;

			opp-suspend;

		};



		opp@300000000 {