vexpress/fast_model: Add VGIC related properties to the GIC binding

The GIC on A7/A15 has the virtualization extensions, and this should
be reflected in the binding.

Cc: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>

diff --git a/fast_models/rtsm_ve-cortex_a15x1.dts b/fast_models/rtsm_ve-cortex_a15x1.dts
index 065c50e..6075e3a 100644 (file)
--- a/fast_models/rtsm_ve-cortex_a15x1.dts
+++ b/fast_models/rtsm_ve-cortex_a15x1.dts
@@ -53,7 +53,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        timer {

diff --git a/fast_models/rtsm_ve-cortex_a15x2.dts b/fast_models/rtsm_ve-cortex_a15x2.dts
index 6d62bf8..8c1cde2 100644 (file)
--- a/fast_models/rtsm_ve-cortex_a15x2.dts
+++ b/fast_models/rtsm_ve-cortex_a15x2.dts
@@ -53,7 +53,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        timer {

diff --git a/fast_models/rtsm_ve-cortex_a15x4.dts b/fast_models/rtsm_ve-cortex_a15x4.dts
index f98bb7d..4b652dc 100644 (file)
--- a/fast_models/rtsm_ve-cortex_a15x4.dts
+++ b/fast_models/rtsm_ve-cortex_a15x4.dts
@@ -53,7 +53,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        timer {

diff --git a/versatile_express/vexpress-v2f-2xv6-ca15x2.dts b/versatile_express/vexpress-v2f-2xv6-ca15x2.dts
index 83703a5..4645db4 100644 (file)
--- a/versatile_express/vexpress-v2f-2xv6-ca15x2.dts
+++ b/versatile_express/vexpress-v2f-2xv6-ca15x2.dts
@@ -58,7 +58,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        timer {

diff --git a/versatile_express/vexpress-v2f-2xv6-ca7x3.dts b/versatile_express/vexpress-v2f-2xv6-ca7x3.dts
index f186759..6f30f41 100644 (file)
--- a/versatile_express/vexpress-v2f-2xv6-ca7x3.dts
+++ b/versatile_express/vexpress-v2f-2xv6-ca7x3.dts
@@ -75,7 +75,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        memory-controller@7ffd0000 {

diff --git a/versatile_express/vexpress-v2p-ca15-tc1.dts b/versatile_express/vexpress-v2p-ca15-tc1.dts
index 597c728..7f7cac0 100644 (file)
--- a/versatile_express/vexpress-v2p-ca15-tc1.dts
+++ b/versatile_express/vexpress-v2p-ca15-tc1.dts
@@ -73,7 +73,10 @@
                #address-cells = <0>;
                interrupt-controller;
                reg = <0x2c001000 0x1000>,
-                     <0x2c002000 0x100>;
+                     <0x2c002000 0x1000>,
+                     <0x2c004000 0x2000>,
+                     <0x2c006000 0x2000>;
+               interrupts = <1 9 0xf04>;
        };
 
        memory-controller@7ffd0000 {