Commit 9c49a39c authored Nov 27, 2020 by Arnd Bergmann

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

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

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

This adds support for the Tegra30-based Ouya game console and enhances a
number of existing device trees. It also fixes a couple of minor issues
that were found during DT validation.

* tag 'tegra-for-5.11-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (23 commits)
  ARM: tegra: Add EMC OPP and ICC properties to Tegra124 EMC and ACTMON device-tree nodes
  ARM: tegra: Add EMC OPP and ICC properties to Tegra30 EMC and ACTMON device-tree nodes
  ARM: tegra: Add EMC OPP properties to Tegra20 device-trees
  ARM: tegra: Add nvidia,memory-controller phandle to Tegra20 EMC device-tree
  ARM: tegra: Add interconnect properties to Tegra124 device-tree
  ARM: tegra: Add interconnect properties to Tegra30 device-tree
  ARM: tegra: Add interconnect properties to Tegra20 device-tree
  ARM: tegra: acer-a500: Add Embedded Controller
  ARM: tegra: Change order of SATA resets for Tegra124
  ARM: tegra: Correct EMC registers size in Tegra20 device-tree
  ARM: tegra: Properly align clocks for SOCTHERM
  ARM: tegra: Hook up edp interrupt on Tegra124 SOCTHERM
  ARM: tegra: Add missing hot temperatures to Tegra124 thermal-zones
  ARM: tegra: Add missing gpu-throt-level to Tegra124 soctherm
  ARM: tegra: Populate OPP table for Tegra20 Ventana
  ARM: tegra: nexus7: Use panel-lvds as the only panel compatible
  ARM: tegra: nexus7: Rename gpio-hog nodes
  ARM: tegra: nexus7: Add power-supply to lvds-encoder node
  ARM: tegra: nexus7: Improve CPU passive-cooling threshold
  ARM: tegra: nexus7: Correct thermal zone names
  ...

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


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 3f02c6a8 d63250d7

arch/arm/boot/dts/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -1242,7 +1242,8 @@ dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
		tegra30-beaver.dtb \
		tegra30-cardhu-a02.dtb \
		tegra30-cardhu-a04.dtb \
		tegra30-colibri-eval-v3.dtb
		tegra30-colibri-eval-v3.dtb \
		tegra30-ouya.dtb
		dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
		tegra114-dalmore.dtb \
		tegra114-roth.dtb \

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1465,3 +1465,11 @@ timing-924000000 {
		};
		};
		};

		&emc_icc_dvfs_opp_table {
		/delete-node/ opp@1200000000,1100;
		};

		&emc_bw_dfs_opp_table {
		/delete-node/ opp@1200000000;
		};

arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -2420,3 +2420,11 @@ timing-924000000 {
		};
		};
		};

		&emc_icc_dvfs_opp_table {
		/delete-node/ opp@1200000000,1100;
		};

		&emc_bw_dfs_opp_table {
		/delete-node/ opp@1200000000;
		};

arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi

+10 −0

Original line number	Diff line number	Diff line
		@@ -6649,3 +6649,13 @@ timing-792000000 {
		};
		};
		};

		&emc_icc_dvfs_opp_table {
		/delete-node/ opp@924000000,1100;
		/delete-node/ opp@1200000000,1100;
		};

		&emc_bw_dfs_opp_table {
		/delete-node/ opp@924000000;
		/delete-node/ opp@1200000000;
		};

arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi

+10 −0

Original line number	Diff line number	Diff line
		@@ -2048,3 +2048,13 @@ timing-792000000 {
		};
		};
		};

		&emc_icc_dvfs_opp_table {
		/delete-node/ opp@924000000,1100;
		/delete-node/ opp@1200000000,1100;
		};

		&emc_bw_dfs_opp_table {
		/delete-node/ opp@924000000;
		/delete-node/ opp@1200000000;
		};