Merge pull request #149 from sifive/mee-ex-locali

Update mee.h files for freedom-metal clic support

7 files changed, 48 insertions, 48 deletions

diff --git a/bsp/coreip-e31-arty/mee.h b/bsp/coreip-e31-arty/mee.h
index b482d73..87d8b7a 100644
--- a/bsp/coreip-e31-arty/mee.h
+++ b/bsp/coreip-e31-arty/mee.h
@@ -153,7 +153,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -164,9 +164,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -202,7 +202,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -215,9 +215,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From global_external_interrupts */
 struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {
@@ -225,7 +225,7 @@ struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_
     .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
     .init_done = 0,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS,
     .interrupt_lines[0] = 1,
     .interrupt_lines[1] = 2,
@@ -244,7 +244,7 @@ struct __mee_driver_sifive_gpio0 __mee_dt_gpio_20002000 = {
     .base = 536879104UL,
     .size = 4096UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GPIO_INTERRUPTS,
     .interrupt_lines[0] = 7,
     .interrupt_lines[1] = 8,
@@ -274,7 +274,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_20000000 = {
     .clock = &__mee_dt_clock_0.clock,
     .pinmux = NULL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_UART_INTERRUPTS,
     .interrupt_line = 5UL,
 };
diff --git a/bsp/coreip-e31/mee.h b/bsp/coreip-e31/mee.h
index 421f6c6..a520854 100644
--- a/bsp/coreip-e31/mee.h
+++ b/bsp/coreip-e31/mee.h
@@ -78,7 +78,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -89,9 +89,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -127,7 +127,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -140,9 +140,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From global_external_interrupts */
 struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {
@@ -150,7 +150,7 @@ struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_
     .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
     .init_done = 0,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS,
     .interrupt_lines[0] = 1,
     .interrupt_lines[1] = 2,
diff --git a/bsp/coreip-s51-arty/mee.h b/bsp/coreip-s51-arty/mee.h
index c87f9a6..0e9cc9c 100644
--- a/bsp/coreip-s51-arty/mee.h
+++ b/bsp/coreip-s51-arty/mee.h
@@ -153,7 +153,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -164,9 +164,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -202,7 +202,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -215,9 +215,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From global_external_interrupts */
 struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {
@@ -225,7 +225,7 @@ struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_
     .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
     .init_done = 0,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS,
     .interrupt_lines[0] = 1,
     .interrupt_lines[1] = 2,
@@ -244,7 +244,7 @@ struct __mee_driver_sifive_gpio0 __mee_dt_gpio_20002000 = {
     .base = 536879104UL,
     .size = 4096UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GPIO_INTERRUPTS,
     .interrupt_lines[0] = 7,
     .interrupt_lines[1] = 8,
@@ -274,7 +274,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_20000000 = {
     .clock = &__mee_dt_clock_0.clock,
     .pinmux = NULL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_UART_INTERRUPTS,
     .interrupt_line = 5UL,
 };
diff --git a/bsp/coreip-s51/mee.h b/bsp/coreip-s51/mee.h
index 3e0f535..e73d681 100644
--- a/bsp/coreip-s51/mee.h
+++ b/bsp/coreip-s51/mee.h
@@ -78,7 +78,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -89,9 +89,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -127,7 +127,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -140,9 +140,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From global_external_interrupts */
 struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {
@@ -150,7 +150,7 @@ struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_
     .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
     .init_done = 0,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS,
     .interrupt_lines[0] = 1,
     .interrupt_lines[1] = 2,
diff --git a/bsp/freedom-e310-arty/mee.h b/bsp/freedom-e310-arty/mee.h
index 45da0e8..c9f4220 100644
--- a/bsp/freedom-e310-arty/mee.h
+++ b/bsp/freedom-e310-arty/mee.h
@@ -93,7 +93,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -104,9 +104,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -142,7 +142,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -155,9 +155,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From gpio@10012000 */
 struct __mee_driver_sifive_gpio0 __mee_dt_gpio_10012000 = {
@@ -165,7 +165,7 @@ struct __mee_driver_sifive_gpio0 __mee_dt_gpio_10012000 = {
     .base = 268509184UL,
     .size = 4096UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GPIO_INTERRUPTS,
     .interrupt_lines[0] = 7,
     .interrupt_lines[1] = 8,
@@ -198,7 +198,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_10013000 = {
     .pinmux_output_selector = 196608UL,
     .pinmux_source_selector = 196608UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_UART_INTERRUPTS,
     .interrupt_line = 5UL,
 };
diff --git a/bsp/sifive-hifive1/mee.h b/bsp/sifive-hifive1/mee.h
index 28868b5..0357ce8 100644
--- a/bsp/sifive-hifive1/mee.h
+++ b/bsp/sifive-hifive1/mee.h
@@ -135,7 +135,7 @@ struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
 /* From clint@2000000 */
 struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
     .vtable = &__mee_driver_vtable_riscv_clint0,
-    .clint.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
     .control_base = 33554432UL,
     .control_size = 65536UL,
     .init_done = 0,
@@ -146,9 +146,9 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
 };
 
 /* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
 
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.clint)
+#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
 
 /* From local_external_interrupts_0 */
 struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
@@ -184,7 +184,7 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
 /* From interrupt_controller@c000000 */
 struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
     .vtable = &__mee_driver_vtable_riscv_plic0,
-    .plic0.vtable = &__mee_driver_vtable_riscv_plic0.controller_vtable,
+    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
 /* From interrupt_controller */
     .interrupt_parent = &__mee_dt_interrupt_controller.controller,
@@ -197,9 +197,9 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
 };
 
 /* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.plic0)
+#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
 
 /* From clock@4 */
 struct __mee_driver_sifive_fe310_g000_pll __mee_dt_clock_4 = {
@@ -258,7 +258,7 @@ struct __mee_driver_sifive_gpio0 __mee_dt_gpio_10012000 = {
     .base = 268509184UL,
     .size = 4096UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_GPIO_INTERRUPTS,
     .interrupt_lines[0] = 7,
     .interrupt_lines[1] = 8,
@@ -291,7 +291,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_10013000 = {
     .pinmux_output_selector = 196608UL,
     .pinmux_source_selector = 196608UL,
 /* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,
+    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
     .num_interrupts = MEE_MAX_UART_INTERRUPTS,
     .interrupt_line = 5UL,
 };
diff --git a/freedom-mee b/freedom-mee
-Subproject fdb41ae7f9c2bbae0b912b31aec3f9626e6cd76
+Subproject edfb0abe5bd3e527167d8f00e588c6670139442