Unverified Commit cdd070a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ARM: tegra: Device tree changes for v6.3-rc1

Just a single patch to properly sort nodes and make the DTS files easier
to read.

* tag 'tegra-for-6.3-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Sort nodes by unit-address, then alphabetically

Link: https://lore.kernel.org/r/20230127163719.460954-2-thierry.reding@gmail.com


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

arch/arm/boot/dts/tegra114-asus-tf701t.dts

+120 −120
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ aliases { 
		serial2 = &uartb; /* GPS */

	};



	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";

			tlm,version-major = <2>;

			tlm,version-minor = <8>;

		};

	};



	memory@80000000 {

		reg = <0x80000000 0x80000000>;

	};
@@ -109,6 +117,15 @@ backlight-enable { 
		};



		codec_default: pinmux-codec-default {

			interrupt {

				nvidia,pins = "gpio_w2_aud_pw2",

						"gpio_w3_aud_pw3";

				nvidia,function = "spi6";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_ENABLE>;

			};



			ldo1-en {

				nvidia,pins = "sdmmc1_wp_n_pv3";

				nvidia,function = "sdmmc1";
@@ -116,11 +133,12 @@ ldo1-en { 
				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_DISABLE>;

			};

		};



			interrupt {

				nvidia,pins = "gpio_w2_aud_pw2",

						"gpio_w3_aud_pw3";

				nvidia,function = "spi6";

		gpio_hall_sensor_default: pinmux-gpio-hall-sensor-default {

			ulpi_data4_po5 {

				nvidia,pins = "ulpi_data4_po5";

				nvidia,function = "spi2";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -146,16 +164,6 @@ volume { 
			};

		};



		gpio_hall_sensor_default: pinmux-gpio-hall-sensor-default {

			ulpi_data4_po5 {

				nvidia,pins = "ulpi_data4_po5";

				nvidia,function = "spi2";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_ENABLE>;

			};

		};



		hp_det_default: pinmux-hp-det-default {

			gmi_iordy_pi5 {

				nvidia,pins = "kb_row7_pr7";
@@ -198,6 +206,16 @@ gmi_ad9_ph1 { 
		};



		sdmmc3_default: pinmux-sdmmc3-default {

			drive_sdio3 {

				nvidia,pins = "drive_sdio3";

				nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;

				nvidia,schmitt = <TEGRA_PIN_DISABLE>;

				nvidia,pull-down-strength = <22>;

				nvidia,pull-up-strength = <36>;

				nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;

				nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;

			};



			sdmmc3_clk_pa6 {

				nvidia,pins = "sdmmc3_clk_pa6";

				nvidia,function = "sdmmc3";
@@ -221,16 +239,6 @@ sdmmc3_cmd_pa7 { 
				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_ENABLE>;

			};



			drive_sdio3 {

				nvidia,pins = "drive_sdio3";

				nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;

				nvidia,schmitt = <TEGRA_PIN_DISABLE>;

				nvidia,pull-down-strength = <22>;

				nvidia,pull-up-strength = <36>;

				nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;

				nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;

			};

		};



		sdmmc3_vdd_default: pinmux-sdmmc3-vdd-default {
@@ -298,6 +306,14 @@ rt5639: audio-codec@1c { 
			pinctrl-0 = <&codec_default>;

		};



		temp_sensor: temperature-sensor@4c {

			compatible = "onnn,nct1008";

			reg = <0x4c>;



			vcc-supply = <&vdd_3v3_sys>;

			#thermal-sensor-cells = <1>;

		};



		motion-tracker@68 {

			compatible = "invensense,mpu6500";

			reg = <0x68>;
@@ -312,14 +328,6 @@ motion-tracker@68 { 
			pinctrl-names = "default";

			pinctrl-0 = <&imu_default>;

		};



		temp_sensor: temperature-sensor@4c {

			compatible = "onnn,nct1008";

			reg = <0x4c>;



			vcc-supply = <&vdd_3v3_sys>;

			#thermal-sensor-cells = <1>;

		};

	};



	i2c@7000c400 {
@@ -368,6 +376,66 @@ palmas_gpio: gpio { 
				#gpio-cells = <2>;

			};



			pinmux {

				compatible = "ti,tps65913-pinctrl";

				ti,palmas-enable-dvfs1;



				pinctrl-names = "default";

				pinctrl-0 = <&palmas_default>;



				palmas_default: pinmux {

					pin_gpio0 {

						pins = "gpio0";

						function = "gpio";

					};



					pin_gpio1 {

						pins = "gpio1";

						function = "gpio";

					};



					pin_gpio2 {

						pins = "gpio2";

						function = "gpio";

					};



					pin_gpio3 {

						pins = "gpio3";

						function = "gpio";

					};



					pin_gpio4 {

						pins = "gpio4";

						function = "gpio";

					};



					pin_gpio5 {

						pins = "gpio5";

						function = "gpio";

					};



					pin_gpio6 {

						pins = "gpio6";

						function = "gpio";

					};



					pin_gpio7 {

						pins = "gpio7";

						function = "gpio";

					};



					pin_powergood {

						pins = "powergood";

						function = "powergood";

					};



					pin_vac {

						pins = "vac";

						function = "vac";

					};

				};

			};



			pmic {

				compatible = "ti,tps65913-pmic", "ti,palmas-pmic";
@@ -528,66 +596,6 @@ rtc { 
				interrupt-parent = <&palmas>;

				interrupts = <8 0>;

			};



			pinmux {

				compatible = "ti,tps65913-pinctrl";

				ti,palmas-enable-dvfs1;



				pinctrl-names = "default";

				pinctrl-0 = <&palmas_default>;



				palmas_default: pinmux {

					pin_powergood {

						pins = "powergood";

						function = "powergood";

					};



					pin_vac {

						pins = "vac";

						function = "vac";

					};



					pin_gpio0 {

						pins = "gpio0";

						function = "gpio";

					};



					pin_gpio1 {

						pins = "gpio1";

						function = "gpio";

					};



					pin_gpio2 {

						pins = "gpio2";

						function = "gpio";

					};



					pin_gpio3 {

						pins = "gpio3";

						function = "gpio";

					};



					pin_gpio4 {

						pins = "gpio4";

						function = "gpio";

					};



					pin_gpio5 {

						pins = "gpio5";

						function = "gpio";

					};



					pin_gpio6 {

						pins = "gpio6";

						function = "gpio";

					};



					pin_gpio7 {

						pins = "gpio7";

						function = "gpio";

					};

				};

			};

		};

	};
@@ -668,11 +676,21 @@ clk32k_in: clock-32k { 
		clock-output-names = "pmic-oscillator";

	};



	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";

			tlm,version-major = <2>;

			tlm,version-minor = <8>;

	gpio-hall-sensor {

		compatible = "gpio-keys";



		label = "GPIO Hall Effect Sensor";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_hall_sensor_default>;



		switch-hall-sensor {

			label = "Hall Effect Sensor";

			gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_SW>;

			linux,code = <SW_LID>;

			linux,can-disable;

			wakeup-source;

		};

	};
@@ -692,36 +710,18 @@ button-power { 
			wakeup-source;

		};



		button-volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <10>;

		};



		button-volume-down {

			label = "Volume Down";

			gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

			debounce-interval = <10>;

		};

	};



	gpio-hall-sensor {

		compatible = "gpio-keys";



		label = "GPIO Hall Effect Sensor";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_hall_sensor_default>;



		switch-hall-sensor {

			label = "Hall Effect Sensor";

			gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_SW>;

			linux,code = <SW_LID>;

			linux,can-disable;

			wakeup-source;

		button-volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <10>;

		};

	};

arch/arm/boot/dts/tegra114-dalmore.dts

+13 −13
Original line number Diff line number Diff line
@@ -909,6 +909,19 @@ palmas_gpio: gpio { 
				#gpio-cells = <2>;

			};



			pinmux {

				compatible = "ti,tps65913-pinctrl";

				pinctrl-names = "default";

				pinctrl-0 = <&palmas_default>;



				palmas_default: pinmux {

					pin_gpio6 {

						pins = "gpio6";

						function = "gpio";

					};

				};

			};



			pmic {

				compatible = "ti,tps65913-pmic", "ti,palmas-pmic";

				smps1-in-supply = <&tps65090_dcdc3_reg>;
@@ -1065,19 +1078,6 @@ rtc { 
				interrupt-parent = <&palmas>;

				interrupts = <8 0>;

			};



			pinmux {

				compatible = "ti,tps65913-pinctrl";

				pinctrl-names = "default";

				pinctrl-0 = <&palmas_default>;



				palmas_default: pinmux {

					pin_gpio6 {

						pins = "gpio6";

						function = "gpio";

					};

				};

			};

		};

	};

arch/arm/boot/dts/tegra124-apalis-emc.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 *

 */



#include <dt-bindings/clock/tegra124-car.h>



/ {

	clock@60006000 {

		emc-timings-1 {
@@ -1474,12 +1476,12 @@ timing-924000000 { 
			};

		};

	};



	opp-table-actmon {

		/delete-node/ opp-1200000000;

	};



&emc_icc_dvfs_opp_table {

	opp-table-emc {

		/delete-node/ opp-1200000000-1100;

	};



&emc_bw_dfs_opp_table {

	/delete-node/ opp-1200000000;

};

arch/arm/boot/dts/tegra124-apalis-eval.dts

+10 −10
Original line number Diff line number Diff line
@@ -40,6 +40,16 @@ hdmi@54280000 { 
		};

	};



	gpio: gpio@6000d000 {

		/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

		pex-perst-n-hog {

			gpio-hog;

			gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

			output-high;

			line-name = "PEX_PERST_N";

		};

	};



	/* Apalis UART1 */

	serial@70006000 {

		status = "okay";
@@ -243,13 +253,3 @@ reg_usbh_vbus: regulator-usbh-vbus { 
		vin-supply = <&reg_5v0>;

	};

};
 


&gpio {

	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

	pex-perst-n-hog {

		gpio-hog;

		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "PEX_PERST_N";

	};

};

arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts

+10 −10
Original line number Diff line number Diff line
@@ -41,6 +41,16 @@ hdmi@54280000 { 
		};

	};



	gpio@6000d000 {

		/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

		pex-perst-n-hog {

			gpio-hog;

			gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

			output-high;

			line-name = "PEX_PERST_N";

		};

	};



	/* Apalis UART1 */

	serial@70006000 {

		status = "okay";
@@ -245,13 +255,3 @@ reg_usbh_vbus: regulator-usbh-vbus { 
		vin-supply = <&reg_5v0>;

	};

};
 


&gpio {

	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

	pex-perst-n-hog {

		gpio-hog;

		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "PEX_PERST_N";

	};

};