Merge pull request #854 from mczerski/gpio_dts_irq

dts: gpio: interrupt controller definition for switches
This commit is contained in:
enjoy-digital 2021-06-18 10:29:30 +02:00 committed by GitHub
commit 291374e66f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 9 deletions

View File

@ -259,6 +259,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, polling=False):
liteuart0: serial@{uart_csr_base:x} {{ liteuart0: serial@{uart_csr_base:x} {{
compatible = "litex,liteuart"; compatible = "litex,liteuart";
reg = <0x{uart_csr_base:x} 0x100>; reg = <0x{uart_csr_base:x} 0x100>;
interrupt-parent = <&intc0>;
{uart_interrupt} {uart_interrupt}
status = "okay"; status = "okay";
}}; }};
@ -277,6 +278,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, polling=False):
<0x{ethmac_mem_base:x} 0x{ethmac_mem_size:x}>; <0x{ethmac_mem_base:x} 0x{ethmac_mem_size:x}>;
tx-fifo-depth = <{ethmac_tx_slots}>; tx-fifo-depth = <{ethmac_tx_slots}>;
rx-fifo-depth = <{ethmac_rx_slots}>; rx-fifo-depth = <{ethmac_rx_slots}>;
interrupt-parent = <&intc0>;
{ethmac_interrupt} {ethmac_interrupt}
status = "okay"; status = "okay";
}}; }};
@ -403,6 +405,15 @@ def generate_dts(d, initrd_start=None, initrd_size=None, polling=False):
# Switches ------------------------------------------------------------------------------------- # Switches -------------------------------------------------------------------------------------
if "switches" in d["csr_bases"]: if "switches" in d["csr_bases"]:
interrupt_specification = ""
if "switches_interrupt" in d["constants"]:
switches_interrupt = d["constants"]["switches_interrupt"]
interrupt_specification = """
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&intc0>;
interrupts = <{switches_interrupt}>;""".format(switches_interrupt=switches_interrupt)
dts += """ dts += """
switches: gpio@{switches_csr_base:x} {{ switches: gpio@{switches_csr_base:x} {{
compatible = "litex,gpio"; compatible = "litex,gpio";
@ -410,9 +421,11 @@ def generate_dts(d, initrd_start=None, initrd_size=None, polling=False):
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
litex,direction = "in"; litex,direction = "in";
gpio-controller;
#gpio-cells = <2>;{interrupt_specification}
status = "disabled"; status = "disabled";
}}; }};
""".format(switches_csr_base=d["csr_bases"]["switches"]) """.format(switches_csr_base=d["csr_bases"]["switches"], interrupt_specification=interrupt_specification)
# SPI ------------------------------------------------------------------------------------------ # SPI ------------------------------------------------------------------------------------------
@ -601,19 +614,19 @@ def generate_dts(d, initrd_start=None, initrd_size=None, polling=False):
if "leds" in d["csr_bases"]: if "leds" in d["csr_bases"]:
dts += """ dts += """
&leds { &leds {{
litex,ngpio = <4>; litex,ngpio = <{ngpio}>;
status = "okay"; status = "okay";
}; }};
""" """.format(ngpio=d["constants"].get('leds_ngpio', 4))
if "switches" in d["csr_bases"]: if "switches" in d["csr_bases"]:
dts += """ dts += """
&switches { &switches {{
litex,ngpio = <4>; litex,ngpio = <{ngpio}>;
status = "okay"; status = "okay";
}; }};
""" """.format(ngpio=d["constants"].get('switches_ngpio', 4))
return dts return dts