Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / tegra124.dtsi

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 87318a72f615dcb76ab71fce7af59655193809dc..1e204a6de12c3a4156821a289a2f7064bd346574 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -189,6 +189,9 @@
                clock-names = "gpu", "pwr";
                resets = <&tegra_car 184>;
                reset-names = "gpu";
+
+               iommus = <&mc TEGRA_SWGROUP_GPU>;
+
                status = "disabled";
        };
 
@@ -255,6 +258,7 @@
                gpio-controller;
                #interrupt-cells = <2>;
                interrupt-controller;
+               gpio-ranges = <&pinmux 0 0 251>;
        };
 
        apbdma: dma@0,60020000 {
@@ -977,6 +981,18 @@
                };
        };
 
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&{/cpus/cpu@0}>,
+                                    <&{/cpus/cpu@1}>,
+                                    <&{/cpus/cpu@2}>,
+                                    <&{/cpus/cpu@3}>;
+       };
+
        thermal-zones {
                cpu {
                        polling-delay-passive = <1000>;