Merge tag 'tegra-for-4.19-arm-dt' of... (a4c43ba4) · Commits · 戴 / test

Merge tag 'tegra-for-4.19-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt ARM: tegra: Device tree changes for v4.19-rc1 This set of changes adds support for the memory client resets on Tegra20 and Tegra30, fixes a couple of issues on Cardhu and Tegra30 Apalis as well as adds a unit-address to the memory node to avoid warnings from DTC. To round things of, the NAND flash controller is enabled on the Tegra20 Colibri. * tag 'tegra-for-4.19-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux : ARM: dts: tegra: enable NAND flash on Colibri T20 ARM: dts: tegra: add Tegra20 NAND flash controller node ARM: tegra: Work safely with 256 MB Colibri-T20 modules ARM: tegra: Fix unit_address_vs_reg and avoid_unnecessary_addr_size DTC warnings ARM: tegra: Fix unit_address_vs_reg DTC warnings for /memory ARM: tegra: Remove usage of deprecated skeleton.dtsi ARM: tegra: Fix can2 on Tegra30 Apalis ARM: tegra: Fix Tegra30 Cardhu PCA954x reset ARM: dts: tegra30: Add Memory Client reset to VDE ARM: dts: tegra20: Add Memory Client reset to VDE Signed-off-by:

Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -1040,7 +1040,7 @@ dtb-$(CONFIG_ARCH_TANGO) += \
		tango4-vantage-1172.dtb
		dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
		tegra20-harmony.dtb \
		tegra20-iris-512.dtb \
		tegra20-colibri-iris.dtb \
		tegra20-medcom-wide.dtb \
		tegra20-paz00.dtb \
		tegra20-plutux.dtb \

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		stdout-path = "serial0:115200n8";
		};

		memory {
		memory@80000000 {
		reg = <0x80000000 0x40000000>;
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		};
		};

		memory {
		memory@80000000 {
		/* memory >= 0x79600000 is reserved for firmware usage */
		reg = <0x80000000 0x79600000>;
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		};
		};

		memory {
		memory@80000000 {
		/* memory >= 0x37e00000 is reserved for firmware usage */
		reg = <0x80000000 0x37e00000>;
		};

arch/arm/boot/dts/tegra114.dtsi

+7 −2

Original line number	Diff line number	Diff line
		@@ -5,11 +5,16 @@
		#include <dt-bindings/pinctrl/pinctrl-tegra.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include "skeleton.dtsi"

		/ {
		compatible = "nvidia,tegra114";
		interrupt-parent = <&lic>;
		#address-cells = <1>;
		#size-cells = <1>;

		memory@80000000 {
		device_type = "memory";
		reg = <0x80000000 0x0>;
		};

		host1x@50000000 {
		compatible = "nvidia,tegra114-host1x", "simple-bus";

Admin message