ARM: DTS: Fix register map for virt-capable GIC

Since everybody copied my own mistake from the DT binding example,
let's address all the offenders in one swift go.

Most of them got the CPU interface size wrong (4kB, while it should
be 8kB), except for both keystone platforms which got the control
interface wrong (4kB instead of 8kB).

In a few cases where I knew for sure what implementation was used,
I've added the "arm,gic-400" compatible string. I'm 99% sure that
this is what everyone is using, but short of having the TRM for
all the other SoCs, I've left them alone.

Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/alpine.dtsi b/arch/arm/boot/dts/alpine.dtsi
index db8752f..d0eefc3 100644 (file)
--- a/arch/arm/boot/dts/alpine.dtsi
+++ b/arch/arm/boot/dts/alpine.dtsi
@@ -93,7 +93,7 @@
                        interrupt-controller;
                        reg = <0x0 0xfb001000 0x0 0x1000>,
                              <0x0 0xfb002000 0x0 0x2000>,
-                             <0x0 0xfb004000 0x0 0x1000>,
+                             <0x0 0xfb004000 0x0 0x2000>,
                              <0x0 0xfb006000 0x0 0x2000>;
                        interrupts =
                                <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
index a9d6d59..47799f5 100644 (file)
--- a/arch/arm/boot/dts/axm55xx.dtsi
+++ b/arch/arm/boot/dts/axm55xx.dtsi
@@ -62,7 +62,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x20 0x01001000 0 0x1000>,
-                     <0x20 0x01002000 0 0x1000>,
+                     <0x20 0x01002000 0 0x2000>,
                      <0x20 0x01004000 0 0x2000>,
                      <0x20 0x01006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1faf24a..a9ffa49 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -57,7 +57,7 @@
                interrupt-controller;
                #interrupt-cells = <3>;
                reg = <0x0 0x48211000 0x0 0x1000>,
-                     <0x0 0x48212000 0x0 0x1000>,
+                     <0x0 0x48212000 0x0 0x2000>,
                      <0x0 0x48214000 0x0 0x2000>,
                      <0x0 0x48216000 0x0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts
index 2ccbb57..c15e7e0 100644 (file)
--- a/arch/arm/boot/dts/ecx-2000.dts
+++ b/arch/arm/boot/dts/ecx-2000.dts
@@ -99,7 +99,7 @@
                        interrupt-controller;
                        interrupts = <1 9 0xf04>;
                        reg = <0xfff11000 0x1000>,
-                             <0xfff12000 0x1000>,
+                             <0xfff12000 0x2000>,
                              <0xfff14000 0x2000>,
                              <0xfff16000 0x2000>;
                };

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index ba17ee1..9c28ef4 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -234,7 +234,7 @@
                        #interrupt-cells = <3>;
                        interrupt-controller;
                        reg = <0x10481000 0x1000>,
-                             <0x10482000 0x1000>,
+                             <0x10482000 0x2000>,
                              <0x10484000 0x2000>,
                              <0x10486000 0x2000>;
                        interrupts = <GIC_PPI 9

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 7fd870e..b74c537 100644 (file)
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -90,11 +90,11 @@
                };
 
                gic: interrupt-controller@10481000 {
-                       compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
+                       compatible = "arm,gic-400", "arm,cortex-a15-gic", "arm,cortex-a9-gic";
                        #interrupt-cells = <3>;
                        interrupt-controller;
                        reg =   <0x10481000 0x1000>,
-                               <0x10482000 0x1000>,
+                               <0x10482000 0x2000>,
                                <0x10484000 0x2000>,
                                <0x10486000 0x2000>;
                        interrupts = <GIC_PPI 9

diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi
index 5818718..5e88c96 100644 (file)
--- a/arch/arm/boot/dts/exynos5260.dtsi
+++ b/arch/arm/boot/dts/exynos5260.dtsi
@@ -167,7 +167,7 @@
                        #size-cells = <0>;
                        interrupt-controller;
                        reg = <0x10481000 0x1000>,
-                               <0x10482000 0x1000>,
+                               <0x10482000 0x2000>,
                                <0x10484000 0x2000>,
                                <0x10486000 0x2000>;
                        interrupts = <GIC_PPI 9

diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 2a2e570..77d35bb 100644 (file)
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -40,7 +40,7 @@
                #interrupt-cells = <3>;
                interrupt-controller;
                reg =   <0x2E1000 0x1000>,
-                       <0x2E2000 0x1000>,
+                       <0x2E2000 0x2000>,
                        <0x2E4000 0x2000>,
                        <0x2E6000 0x2000>;
                interrupts = <GIC_PPI 9

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 0f69a3f..42cc7c4 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -91,11 +91,11 @@
        };
 
        intc: interrupt-controller@00a01000 {
-               compatible = "arm,cortex-a7-gic";
+               compatible = "arm,gic-400", "arm,cortex-a7-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
                reg = <0x00a01000 0x1000>,
-                     <0x00a02000 0x1000>,
+                     <0x00a02000 0x2000>,
                      <0x00a04000 0x2000>,
                      <0x00a06000 0x2000>;
        };

diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 10fe0da..f59567f 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -40,12 +40,12 @@
        };
 
        gic: interrupt-controller@02561000 {
-               compatible = "arm,cortex-a15-gic";
+               compatible = "arm,gic-400", "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
                reg = <0x0 0x02561000 0x0 0x1000>,
                      <0x0 0x02562000 0x0 0x2000>,
-                     <0x0 0x02564000 0x0 0x1000>,
+                     <0x0 0x02564000 0x0 0x2000>,
                      <0x0 0x02566000 0x0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
                                IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 4613c72..8dd74f4 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -30,12 +30,12 @@
        };
 
        gic: interrupt-controller {
-               compatible = "arm,cortex-a15-gic";
+               compatible = "arm,gic-400", "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
                reg = <0x0 0x02561000 0x0 0x1000>,
                      <0x0 0x02562000 0x0 0x2000>,
-                     <0x0 0x02564000 0x0 0x1000>,
+                     <0x0 0x02564000 0x0 0x2000>,
                      <0x0 0x02566000 0x0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
                                IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 282d854..45ea57f 100644 (file)
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -110,11 +110,11 @@
                ranges;
 
                gic: interrupt-controller@1400000 {
-                       compatible = "arm,cortex-a7-gic";
+                       compatible = "arm,gic-400", "arm,cortex-a7-gic";
                        #interrupt-cells = <3>;
                        interrupt-controller;
                        reg = <0x0 0x1401000 0x0 0x1000>,
-                             <0x0 0x1402000 0x0 0x1000>,
+                             <0x0 0x1402000 0x0 0x2000>,
                              <0x0 0x1404000 0x0 0x2000>,
                              <0x0 0x1406000 0x0 0x2000>;
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index c88ebd5..8037210 100644 (file)
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -232,7 +232,7 @@
                #interrupt-cells = <3>;
                interrupt-parent = <&gic>;
                reg = <0 0x10211000 0 0x1000>,
-                     <0 0x10212000 0 0x1000>,
+                     <0 0x10212000 0 0x2000>,
                      <0 0x10214000 0 0x2000>,
                      <0 0x10216000 0 0x2000>;
        };

diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi
index 06fdf6c..a349dba 100644 (file)
--- a/arch/arm/boot/dts/mt6580.dtsi
+++ b/arch/arm/boot/dts/mt6580.dtsi
@@ -91,7 +91,7 @@
                #interrupt-cells = <3>;
                interrupt-parent = <&gic>;
                reg = <0x10211000 0x1000>,
-                     <0x10212000 0x1000>,
+                     <0x10212000 0x2000>,
                      <0x10214000 0x2000>,
                      <0x10216000 0x2000>;
        };

diff --git a/arch/arm/boot/dts/mt6589.dtsi b/arch/arm/boot/dts/mt6589.dtsi
index 88b3cb1..0d6f60a 100644 (file)
--- a/arch/arm/boot/dts/mt6589.dtsi
+++ b/arch/arm/boot/dts/mt6589.dtsi
@@ -102,7 +102,7 @@
                        #interrupt-cells = <3>;
                        interrupt-parent = <&gic>;
                        reg = <0x10211000 0x1000>,
-                             <0x10212000 0x1000>,
+                             <0x10212000 0x2000>,
                              <0x10214000 0x2000>,
                              <0x10216000 0x2000>;
                };

diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 6af8e60..402579a 100644 (file)
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -104,7 +104,7 @@
                #interrupt-cells = <3>;
                interrupt-parent = <&gic>;
                reg = <0 0x10211000 0 0x1000>,
-                     <0 0x10212000 0 0x1000>,
+                     <0 0x10212000 0 0x2000>,
                      <0 0x10214000 0 0x2000>,
                      <0 0x10216000 0 0x2000>;
        };

diff --git a/arch/arm/boot/dts/mt8127.dtsi b/arch/arm/boot/dts/mt8127.dtsi
index 52086c8..916c095 100644 (file)
--- a/arch/arm/boot/dts/mt8127.dtsi
+++ b/arch/arm/boot/dts/mt8127.dtsi
@@ -129,7 +129,7 @@
                        #interrupt-cells = <3>;
                        interrupt-parent = <&gic>;
                        reg = <0 0x10211000 0 0x1000>,
-                             <0 0x10212000 0 0x1000>,
+                             <0 0x10212000 0 0x2000>,
                              <0 0x10214000 0 0x2000>,
                              <0 0x10216000 0 0x2000>;
                };

diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi
index 1d7f92b..a97b4ee 100644 (file)
--- a/arch/arm/boot/dts/mt8135.dtsi
+++ b/arch/arm/boot/dts/mt8135.dtsi
@@ -221,7 +221,7 @@
                        #interrupt-cells = <3>;
                        interrupt-parent = <&gic>;
                        reg = <0 0x10211000 0 0x1000>,
-                             <0 0x10212000 0 0x1000>,
+                             <0 0x10212000 0 0x2000>,
                              <0 0x10214000 0 0x2000>,
                              <0 0x10216000 0 0x2000>;
                };

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 7cd92ba..71b4809 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -92,7 +92,7 @@
                interrupt-controller;
                #interrupt-cells = <3>;
                reg = <0 0x48211000 0 0x1000>,
-                     <0 0x48212000 0 0x1000>,
+                     <0 0x48212000 0 0x2000>,
                      <0 0x48214000 0 0x2000>,
                      <0 0x48216000 0 0x2000>;
                interrupt-parent = <&gic>;

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index b138584..00eb9a7 100644 (file)
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -465,7 +465,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x1000>,
+                       <0 0xf1002000 0 0x2000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index 40d2cde..d8393b9 100644 (file)
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -55,7 +55,7 @@
                        #address-cells = <0>;
                        interrupt-controller;
                        reg = <0 0xf1001000 0 0x1000>,
-                             <0 0xf1002000 0 0x1000>,
+                             <0 0xf1002000 0 0x2000>,
                              <0 0xf1004000 0 0x2000>,
                              <0 0xf1006000 0 0x2000>;
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |

diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
index a81dcc8..1f65ff6 100644 (file)
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -55,7 +55,7 @@
                        #address-cells = <0>;
                        interrupt-controller;
                        reg = <0 0xf1001000 0 0x1000>,
-                             <0 0xf1002000 0 0x1000>,
+                             <0 0xf1002000 0 0x2000>,
                              <0 0xf1004000 0 0x2000>,
                              <0 0xf1006000 0 0x2000>;
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 44ea77f..6d10450 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -183,7 +183,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x1000>,
+                       <0 0xf1002000 0 0x2000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 0648666..9f9e485 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -114,7 +114,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x1000>,
+                       <0 0xf1002000 0 0x2000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 135e069..8ecfda7 100644 (file)
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -88,7 +88,7 @@
                        #interrupt-cells = <3>;
                        interrupt-controller;
                        reg = <0 0xf1001000 0 0x1000>,
-                             <0 0xf1002000 0 0x1000>,
+                             <0 0xf1002000 0 0x2000>,
                              <0 0xf1004000 0 0x2000>,
                              <0 0xf1006000 0 0x2000>;
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index bf64e24..48ce21c 100644 (file)
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -105,7 +105,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x1000>,
+                       <0 0xf1002000 0 0x2000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 86042e6..319c106 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -71,7 +71,7 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x1000>,
+                       <0 0xf1002000 0 0x2000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/rk1108.dtsi b/arch/arm/boot/dts/rk1108.dtsi
index d770023..d6194bf 100644 (file)
--- a/arch/arm/boot/dts/rk1108.dtsi
+++ b/arch/arm/boot/dts/rk1108.dtsi
@@ -215,7 +215,7 @@
                #address-cells = <0>;
 
                reg = <0x32011000 0x1000>,
-                     <0x32012000 0x1000>,
+                     <0x32012000 0x2000>,
                      <0x32014000 0x2000>,
                      <0x32016000 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 4ed49a2..ff9b90b 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -189,7 +189,7 @@
                #address-cells = <0>;
 
                reg = <0x10139000 0x1000>,
-                     <0x1013a000 0x1000>,
+                     <0x1013a000 0x2000>,
                      <0x1013c000 0x2000>,
                      <0x1013e000 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 9d3aee5..9dff822 100644 (file)
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -443,7 +443,7 @@
                #address-cells = <0>;
 
                reg = <0x32011000 0x1000>,
-                     <0x32012000 0x1000>,
+                     <0x32012000 0x2000>,
                      <0x32014000 0x2000>,
                      <0x32016000 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index fbde707..df8a0db 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1194,7 +1194,7 @@
                #address-cells = <0>;
 
                reg = <0xffc01000 0x1000>,
-                     <0xffc02000 0x1000>,
+                     <0xffc02000 0x2000>,
                      <0xffc04000 0x2000>,
                      <0xffc06000 0x2000>;
                interrupts = <GIC_PPI 9 0xf04>;

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 7ea1116..53e9407 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -843,7 +843,7 @@
                gic: interrupt-controller@01c81000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,
-                             <0x01c82000 0x1000>,
+                             <0x01c82000 0x2000>,
                              <0x01c84000 0x2000>,
                              <0x01c86000 0x2000>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 34d613b..8e970c4 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1613,9 +1613,9 @@
                };
 
                gic: interrupt-controller@01c81000 {
-                       compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
+                       compatible = "arm,gic-400", "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,
-                             <0x01c82000 0x1000>,
+                             <0x01c82000 0x2000>,
                              <0x01c84000 0x2000>,
                              <0x01c86000 0x2000>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index ecb49a5..58055c3 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -470,7 +470,7 @@
                gic: interrupt-controller@01c81000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,
-                             <0x01c82000 0x1000>,
+                             <0x01c82000 0x2000>,
                              <0x01c84000 0x2000>,
                              <0x01c86000 0x2000>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 656cdb5..efbafd2 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -212,7 +212,7 @@
                gic: interrupt-controller@01c81000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,
-                             <0x01c82000 0x1000>,
+                             <0x01c82000 0x2000>,
                              <0x01c84000 0x2000>,
                              <0x01c86000 0x2000>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index e7f7502..4e97378 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -556,7 +556,7 @@
                gic: interrupt-controller@01c81000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,
-                             <0x01c82000 0x1000>,
+                             <0x01c82000 0x2000>,
                              <0x01c84000 0x2000>,
                              <0x01c86000 0x2000>;
                        interrupt-controller;

diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index b97db1d..ac695fb 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -613,7 +613,7 @@
                gic: interrupt-controller@01c41000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c41000 0x1000>,
-                             <0x01c42000 0x1000>,
+                             <0x01c42000 0x2000>,
                              <0x01c44000 0x2000>,
                              <0x01c46000 0x2000>;
                        interrupt-controller;