From 7074c7fa588c54d0bcd842cb4a15d331c06fef53 Mon Sep 17 00:00:00 2001 From: Bunnaroath Sou Date: Tue, 15 Jan 2019 11:15:19 -0800 Subject: Update mee.h files for freedom-metal clic support --- bsp/coreip-e31/mee.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bsp/coreip-e31/mee.h') 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, -- cgit v1.2.1-18-gbd029