Merge tag 'tegra-for-4.21-arm-dt' of... (622523c7) · Commits · 戴 / test

Merge tag 'tegra-for-4.21-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt ARM: tegra: Device tree changes for v4.21-rc1 These changes add the external memory controller on Tegra20 as well as the VIC on Tegra124. * tag 'tegra-for-4.21-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux : ARM: tegra: Add VIC on Tegra124 ARM: dts: tegra20: Add clock entry to External Memory Controller ARM: dts: tegra20: Add interrupt entry to External Memory Controller Signed-off-by:

Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/tegra124.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,18 @@
		status = "disabled";
		};

		vic@54340000 {
		compatible = "nvidia,tegra124-vic";
		reg = <0x0 0x54340000 0x0 0x00040000>;
		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&tegra_car TEGRA124_CLK_VIC03>;
		clock-names = "vic";
		resets = <&tegra_car 178>;
		reset-names = "vic";

		iommus = <&mc TEGRA_SWGROUP_VIC>;
		};

		sor@54540000 {
		compatible = "nvidia,tegra124-sor";
		reg = <0x0 0x54540000 0x0 0x00040000>;

arch/arm/boot/dts/tegra20.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -632,6 +632,8 @@
		memory-controller@7000f400 {
		compatible = "nvidia,tegra20-emc";
		reg = <0x7000f400 0x200>;
		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&tegra_car TEGRA20_CLK_EMC>;
		#address-cells = <1>;
		#size-cells = <0>;
		};

Admin message