Fixup RS485 after pinmux changes

lowRISC · Nov 7, 2024 · fe5bb5e · fe5bb5e
1 parent 0a1378c
commit fe5bb5e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rtl/system/sonata_system.sv b/rtl/system/sonata_system.sv
@@ -1313,7 +1313,7 @@ module sonata_system
   // Enable the RS-485 receiver any time the RS-485 RX input is connect to the UART via pinmux.
   // Whether or not we are transmitting does not need to be factored in here as that is dealt with
   // via rs485_ctrl.
-  assign rs485_rx_enable_o = u_pinmux.uart_rx_2_sel[4];
+  assign rs485_rx_enable_o = u_pinmux.uart_rx_2_sel[3];
 
   // Transmission enabled when UART is muxed to RS-485 TX output and UART is actively transmitting.
   assign rs485_tx_enable_o = u_pinmux.rs485_tx_sel[1]                           &

diff --git a/sw/cheri/checks/rs485_check.cc b/sw/cheri/checks/rs485_check.cc
@@ -28,7 +28,7 @@ using namespace CHERI;
   SonataPinmux Pinmux = SonataPinmux(pinmux);
 
   Pinmux.output_pin_select(SonataPinmux::OutputPin::rs485_tx, 1);
-  Pinmux.block_input_select(SonataPinmux::BlockInput::uart_2_rx, 4);
+  Pinmux.block_input_select(SonataPinmux::BlockInput::uart_2_rx, 3);
 
   Capability<volatile OpenTitanUart> uart = root.cast<volatile OpenTitanUart>();
   uart.address()                          = UART_ADDRESS;

diff --git a/sw/cheri/checks/rs485_spam_check.cc b/sw/cheri/checks/rs485_spam_check.cc
@@ -29,7 +29,7 @@ using namespace CHERI;
   SonataPinmux Pinmux = SonataPinmux(pinmux);
 
   Pinmux.output_pin_select(SonataPinmux::OutputPin::rs485_tx, 1);
-  Pinmux.block_input_select(SonataPinmux::BlockInput::uart_2_rx, 4);
+  Pinmux.block_input_select(SonataPinmux::BlockInput::uart_2_rx, 3);
 
   Capability<volatile OpenTitanUart> uart = root.cast<volatile OpenTitanUart>();
   uart.address()                          = UART_ADDRESS;