Merge pull request #192 from sifive/arty-19.2

Update/add E20, E21, E24 arty targets for all 19.2 CoreIPs release

2 files changed, 26 insertions, 26 deletions

diff --git a/bsp/coreip-e24-arty/design.dts b/bsp/coreip-e24-arty/design.dts
index 9699fae..dd35d75 100644
--- a/bsp/coreip-e24-arty/design.dts
+++ b/bsp/coreip-e24-arty/design.dts
@@ -74,7 +74,7 @@
 			interrupts-extended = <&L3 3 &L3 7 &L3 11>;
 			reg = <0x2000000 0x1000000>;
 			reg-names = "control";
-			sifive,numints = <169>;
+			sifive,numints = <153>;
 			sifive,numlevels = <16>;
 			sifive,numintbits = <4>;
 		};
@@ -139,52 +139,52 @@
                         compatible = "sifive,gpio-buttons";
                         label = "BTN0";
                         gpios = <&L5 4>;
-                        interrupts-extended = <&L13 9>;
+                        interrupts-extended = <&L13 20>;
                         linux,code = "none";
                 };
                 button@1 {
                         compatible = "sifive,gpio-buttons";
                         label = "BTN1";
                         gpios = <&L5 5>;
-                        interrupts-extended = <&L13 10>;
+                        interrupts-extended = <&L13 21>;
                         linux,code = "none";
                 };
                 button@2 {
                         compatible = "sifive,gpio-buttons";
                         label = "BTN2";
                         gpios = <&L5 6>;
-                        interrupts-extended = <&L13 11>;
+                        interrupts-extended = <&L13 22>;
                         linux,code = "none";
                 };
                 button@3 {
                         compatible = "sifive,gpio-buttons";
                         label = "BTN3";
                         gpios = <&L5 7>;
-                        interrupts-extended = <&L13 12>;
+                        interrupts-extended = <&L13 23>;
                         linux,code = "none";
                 };
                 switch@0 {
                         compatible = "sifive,gpio-switches";
                         label = "SW0";
-                        interrupts-extended = <&L12 0>;
+                        interrupts-extended = <&L13 16>;
                         linux,code = "none";
                 };
                 switch@1 {
                         compatible = "sifive,gpio-switches";
                         label = "SW1";
-                        interrupts-extended = <&L12 1>;
+                        interrupts-extended = <&L13 17>;
                         linux,code = "none";
                 };
                 switch@2 {
                         compatible = "sifive,gpio-switches";
                         label = "SW2";
-                        interrupts-extended = <&L12 2>;
+                        interrupts-extended = <&L13 18>;
                         linux,code = "none";
                 };
                 switch@3 {
                         compatible = "sifive,gpio-switches";
                         label = "SW3";
-                        interrupts-extended = <&L13 8>;
+                        interrupts-extended = <&L13 19>;
                         linux,code = "none";
                 };
 		L9: teststatus@4000 {
diff --git a/bsp/coreip-e24-arty/metal.h b/bsp/coreip-e24-arty/metal.h
index 356b79b..f160783 100644
--- a/bsp/coreip-e24-arty/metal.h
+++ b/bsp/coreip-e24-arty/metal.h
@@ -5,7 +5,7 @@
 
 #ifdef __METAL_MACHINE_MACROS
 
-#define __METAL_CLIC_SUBINTERRUPTS 169
+#define __METAL_CLIC_SUBINTERRUPTS 153
 
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
@@ -19,7 +19,7 @@
 
 #define __METAL_INTERRUPT_CONTROLLER_2000000_INTERRUPTS 3
 
-#define __METAL_CLIC_SUBINTERRUPTS 169
+#define __METAL_CLIC_SUBINTERRUPTS 153
 
 #define METAL_MAX_CLIC_INTERRUPTS 3
 
@@ -174,7 +174,7 @@ struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000 = {
     .interrupt_lines[0] = 3,
     .interrupt_lines[1] = 7,
     .interrupt_lines[2] = 11,
-    .num_subinterrupts = 169UL,
+    .num_subinterrupts = 153UL,
     .num_intbits = 4UL,
     .max_levels = 16UL,
     .interrupt_controller = 1,
@@ -366,7 +366,7 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_0 = {
     .pin = 4UL,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
-    .interrupt_line = 9UL,
+    .interrupt_line = 20UL,
     .label = "BTN0",
 };
 
@@ -379,7 +379,7 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_1 = {
     .pin = 5UL,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
-    .interrupt_line = 10UL,
+    .interrupt_line = 21UL,
     .label = "BTN1",
 };
 
@@ -392,7 +392,7 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_2 = {
     .pin = 6UL,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
-    .interrupt_line = 11UL,
+    .interrupt_line = 22UL,
     .label = "BTN2",
 };
 
@@ -405,7 +405,7 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_3 = {
     .pin = 7UL,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
-    .interrupt_line = 12UL,
+    .interrupt_line = 23UL,
     .label = "BTN3",
 };
 
@@ -445,9 +445,9 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
     .gpio = NULL,
     .pin = 0,
-/* From global_external_interrupts */
-    .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
-    .interrupt_line = 0UL,
+/* From local_external_interrupts_0 */
+    .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
+    .interrupt_line = 16UL,
     .label = "SW0",
 };
 
@@ -457,9 +457,9 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
     .gpio = NULL,
     .pin = 0,
-/* From global_external_interrupts */
-    .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
-    .interrupt_line = 1UL,
+/* From local_external_interrupts_0 */
+    .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
+    .interrupt_line = 17UL,
     .label = "SW1",
 };
 
@@ -469,9 +469,9 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
     .gpio = NULL,
     .pin = 0,
-/* From global_external_interrupts */
-    .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
-    .interrupt_line = 2UL,
+/* From local_external_interrupts_0 */
+    .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
+    .interrupt_line = 18UL,
     .label = "SW2",
 };
 
@@ -483,7 +483,7 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3 = {
     .pin = 0,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
-    .interrupt_line = 8UL,
+    .interrupt_line = 19UL,
     .label = "SW3",
 };