Merge tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / tegra20.dtsi

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index dcad6d6128cf7422bd575936306c219aa0023b5f..8c942e60703ef37f7c5ff0884f170a14467bc671 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -616,17 +616,14 @@
        };
 
        mc: memory-controller@7000f000 {
-               compatible = "nvidia,tegra20-mc";
-               reg = <0x7000f000 0x024
-                      0x7000f03c 0x3c4>;
+               compatible = "nvidia,tegra20-mc-gart";
+               reg = <0x7000f000 0x400         /* controller registers */
+                      0x58000000 0x02000000>;  /* GART aperture */
+               clocks = <&tegra_car TEGRA20_CLK_MC>;
+               clock-names = "mc";
                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                #reset-cells = <1>;
-       };
-
-       iommu@7000f024 {
-               compatible = "nvidia,tegra20-gart";
-               reg = <0x7000f024 0x00000018    /* controller registers */
-                      0x58000000 0x02000000>;  /* GART aperture */
+               #iommu-cells = <0>;
        };
 
        memory-controller@7000f400 {