Merge pull request enjoy-digital#2198 from VOGL-electronic/json2dts_zephyr_eth

Json2dts zephyr: enhance it

Author: enjoy-digital

litex/tools/litex_json2dts_zephyr.py

@@ -68,7 +68,7 @@ def dts_close():
 
 def dts_intr(name, csr, levels=1):
     irq = csr['constants'].get(name + '_interrupt', None)
-    return indent(f"interrupts = <{irq} 0>;\n" if irq else "", levels)
+    return indent(f"interrupts = <{irq} 0>;\n" if irq is not None else "", levels)
 
 
 def dts_reg(regs, levels=1):
@@ -126,19 +126,33 @@ def ethmac_handler(name, parm, csr):
     for reg in tx_registers:
         reg['name'] = 'tx_' + reg['name']
 
-    eth_buffers = {
-        'name': 'buffers',
-        'addr': csr['memories'][name]['base'],
-        'size': csr['memories'][name]['size'],
-        'type': csr['memories'][name]['type'],
-    }
-    registers = rx_registers + tx_registers + [eth_buffers]
+    eth_buffers = [{
+        'name': 'rx_buffers',
+        'addr': csr['memories'][name + '_rx']['base'],
+        'size': csr['memories'][name + '_rx']['size'],
+        'type': csr['memories'][name + '_rx']['type'],
+    },
+    {
+        'name': 'tx_buffers',
+        'addr': csr['memories'][name + '_tx']['base'],
+        'size': csr['memories'][name + '_tx']['size'],
+        'type': csr['memories'][name + '_tx']['type'],
+    }]
+    registers = rx_registers + tx_registers + eth_buffers
 
     dtsi = dts_reg(registers)
     dtsi += dts_reg_names(registers)
     dtsi += dts_intr(name, csr)
     return dtsi
 
+def ethphy_mdio_handler(name, parm, csr):
+    registers = get_registers_of(name + '_mdio', csr)
+    if len(registers) == 0:
+        raise KeyError
+
+    dtsi = dts_reg(registers)
+    dtsi += dts_reg_names(registers)
+    return dtsi
 
 def i2c_handler(name, parm, csr):
     registers = get_registers_of(name, csr)
@@ -240,7 +254,7 @@ def peripheral_handler(name, parm, csr):
     return dtsi
 
 
-overlay_handlers = {
+_overlay_handlers = {
     'cpu': {
         'handler': cpu_handler,
         'alias': 'cpu0',
@@ -260,6 +274,10 @@ def peripheral_handler(name, parm, csr):
         'handler': ethmac_handler,
         'alias': 'eth0',
     },
+    'ethphy': {
+        'handler': ethphy_mdio_handler,
+        'alias': 'mdio0',
+    },
     'spimaster': {
         'handler': spimaster_handler,
         'alias': 'spi0',
@@ -322,11 +340,14 @@ def peripheral_handler(name, parm, csr):
     'identifier_mem': {
         'handler': peripheral_handler,
         'alias': 'dna0',
+    },
+    'prbs0': {
+        'handler': peripheral_handler,
     }
 }
 
 
-def generate_dts_config(csr):
+def generate_dts_config(csr, overlay_handlers):
     dts = cnf = ''
 
     for name, parm in overlay_handlers.items():
@@ -354,9 +375,11 @@ def generate_dts_config(csr):
         if name not in overlay_handlers.keys():
             print('No overlay handler for:', name, 'at', hex(value))
 
-    cnf += ' -DCONFIG_LITEX_CSR_DATA_WIDTH={}'.format(
-        csr['constants']['config_csr_data_width'],
-    )
+    # Default CSR data width in zephyr is 32 bits
+    if csr['constants']['config_csr_data_width'] != 32:
+        cnf += ' -DCONFIG_LITEX_CSR_DATA_WIDTH={}'.format(
+            csr['constants']['config_csr_data_width'],
+        )
 
     return dts, cnf
 
@@ -370,7 +393,7 @@ def print_or_save(filepath, lines):
                            or '-' to write to a standard output
         lines (string): content to be printed/written
     """
-    if filepath == '-':
+    if filepath == '-' or filepath is None:
         print(lines)
     else:
         with open(filepath, 'w') as f:
@@ -383,7 +406,7 @@ def parse_args():
                         help='JSON configuration generated by LiteX')
     parser.add_argument('--dts', action='store', required=True,
                         help='Output DTS overlay file')
-    parser.add_argument('--config', action='store', required=True,
+    parser.add_argument('--config', action='store',
                         help='Output config overlay file')
     return parser.parse_args()
 
@@ -393,7 +416,7 @@ def main():
 
     with open(args.conf_file) as f:
         csr = json.load(f)
-    dts, config = generate_dts_config(csr)
+    dts, config = generate_dts_config(csr, _overlay_handlers)
 
     print_or_save(args.dts, dts)
     print_or_save(args.config, config)