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

Merge tag 'tegra-for-5.20-arm64-dt' of... 

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

arm64: tegra: Device tree changes for v5.20-rc1

This adds and enables various hardware on Tegra234 (host1x, VIC, GPCDMA)
as well as the Control BackBone related device tree nodes on Tegra194
and Tegra234.

Native timers are enabled on Tegra186, Tegra194 and Tegra234, which
allow keeping track of SoC-wide timestamps as well as hardware watchdog
functionality.

The audio subsystem is enhanced with the Output Processing Engine (OPE)
on Tegra210 and later.

Finally there are a handful of minor cleanups and fixes.

* tag 'tegra-for-5.20-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Fix SDMMC1 CD on P2888
  arm64: tegra: Update compatible for Tegra234 GPCDMA
  arm64: tegra: Add Host1x and VIC on Tegra234
  arm64: tegra: Add Host1x context stream IDs on Tegra186+
  arm64: tegra: Enable native timers on Tegra234
  arm64: tegra: Enable native timers on Tegra194
  arm64: tegra: Enable native timers on Tegra186
  arm64: tegra: Add node for CBB 2.0 on Tegra234
  arm64: tegra: Add node for CBB 1.0 on Tegra194
  arm64: tegra: Align gpio-keys node names with dtschema
  arm64: tegra: Mark BPMP channels as no-memory-wc
  arm64: tegra: Add Tegra234 GPCDMA device tree node
  arm64: tegra: Adjust whitespace around '='
  arm64: tegra: Enable OPE on various platforms
  arm64: tegra: Add OPE device on Tegra210 and later

Link: https://lore.kernel.org/r/20220708185608.676474-7-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ed1646fe b415bb7c

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

+2 −2
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ clk32k_in: clock-32k { 
	gpio-keys {

		compatible = "gpio-keys";



		lid {

		switch-lid {

			label = "Lid";

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

			linux,input-type = <5>;
@@ -1039,7 +1039,7 @@ lid { 
			wakeup-source;

		};



		power {

		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+46 −3
Original line number Diff line number Diff line
@@ -915,6 +915,22 @@ xbar_asrc_in7_ep: endpoint { 
						remote-endpoint = <&asrc_in7_ep>;

					};

				};



				xbar_ope1_in_port: port@70 {

					reg = <0x70>;



					xbar_ope1_in_ep: endpoint {

						remote-endpoint = <&ope1_cif_in_ep>;

					};

				};



				port@71 {

					reg = <0x71>;



					xbar_ope1_out_ep: endpoint {

						remote-endpoint = <&ope1_cif_out_ep>;

					};

				};

			};



			admaif@290f000 {
@@ -1911,6 +1927,31 @@ adx4_out4_ep: endpoint { 
				};

			};



			processing-engine@2908000 {

				status = "okay";



				ports {

					#address-cells = <1>;

					#size-cells = <0>;



					port@0 {

						reg = <0x0>;



						ope1_cif_in_ep: endpoint {

							remote-endpoint = <&xbar_ope1_in_ep>;

						};

					};



					ope1_out_port: port@1 {

						reg = <0x1>;



						ope1_cif_out_ep: endpoint {

							remote-endpoint = <&xbar_ope1_out_ep>;

						};

					};

				};

			};



			amixer@290bb00 {

				status = "okay";
@@ -2437,7 +2478,7 @@ sata@3507000 { 
	gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "Power";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0)

					   GPIO_ACTIVE_LOW>;
@@ -2448,7 +2489,7 @@ power { 
			wakeup-source;

		};



		volume-up {

		key-volume-up {

			label = "Volume Up";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1)

					   GPIO_ACTIVE_LOW>;
@@ -2457,7 +2498,7 @@ volume-up { 
			debounce-interval = <10>;

		};



		volume-down {

		key-volume-down {

			label = "Volume Down";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2)

					   GPIO_ACTIVE_LOW>;
@@ -2552,6 +2593,7 @@ sound { 
		       <&xbar_asrc_in3_port>, <&xbar_asrc_in4_port>,

		       <&xbar_asrc_in5_port>, <&xbar_asrc_in6_port>,

		       <&xbar_asrc_in7_port>,

		       <&xbar_ope1_in_port>,

		       /* HW accelerators */

		       <&sfc1_out_port>, <&sfc2_out_port>,

		       <&sfc3_out_port>, <&sfc4_out_port>,
@@ -2571,6 +2613,7 @@ sound { 
		       <&mixer_out5_port>,

		       <&asrc_out1_port>, <&asrc_out2_port>, <&asrc_out3_port>,

		       <&asrc_out4_port>, <&asrc_out5_port>, <&asrc_out6_port>,

		       <&ope1_out_port>,

		       /* I/O */

		       <&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>,

		       <&i2s5_port>, <&i2s6_port>, <&dmic1_port>, <&dmic2_port>,

arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts

+3 −3
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ fan: pwm-fan { 
	gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "Power";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0)

					   GPIO_ACTIVE_LOW>;
@@ -371,7 +371,7 @@ power { 
			wakeup-source;

		};



		volume-up {

		key-volume-up {

			label = "Volume Up";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1)

					   GPIO_ACTIVE_LOW>;
@@ -380,7 +380,7 @@ volume-up { 
			debounce-interval = <10>;

		};



		volume-down {

		key-volume-down {

			label = "Volume Down";

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2)

					   GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/nvidia/tegra186.dtsi

+36 −1
Original line number Diff line number Diff line
@@ -509,6 +509,29 @@ tegra_adx4: adx@2903b00 { 
				status = "disabled";

			};



			tegra_ope1: processing-engine@2908000 {

				compatible = "nvidia,tegra186-ope",

					     "nvidia,tegra210-ope";

				reg = <0x2908000 0x100>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges;

				sound-name-prefix = "OPE1";

				status = "disabled";



				equalizer@2908100 {

					compatible = "nvidia,tegra186-peq",

						     "nvidia,tegra210-peq";

					reg = <0x2908100 0x100>;

				};



				dynamic-range-compressor@2908200 {

					compatible = "nvidia,tegra186-mbdrc",

						     "nvidia,tegra210-mbdrc";

					reg = <0x2908200 0x200>;

				};

			};



			tegra_amixer: amixer@290bb00 {

				compatible = "nvidia,tegra186-amixer",

					     "nvidia,tegra210-amixer";
@@ -576,7 +599,7 @@ timer@3010000 { 
			     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

		status = "okay";

	};



	uarta: serial@3100000 {
@@ -1461,6 +1484,17 @@ host1x@13e00000 { 


		iommus = <&smmu TEGRA186_SID_HOST1X>;



		/* Context isolation domains */

		iommu-map = <

			0 &smmu TEGRA186_SID_HOST1X_CTX0 1

			1 &smmu TEGRA186_SID_HOST1X_CTX1 1

			2 &smmu TEGRA186_SID_HOST1X_CTX2 1

			3 &smmu TEGRA186_SID_HOST1X_CTX3 1

			4 &smmu TEGRA186_SID_HOST1X_CTX4 1

			5 &smmu TEGRA186_SID_HOST1X_CTX5 1

			6 &smmu TEGRA186_SID_HOST1X_CTX6 1

			7 &smmu TEGRA186_SID_HOST1X_CTX7 1>;



		dpaux1: dpaux@15040000 {

			compatible = "nvidia,tegra186-dpaux";

			reg = <0x15040000 0x10000>;
@@ -1820,6 +1854,7 @@ sram@30000000 { 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x30000000 0x50000>;

		no-memory-wc;



		cpu_bpmp_tx: sram@4e000 {

			reg = <0x4e000 0x1000>;

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ eeprom@50 { 


		/* SDMMC1 (SD/MMC) */

		mmc@3400000 {

			cd-gpios = <&gpio TEGRA194_MAIN_GPIO(A, 0) GPIO_ACTIVE_LOW>;

			cd-gpios = <&gpio TEGRA194_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;

		};



		/* SDMMC4 (eMMC) */