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 db8752fc480e7df1e34ddb96576e28e033d789d3..d0eefc3b886c2a55ff2664b917499cefc2653aaf 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 a9d6d593fc8a7d51fd654e9847f96d1657bdb07f..47799f59faa5cbdfc8dad50bee16c52f1a9d1775 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 1faf24acd521d3cc4ed22d24c8fe0ff469e9a30a..a9ffa49c1ebe33852119ca7bf8642925f6f27653 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 2ccbb57fbfa87d8a86aef40d16e756aa78df6d3b..c15e7e0c7e08fe3e608483b94619c9ceb026d080 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 ba17ee1eb749d2eaaa1a4e4041f968ec2e06bffc..9c28ef4508e0d5a2f1d56a0a9b5b1849d6516c62 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 7fd870ee5093d98f217b161b39d5f626651d441b..b74c5379ca26dc6cdfc1430a9ebd865f25438278 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 5818718618b1e75867a9c5dbaba744d7c2e23d8c..5e88c9645975376ecd3ea8a9a9d0936dad68bdc3 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 2a2e570bbee6f17dbd0c639a806f4516eb485c71..77d35bb92950f1be08188858b106490769a2d89b 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 0f69a3fba5c8b363e3c8b7853ef9ec34dd225ac6..42cc7c4b6defedc5c58ab1b88bb78fb0eeedf9e5 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 10fe0dae2a3621672d8145e2a998e1993b646bbc..f59567fe7d91d03fe6147e362b14ba347edcf16d 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 4613c72122512633aad265cefe44461fb0c76851..8dd74f48a6d3720119153745bdea67f629d19c29 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 282d854f43426d8515dd19200cf8e05fa5d5d16d..45ea57fafa1887aaf2648c947d56e79bb076fdee 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 c88ebd5323369bdc34f67dd7b939420836960546..803721050116a6d4829b7939fea61aac4111fbd5 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 06fdf6c2d5fdc36b6ec99867d7342f86f31722a7..a349dba5ff797807f25e5956bb923a70d2e89390 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 88b3cb128698fb9d2e0abf9cfc46134b4538477e..0d6f60af76402f5de54b7ecea8add726d85b31b0 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 6af8e6041bb72f05ae5db1c1f4dcb80b00272ceb..402579ab70d2b94a21f58fd8bea2eeb1885a9072 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 52086c8018e203648db36fd6b715d866935f3d34..916c095d11b909ea1f6b2a4e08a0a215158501f4 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 1d7f92bdcb9c30b00a9a6a0c8e3103ac37dee9e0..a97b4ee4ae797f9ca56fc16ae6d4b37466f4eef7 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 7cd92babc41a688cf8bb474972d053ea7b8b33d6..71b480968a74546071afb559350a0e6c4f72cf98 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 b138584b8800aaea10b0c7828f1c2b4acad16265..00eb9a7114dc2621b3bff2a94b1e3e2a4b4c0e6e 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 40d2cdede7022ff6d7ed2905f36c6f71a9ec3e77..d8393b97768bf8e9a6f53fdc44fe2211b64e3705 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 a81dcc82e2eadd09e441f40077539d1475ef072d..1f65ff68a469d9f35cb419726bc67bd4254ab9dd 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 44ea77febe17f06099a2849aa4a71202baac5b46..6d10450de6d7b97fcd287ba965cd3f331e66dc85 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 06486664d75412f6383e88c432a8c1c89c7d57bb..9f9e48511836ddc6c79951d327d10dfc26da7a71 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 135e06920e2db5436d7bc68d4d648df3ccd452b1..8ecfda7a004ecb322b63e1fa0c8b3d1aa6851ca9 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 bf64e2420fb588efd6c128fdd70755c182567da6..48ce21c5e8db3c52990026226d85852cfec1e1a6 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 86042e64972a91f2f91818d82f6903d45e71feed..319c1069b7eeb722a79dd2efff221e7627907901 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 d7700235e0f5a0b16856116398528d1b897cfcf5..d6194bff7afe6e4c85f299918e99f7320a91adf7 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 4ed49a243e5c73304a87a9df6965f6e7ea7f85f7..ff9b90bfaefde4a1ac69b4bea41c8092f67ada52 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 9d3aee5abc1585fa7cf7b88c45842aa1147abab9..9dff8221112c24287133c5af851a46dae1f36277 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 fbde7078bedabde07c7ff9ca08e6e962142f620b..df8a0dbe9d910aa44174bcfb4400aa445859a72e 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 7ea1116c7c886e604552af9f8f84f8558fdc5a2b..53e940738c7f67d04879defa05a8396588c8bc96 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 34d613b0dd730278416e06569cbdc6a49790b39f..8e970c40f236d167cee65deed64d4cf46f310200 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 ecb49a5a76150561c617fb3d8fa4b3372a5a5e2c..58055c39901f2a91409197d8ca593477e78952a1 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 656cdb5f7a8895b16edd0fb2f0e8d95e6e12c338..efbafd2a73292b48c69fcad2f29b07bc46362286 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 e7f7502f6f25e2ad02dcdc239ae87de28a412ba2..4e97378e1b281818b85d308b69f20dfc44e4cab9 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 b97db1df0803fdfeb9815ac67630acd00346b61e..ac695fb57a43edd45b4b610df9cf4019c76e0665 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;