Commit 8fb202c7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

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

This contains various improvements (such as microphone detection and
thermal zones) for some older Tegra devices (such as the Nexus 7 or
the Acer A500).

* tag 'tegra-for-5.14-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: ouya: Enable memory frequency thermal throttling using ACTMON
  ARM: tegra: nexus7: Enable memory frequency thermal throttling using ACTMON
  ARM: tegra: Add cooling cells to ACTMON device-tree node
  ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant
  ARM: tegra: nexus7: Remove monitored-battery property
  ARM: tegra: nexus7: Improve thermal zones
  ARM: tegra: nexus7: Add i2c-thermtrip node
  ARM: tegra: paz00: Add CPU thermal zone
  ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees
  ARM: tegra: Add reg property to Tegra20 EMC table device-tree nodes
  ARM: tegra: acer-a500: Bump thermal trips by 10C
  ARM: tegra: acer-a500: Specify proper voltage for WiFi SDIO bus
  ARM: tegra: acer-a500: Improve microphone detection

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 479011d4 4c101a44

arch/arm/boot/dts/tegra124.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ flow-controller@60007000 { 
		reg = <0x0 0x60007000 0x0 0x1000>;

	};



	actmon@6000c800 {

	actmon: actmon@6000c800 {

		compatible = "nvidia,tegra124-actmon";

		reg = <0x0 0x6000c800 0x0 0x400>;

		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -295,6 +295,7 @@ actmon@6000c800 { 
		operating-points-v2 = <&emc_bw_dfs_opp_table>;

		interconnects = <&mc TEGRA124_MC_MPCORER &emc>;

		interconnect-names = "cpu-read";

		#cooling-cells = <2>;

	};



	gpio: gpio@6000d000 {

arch/arm/boot/dts/tegra20-acer-a500-picasso.dts

+14 −7
Original line number Diff line number Diff line
@@ -420,11 +420,14 @@ wm8903: audio-codec@1a { 
			reg = <0x1a>;



			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_BOTH>;



			gpio-controller;

			#gpio-cells = <2>;



			micdet-cfg = <0>;

			micdet-delay = <100>;



			gpio-cfg = <

				0x0000 /* MIC_LR_OUT#    GPIO, output, low */

				0x0000 /* FM2018-enable  GPIO, output, low */
@@ -759,7 +762,7 @@ sdmmc1: mmc@c8000000 { 


		mmc-pwrseq = <&brcm_wifi_pwrseq>;

		vmmc-supply = <&vdd_3v3_sys>;

		vqmmc-supply = <&vdd_3v3_sys>;

		vqmmc-supply = <&vdd_1v8_sys>;



		/* Azurewave AW-NH611 BCM4329 */

		wifi@1 {
@@ -1030,7 +1033,7 @@ sound { 
		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;

		nvidia,int-mic-en-gpios = <&wm8903 1 GPIO_ACTIVE_HIGH>;

		nvidia,headset;
@@ -1056,15 +1059,15 @@ cpu-thermal { 


			trips {

				trip0: cpu-alert0 {

					/* start throttling at 50C */

					temperature = <50000>;

					/* start throttling at 60C */

					temperature = <60000>;

					hysteresis = <200>;

					type = "passive";

				};



				trip1: cpu-crit {

					/* shut down at 60C */

					temperature = <60000>;

					/* shut down at 70C */

					temperature = <70000>;

					hysteresis = <2000>;

					type = "critical";

				};
@@ -1085,6 +1088,7 @@ memory-controller@7000f400 { 


		emc-tables@0 {

			nvidia,ram-code = <0>; /* elpida-8gb */

			reg = <0>;



			#address-cells = <1>;

			#size-cells = <0>;
@@ -1182,6 +1186,7 @@ emc-table@300000 { 


		emc-tables@1 {

			nvidia,ram-code = <1>; /* elpida-4gb */

			reg = <1>;



			#address-cells = <1>;

			#size-cells = <0>;
@@ -1279,6 +1284,7 @@ emc-table@300000 { 


		emc-tables@2 {

			nvidia,ram-code = <2>; /* hynix-8gb */

			reg = <2>;



			#address-cells = <1>;

			#size-cells = <0>;
@@ -1376,6 +1382,7 @@ emc-table@300000 { 


		emc-tables@3 {

			nvidia,ram-code = <3>; /* hynix-4gb */

			reg = <3>;



			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/tegra20-harmony.dts

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ sound { 


		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)

			GPIO_ACTIVE_HIGH>;

			GPIO_ACTIVE_LOW>;

		nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)

			GPIO_ACTIVE_HIGH>;

		nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)

arch/arm/boot/dts/tegra20-medcom-wide.dts

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ sound { 
		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;



		clocks = <&tegra_car TEGRA20_CLK_PLL_A>,

			 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

arch/arm/boot/dts/tegra20-paz00.dts

+41 −2
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
/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"
@@ -318,6 +320,7 @@ emc-tables@0 { 
			nvidia,ram-code = <0x0>;

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			emc-table@166500 {

				reg = <166500>;
@@ -497,9 +500,10 @@ ldo_rtc { 
			};

		};



		adt7461@4c {

		adt7461: temperature-sensor@4c {

			compatible = "adi,adt7461";

			reg = <0x4c>;

			#thermal-sensor-cells = <1>;

		};

	};
@@ -654,11 +658,46 @@ cpus { 
		cpu0: cpu@0 {

			cpu-supply = <&cpu_vdd_reg>;

			operating-points-v2 = <&cpu0_opp_table>;

			#cooling-cells = <2>;

		};



		cpu@1 {

		cpu1: cpu@1 {

			cpu-supply = <&cpu_vdd_reg>;

			operating-points-v2 = <&cpu0_opp_table>;

			#cooling-cells = <2>;

		};

	};



	thermal-zones {

		cpu-thermal {

			polling-delay-passive = <500>; /* milliseconds */

			polling-delay = <1500>; /* milliseconds */



			thermal-sensors = <&adt7461 1>;



			trips {

				trip0: cpu-alert0 {

					/* start throttling at 80C */

					temperature = <80000>;

					hysteresis = <200>;

					type = "passive";

				};



				trip1: cpu-crit {

					/* shut down at 85C */

					temperature = <85000>;

					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>;

				};

			};

		};

	};

};