[rtl, gpio] Refactor gpio declaration

The gpio was as declared in some places as having a single instance, but
in other places it has 6 instances. This commit makes it consistent.

Signed-off-by: Douglas Reis <doreis@lowrisc.org>

Author: engdoreis

data/top_config.toml

@@ -1,6 +1,6 @@
 [[blocks]]
 name = "gpio"
-instances = 5 # RPi, Ard, Pmod0, Pmod1, PmodC
+instances = 6 # RPi, Ard, Pmod0, Pmod1, PmodC
 ios = [
   {
     name = "ios",
@@ -9,8 +9,9 @@ ios = [
     length = 32
   },
 ]
-memory_start = 0x80000040
+memory_start = 0x80000000
 memory_size  = 0x00000040
+xbar = { pipeline = "true"}
 
 [[blocks]]
 name = "pwm"

data/xbar_main.hjson

@@ -61,7 +61,7 @@
         size_byte: "0x00000800",
       }],
     },
-    { name:  "gpio", // General purpose input and output
+    { name:  "gpio0",
       type:  "device",
       clock: "clk_sys_i",
       reset: "rst_sys_ni",
@@ -70,7 +70,72 @@
       xbar:  false,
       addr_range: [{
         base_addr: "0x80000000",
-        size_byte: "0x00001000",
+        size_byte: "0x40",
+      }],
+      pipeline: true,
+    },
+    { name:  "gpio1",
+      type:  "device",
+      clock: "clk_sys_i",
+      reset: "rst_sys_ni",
+      req_fifo_pass: false,
+      rsp_fifo_pass: false,
+      xbar:  false,
+      addr_range: [{
+        base_addr: "0x80000040",
+        size_byte: "0x40",
+      }],
+      pipeline: true,
+    },
+    { name:  "gpio2",
+      type:  "device",
+      clock: "clk_sys_i",
+      reset: "rst_sys_ni",
+      req_fifo_pass: false,
+      rsp_fifo_pass: false,
+      xbar:  false,
+      addr_range: [{
+        base_addr: "0x80000080",
+        size_byte: "0x40",
+      }],
+      pipeline: true,
+    },
+    { name:  "gpio3",
+      type:  "device",
+      clock: "clk_sys_i",
+      reset: "rst_sys_ni",
+      req_fifo_pass: false,
+      rsp_fifo_pass: false,
+      xbar:  false,
+      addr_range: [{
+        base_addr: "0x800000c0",
+        size_byte: "0x40",
+      }],
+      pipeline: true,
+    },
+    { name:  "gpio4",
+      type:  "device",
+      clock: "clk_sys_i",
+      reset: "rst_sys_ni",
+      req_fifo_pass: false,
+      rsp_fifo_pass: false,
+      xbar:  false,
+      addr_range: [{
+        base_addr: "0x80000100",
+        size_byte: "0x40",
+      }],
+      pipeline: true,
+    },
+    { name:  "gpio5",
+      type:  "device",
+      clock: "clk_sys_i",
+      reset: "rst_sys_ni",
+      req_fifo_pass: false,
+      rsp_fifo_pass: false,
+      xbar:  false,
+      addr_range: [{
+        base_addr: "0x80000140",
+        size_byte: "0x40",
       }],
       pipeline: true,
     },
@@ -313,7 +378,6 @@
       "hyperram",
       "rev_tag",
       "dbg_dev",
-      "gpio",
       "pinmux",
       "system_info",
       "rgbled_ctrl",
@@ -322,6 +386,12 @@
       "timer",
       "spi_lcd",
       "spi_ethmac",
+      "gpio0",
+      "gpio1",
+      "gpio2",
+      "gpio3",
+      "gpio4",
+      "gpio5",
       "pwm0",
       "uart0",
       "uart1",

data/xbar_main.hjson.tpl

@@ -61,19 +61,27 @@
         size_byte: "0x00000800",
       }],
     },
-    { name:  "gpio", // General purpose input and output
+    % for block in config.blocks:
+      % if block.name == "gpio":
+        % for i in range(block.instances):
+    { name:  "${f"{block.name}{i}"}",
       type:  "device",
       clock: "clk_sys_i",
       reset: "rst_sys_ni",
       req_fifo_pass: false,
       rsp_fifo_pass: false,
       xbar:  false,
       addr_range: [{
-        base_addr: "0x80000000",
-        size_byte: "0x00001000",
+        base_addr: "${hex(block.memory_start + i * block.memory_size)}",
+        size_byte: "${hex(block.memory_size)}",
       }],
-      pipeline: true,
+            % for (setting, value) in block.xbar.items():
+      ${setting}: ${value},
+            % endfor
     },
+          % endfor
+        % endif
+      % endfor
     { name:  "pinmux", // Pin multiplexer
       type:  "device",
       clock: "clk_sys_i",
@@ -224,7 +232,6 @@
       "hyperram",
       "rev_tag",
       "dbg_dev",
-      "gpio",
       "pinmux",
       "system_info",
       "rgbled_ctrl",
@@ -234,11 +241,9 @@
       "spi_lcd",
       "spi_ethmac",
       % for block in config.blocks:
-      % if not block.name == "gpio":
       % for i in range(block.instances):
       "${f"{block.name}{i}"}",
       % endfor
-      % endif
       % endfor
       "usbdev",
       "rv_plic",