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

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

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

arm64: tegra: Device tree changes for v6.4-rc1

This adds support for the Jetson Orin NX and includes updates for Jetson
AGX Orin (audio codec, USB Type-C support).

* tag 'tegra-for-6.4-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Add vccmq on Jetson TX2
  arm64: tegra: Populate USB Type-C Controller for Jetson AGX Orin
  arm64: tegra: Audio codec support on Jetson AGX Orin
  arm64: tegra: Support Jetson Orin NX reference platform
  arm64: tegra: Support Jetson Orin NX
  dt-bindings: tegra: Document Jetson Orin NX reference platform
  dt-bindings: tegra: Document Jetson Orin NX
  arm64: tegra: Add DSU PMUs for Tegra234
  arm64: tegra: Drop serial clock-names and reset-names

Link: https://lore.kernel.org/r/20230406124804.970394-6-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 31e985a2 5c0ddb4e

Documentation/devicetree/bindings/arm/tegra.yaml

+9 −0
Original line number Diff line number Diff line
@@ -167,5 +167,14 @@ properties: 
          - const: nvidia,p3737-0000+p3701-0000

          - const: nvidia,p3701-0000

          - const: nvidia,tegra234

      - description: Jetson Orin NX

        items:

          - const: nvidia,p3767-0000

          - const: nvidia,tegra234

      - description: Jetson Orin NX Engineering Reference Developer Kit

        items:

          - const: nvidia,p3768-0000+p3767-0000

          - const: nvidia,p3767-0000

          - const: nvidia,tegra234



additionalProperties: true

arch/arm64/boot/dts/nvidia/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ DTC_FLAGS_tegra194-p2972-0000 := -@ 
DTC_FLAGS_tegra194-p3509-0000+p3668-0000 := -@

DTC_FLAGS_tegra194-p3509-0000+p3668-0001 := -@

DTC_FLAGS_tegra234-p3737-0000+p3701-0000 := -@

DTC_FLAGS_tegra234-p3768-0000+p3767-0000 := -@



dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb
@@ -24,3 +25,4 @@ dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb 
dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0001.dtb

dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb

dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3737-0000+p3701-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3768-0000+p3767-0000.dtb

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

+0 −8
Original line number Diff line number Diff line
@@ -338,9 +338,7 @@ uarta: serial@70006000 { 
		reg-shift = <2>;

		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA124_CLK_UARTA>;

		clock-names = "serial";

		resets = <&tegra_car 6>;

		reset-names = "serial";

		dmas = <&apbdma 8>, <&apbdma 8>;

		dma-names = "rx", "tx";

		status = "disabled";
@@ -352,9 +350,7 @@ uartb: serial@70006040 { 
		reg-shift = <2>;

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA124_CLK_UARTB>;

		clock-names = "serial";

		resets = <&tegra_car 7>;

		reset-names = "serial";

		dmas = <&apbdma 9>, <&apbdma 9>;

		dma-names = "rx", "tx";

		status = "disabled";
@@ -366,9 +362,7 @@ uartc: serial@70006200 { 
		reg-shift = <2>;

		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA124_CLK_UARTC>;

		clock-names = "serial";

		resets = <&tegra_car 55>;

		reset-names = "serial";

		dmas = <&apbdma 10>, <&apbdma 10>;

		dma-names = "rx", "tx";

		status = "disabled";
@@ -380,9 +374,7 @@ uartd: serial@70006300 { 
		reg-shift = <2>;

		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA124_CLK_UARTD>;

		clock-names = "serial";

		resets = <&tegra_car 65>;

		reset-names = "serial";

		dmas = <&apbdma 19>, <&apbdma 19>;

		dma-names = "rx", "tx";

		status = "disabled";

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

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ mmc@3400000 { 
	/* SDMMC3 (SDIO) */

	mmc@3440000 {

		status = "okay";

		vqmmc-supply = <&vddio_sdmmc3>;

	};



	/* SDMMC4 (eMMC) */

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

+0 −2
Original line number Diff line number Diff line
@@ -610,9 +610,7 @@ uarta: serial@3100000 { 
		reg-shift = <2>;

		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&bpmp TEGRA186_CLK_UARTA>;

		clock-names = "serial";

		resets = <&bpmp TEGRA186_RESET_UARTA>;

		reset-names = "serial";

		status = "disabled";

	};