Increase number of APB timers from 2 to 4

Instantiate 4 APB timers instead of 2. Respectively use additional interrupts 7..10 Signed-off-by: Yuri Benditovich <[email protected]>
daynix · Apr 5, 2021 · 7837774 · 7837774
1 parent a5a71c1
commit 7837774
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/fpga/src/ariane_peripherals_xilinx.sv b/fpga/src/ariane_peripherals_xilinx.sv
@@ -64,7 +64,7 @@ module ariane_peripherals #(
     logic [ariane_soc::NumSources-1:0] irq_sources;
 
     // Unused interrupt sources
-    assign irq_sources[ariane_soc::NumSources-1:7] = '0;
+    assign irq_sources[ariane_soc::NumSources-1:11] = '0;
 
     REG_BUS #(
         .ADDR_WIDTH ( 32 ),
@@ -816,7 +816,7 @@ module ariane_peripherals #(
 
         apb_timer #(
                 .APB_ADDR_WIDTH ( 32 ),
-                .TIMER_CNT      ( 2  )
+                .TIMER_CNT      ( 4  )
         ) i_timer (
             .HCLK    ( clk_i            ),
             .HRESETn ( rst_ni           ),
@@ -828,7 +828,7 @@ module ariane_peripherals #(
             .PRDATA  ( timer_prdata     ),
             .PREADY  ( timer_pready     ),
             .PSLVERR ( timer_pslverr    ),
-            .irq_o   ( irq_sources[6:3] )
+            .irq_o   ( irq_sources[10:3] )
         );
     end
 endmodule
diff --git a/tb/ariane_peripherals.sv b/tb/ariane_peripherals.sv
@@ -57,7 +57,7 @@ module ariane_peripherals #(
     logic [ariane_soc::NumSources-1:0] irq_sources;
 
     // Unused interrupt sources
-    assign irq_sources[ariane_soc::NumSources-1:7] = '0;
+    assign irq_sources[ariane_soc::NumSources-1:11] = '0;
 
     REG_BUS #(
         .ADDR_WIDTH ( 32 ),
@@ -600,7 +600,7 @@ module ariane_peripherals #(
 
         apb_timer #(
                 .APB_ADDR_WIDTH ( 32 ),
-                .TIMER_CNT      ( 2  )
+                .TIMER_CNT      ( 4  )
         ) i_timer (
             .HCLK    ( clk_i            ),
             .HRESETn ( rst_ni           ),
@@ -612,7 +612,7 @@ module ariane_peripherals #(
             .PRDATA  ( timer_prdata     ),
             .PREADY  ( timer_pready     ),
             .PSLVERR ( timer_pslverr    ),
-            .irq_o   ( irq_sources[6:3] )
+            .irq_o   ( irq_sources[10:3] )
         );
     end
 endmodule