michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "scripts: gen_defines: re-work write_irqs() with augmented nodes"

Browse source 
This reverts commit f68da76d36.

Reverted as the changes to gen_defines.py break things.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-12 12:55:39 -05:00 • committed by Kumar Gala
commit c6a7ecda93
1 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

54
scripts/dts/gen_defines.py
View file

@ -625,39 +625,14 @@ def write_irqs(node):
# Writes IRQ num and data for the interrupts in the node's 'interrupt' # Writes IRQ num and data for the interrupts in the node's 'interrupt'
# property # property
if not node.interrupts: def irq_name_alias(irq, cell_name):
return if not irq.name:
return None
# maps (irq_i, cell_name) to the primary macro for that pair, alias = f"IRQ_{str2ident(irq.name)}"
# if there is one. if cell_name != "irq":
irq_cell2primary_macro = {} alias += f"_{str2ident(cell_name)}"
return alias
def write_irqs_for_ident(node, ident):
# Like write_regs_for_ident(), but for interrupts.
for irq_i, irq in enumerate(node.interrupts):
for cell_name, cell_value in irq.data.items():
if cell_name == "irq":
if "arm,gic" in irq.controller.compats:
cell_value = map_arm_gic_irq_type(irq, cell_value)
cell_value = encode_zephyr_multi_level_irq(irq, cell_value)
name_suffix = ""
else:
name_suffix = f"_{str2ident(cell_name)}"
# DT_<IDENT>_IRQ_<irq_i>[_<CELL_NAME>]
idx_macro = f"{ident}_IRQ_{irq_i}{name_suffix}"
primary_macro = irq_cell2primary_macro.get((irq_i, cell_name))
if primary_macro is not None:
out(idx_macro, primary_macro)
else:
primary_macro = out(idx_macro, cell_value)
irq_cell2primary_macro[(irq_i, cell_name)] = primary_macro
# DT_<IDENT>_IRQ_<IRQ_NAME>[_<CELL_NAME>]
if irq.name:
out(f"{ident}_IRQ_{str2ident(irq.name)}{name_suffix}",
primary_macro)
def map_arm_gic_irq_type(irq, irq_num): def map_arm_gic_irq_type(irq, irq_num):
# Maps ARM GIC IRQ (type)+(index) combo to linear IRQ number # Maps ARM GIC IRQ (type)+(index) combo to linear IRQ number
@ -687,9 +662,18 @@ def write_irqs(node):
irq_ctrl = irq_ctrl.interrupts[0].controller irq_ctrl = irq_ctrl.interrupts[0].controller
return irq_num return irq_num
out_comment("IRQ macros from the 'interrupts' property", for irq_i, irq in enumerate(node.interrupts):
blank_before=False) for cell_name, cell_value in irq.data.items():
for_each_ident(node, write_irqs_for_ident) ident = f"IRQ_{irq_i}"
if cell_name == "irq":
if "arm,gic" in irq.controller.compats:
cell_value = map_arm_gic_irq_type(irq, cell_value)
cell_value = encode_zephyr_multi_level_irq(irq, cell_value)
else:
ident += f"_{str2ident(cell_name)}"
out_node(node, ident, cell_value,
name_alias=irq_name_alias(irq, cell_name))
def write_spi_dev(node): def write_spi_dev(node):