Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add uart_with_dynamic_baudrate to SoCCore #2122

Merged
merged 1 commit into from
Nov 15, 2024
+10 −9
Merged

feat: add uart_with_dynamic_baudrate to SoCCore #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions litex/soc/cores/uart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@ def _get_uart_fifo(depth, sink_cd="sys", source_cd="sys"):
else:
return stream.SyncFIFO([("data", 8)], depth, buffered=True)

def UARTPHY(pads, clk_freq, baudrate):
def UARTPHY(pads, clk_freq, baudrate, with_dynamic_baudrate=False):
# FT245 Asynchronous FIFO mode (baudrate ignored)
if hasattr(pads, "rd_n") and hasattr(pads, "wr_n"):
from litex.soc.cores.usb_fifo import FT245PHYAsynchronous
return FT245PHYAsynchronous(pads, clk_freq)
# RS232
else:
return RS232PHY(pads, clk_freq, baudrate)
return RS232PHY(pads, clk_freq, baudrate, with_dynamic_baudrate=with_dynamic_baudrate)

class UART(LiteXModule, UARTInterface):
def __init__(self, phy=None,
Expand Down
10 changes: 5 additions & 5 deletions litex/soc/integration/soc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,7 +1511,7 @@ def add_identifier(self, name="identifier", identifier="LiteX SoC", with_build_t
self.add_config(name, identifier)

# Add UART -------------------------------------------------------------------------------------
def add_uart(self, name="uart", uart_name="serial", uart_pads=None, baudrate=115200, fifo_depth=16):
def add_uart(self, name="uart", uart_name="serial", uart_pads=None, baudrate=115200, fifo_depth=16, with_dynamic_baudrate=False):
# Imports.
from litex.soc.cores.uart import UART, UARTCrossover

Expand Down Expand Up @@ -1550,7 +1550,7 @@ def add_uart(self, name="uart", uart_name="serial", uart_pads=None, baudrate=115

# Crossover + UARTBone.
elif uart_name in ["crossover+uartbone"]:
self.add_uartbone(baudrate=baudrate)
self.add_uartbone(baudrate=baudrate, with_dynamic_baudrate=with_dynamic_baudrate)
uart = UARTCrossover(**uart_kwargs)

# JTAG UART.
Expand Down Expand Up @@ -1588,7 +1588,7 @@ def add_uart(self, name="uart", uart_name="serial", uart_pads=None, baudrate=115
# Regular UART.
else:
from litex.soc.cores.uart import UARTPHY
uart_phy = UARTPHY(uart_pads, clk_freq=self.sys_clk_freq, baudrate=baudrate)
uart_phy = UARTPHY(uart_pads, clk_freq=self.sys_clk_freq, baudrate=baudrate, with_dynamic_baudrate=with_dynamic_baudrate)
uart = UART(uart_phy, **uart_kwargs)

# Add PHY/UART.
Expand All @@ -1604,15 +1604,15 @@ def add_uart(self, name="uart", uart_name="serial", uart_pads=None, baudrate=115
self.add_constant("UART_POLLING", check_duplicate=False)

# Add UARTbone ---------------------------------------------------------------------------------
def add_uartbone(self, name="uartbone", uart_name="serial", clk_freq=None, baudrate=115200, cd="sys"):
def add_uartbone(self, name="uartbone", uart_name="serial", clk_freq=None, baudrate=115200, cd="sys", with_dynamic_baudrate=False):
# Imports.
from litex.soc.cores import uart

# Core.
if clk_freq is None:
clk_freq = self.sys_clk_freq
self.check_if_exists(name)
uartbone_phy = uart.UARTPHY(self.platform.request(uart_name), clk_freq, baudrate)
uartbone_phy = uart.UARTPHY(self.platform.request(uart_name), clk_freq, baudrate, with_dynamic_baudrate=with_dynamic_baudrate)
uartbone = uart.UARTBone(
phy = uartbone_phy,
clk_freq = clk_freq,
Expand Down
5 changes: 3 additions & 2 deletions litex/soc/integration/soc_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def __init__(self, platform, clk_freq,
uart_name = "serial",
uart_baudrate = 115200,
uart_fifo_depth = 16,
uart_with_dynamic_baudrate = False,

# Timer parameters.
with_timer = True,
Expand Down Expand Up @@ -255,11 +256,11 @@ def __init__(self, platform, clk_freq,

# Add UARTBone.
if with_uartbone:
self.add_uartbone(baudrate=uart_baudrate)
self.add_uartbone(baudrate=uart_baudrate, fifo_depth=uart_fifo_depth, with_dynamic_baudrate=with_dynamic_baudrate)

# Add UART.
if with_uart:
self.add_uart(name="uart", uart_name=uart_name, baudrate=uart_baudrate, fifo_depth=uart_fifo_depth)
self.add_uart(name="uart", uart_name=uart_name, baudrate=uart_baudrate, fifo_depth=uart_fifo_depth, with_dynamic_baudrate=uart_with_dynamic_baudrate)

# Add JTAGBone.
if with_jtagbone:
Expand Down
Loading