Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6115d740 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ARM: tegra: Device tree changes for v4.18-rc1

Contains a fix for the high-speed UART on Toradex Apalis TK1 boards as
well as IOMMU enablement for various devices on Tegra30 and Tegra30.

* tag 'tegra-for-4.18-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: dts: tegra114: Add IOMMU nodes to Host1x and its clients
  ARM: dts: tegra30: Add IOMMU nodes to Host1x and its clients
  ARM: tegra: apalis-tk1: Fix high speed UART compatible

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d5e72aa1 dc4ea601

arch/arm/boot/dts/tegra114.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
		clocks = <&tegra_car TEGRA114_CLK_HOST1X>;

		resets = <&tegra_car 28>;

		reset-names = "host1x";

		iommus = <&mc TEGRA_SWGROUP_HC>;



		#address-cells = <1>;

		#size-cells = <1>;
@@ -32,6 +33,8 @@ 
			clocks = <&tegra_car TEGRA114_CLK_GR2D>;

			resets = <&tegra_car 21>;

			reset-names = "2d";



			iommus = <&mc TEGRA_SWGROUP_G2>;

		};



		gr3d@54180000 {
@@ -40,6 +43,8 @@ 
			clocks = <&tegra_car TEGRA114_CLK_GR3D>;

			resets = <&tegra_car 24>;

			reset-names = "3d";



			iommus = <&mc TEGRA_SWGROUP_NV>;

		};



		dc@54200000 {

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

+3 −3
Original line number Diff line number Diff line
@@ -1536,15 +1536,15 @@ 
	};



	serial@70006040 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	serial@70006200 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	serial@70006300 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	hdmi_ddc: i2c@7000c700 {

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

+3 −3
Original line number Diff line number Diff line
@@ -1565,15 +1565,15 @@ 
	};



	serial@70006040 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	serial@70006200 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	serial@70006300 {

		compatible = "nvidia,tegra124-hsuart";

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

	};



	hdmi_ddc: i2c@7000c400 {

arch/arm/boot/dts/tegra30.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
		clocks = <&tegra_car TEGRA30_CLK_HOST1X>;

		resets = <&tegra_car 28>;

		reset-names = "host1x";

		iommus = <&mc TEGRA_SWGROUP_HC>;



		#address-cells = <1>;

		#size-cells = <1>;
@@ -125,6 +126,8 @@ 
			clocks = <&tegra_car TEGRA30_CLK_MPE>;

			resets = <&tegra_car 60>;

			reset-names = "mpe";



			iommus = <&mc TEGRA_SWGROUP_MPE>;

		};



		vi@54080000 {
@@ -134,6 +137,8 @@ 
			clocks = <&tegra_car TEGRA30_CLK_VI>;

			resets = <&tegra_car 20>;

			reset-names = "vi";



			iommus = <&mc TEGRA_SWGROUP_VI>;

		};



		epp@540c0000 {
@@ -143,6 +148,8 @@ 
			clocks = <&tegra_car TEGRA30_CLK_EPP>;

			resets = <&tegra_car 19>;

			reset-names = "epp";



			iommus = <&mc TEGRA_SWGROUP_EPP>;

		};



		isp@54100000 {
@@ -152,6 +159,8 @@ 
			clocks = <&tegra_car TEGRA30_CLK_ISP>;

			resets = <&tegra_car 23>;

			reset-names = "isp";



			iommus = <&mc TEGRA_SWGROUP_ISP>;

		};



		gr2d@54140000 {
@@ -161,6 +170,8 @@ 
			clocks = <&tegra_car TEGRA30_CLK_GR2D>;

			resets = <&tegra_car 21>;

			reset-names = "2d";



			iommus = <&mc TEGRA_SWGROUP_G2>;

		};



		gr3d@54180000 {
@@ -172,6 +183,9 @@ 
			resets = <&tegra_car 24>,

				 <&tegra_car 98>;

			reset-names = "3d", "3d2";



			iommus = <&mc TEGRA_SWGROUP_NV>,

				 <&mc TEGRA_SWGROUP_NV2>;

		};



		dc@54200000 {