Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

[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 15b73bd377f0408b948f80b36a4afaff82f14688..20869757d32f46f9fa264e83f86724d22284dc91 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -419,19 +419,6 @@
                status = "disabled";
        };
 
-       gmi@70009000 {
-               compatible = "nvidia,tegra20-gmi";
-               reg = <0x70009000 0x1000>;
-               #address-cells = <2>;
-               #size-cells = <1>;
-               ranges = <0 0 0xd0000000 0xfffffff>;
-               clocks = <&tegra_car TEGRA20_CLK_NOR>;
-               clock-names = "gmi";
-               resets = <&tegra_car 42>;
-               reset-names = "gmi";
-               status = "disabled";
-       };
-
        nand-controller@70008000 {
                compatible = "nvidia,tegra20-nand";
                reg = <0x70008000 0x100>;
@@ -447,6 +434,19 @@
                status = "disabled";
        };
 
+       gmi@70009000 {
+               compatible = "nvidia,tegra20-gmi";
+               reg = <0x70009000 0x1000>;
+               #address-cells = <2>;
+               #size-cells = <1>;
+               ranges = <0 0 0xd0000000 0xfffffff>;
+               clocks = <&tegra_car TEGRA20_CLK_NOR>;
+               clock-names = "gmi";
+               resets = <&tegra_car 42>;
+               reset-names = "gmi";
+               status = "disabled";
+       };
+
        pwm: pwm@7000a000 {
                compatible = "nvidia,tegra20-pwm";
                reg = <0x7000a000 0x100>;
@@ -865,5 +865,7 @@
                compatible = "arm,cortex-a9-pmu";
                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&{/cpus/cpu@0}>,
+                                    <&{/cpus/cpu@1}>;
        };
 };