h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rp2040: Add kconfig options for rp2040 uart (#6549)

Browse Source 
Modified serial.c and Kconfig to dynamically select all possible UART combinations for RP2040

Signed-off-by: Hriday Keni <info@amken.us>
This commit is contained in:
Amken USA
2024-04-24 22:32:29 -04:00
committed by GitHub
parent c3ec4af6cc
commit 0b329c5d28
2 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/rp2040/serial.c
View File

@@ -4,20 +4,64 @@
//
// This file may be distributed under the terms of the GNU GPLv3 license.
#include <stdint.h> // uint32_t
#include "autoconf.h" // CONFIG_SERIAL
#include "autoconf.h" // Include configuration header
#include "board/armcm_boot.h" // armcm_enable_irq
#include "board/irq.h" // irq_save
#include "board/serial_irq.h" // serial_rx_data
#include "hardware/structs/resets.h" // RESETS_RESET_UART0_BITS
#include "hardware/structs/uart.h" // UART0_BASE
#include "internal.h" // UART0_IRQn
#include "hardware/structs/resets.h" // RESETS_RESET_UART0/1_BITS
#include "hardware/structs/uart.h" // uart0_hw, uart1_hw
#include "internal.h" // UART0_IRQn, UART1_IRQn
#include "sched.h" // DECL_INIT
#define UARTx uart0_hw
#define UARTx_IRQn UART0_IRQ_IRQn
#define GPIO_Rx 1
#define GPIO_Tx 0
// Dynamically select UART and IRQ based on configuration
#if CONFIG_RP2040_SERIAL_UART0_PINS_0_1
#define GPIO_Rx 1
#define GPIO_Tx 0
#define UARTx uart0_hw
#define UARTx_IRQn UART0_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART0_PINS_12_13
#define GPIO_Rx 13
#define GPIO_Tx 12
#define UARTx uart0_hw
#define UARTx_IRQn UART0_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART0_PINS_16_17
#define GPIO_Rx 17
#define GPIO_Tx 16
#define UARTx uart0_hw
#define UARTx_IRQn UART0_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART0_PINS_28_29
#define GPIO_Rx 29
#define GPIO_Tx 28
#define UARTx uart1_hw
#define UARTx_IRQn UART1_IRQ_IRQn
#define UARTx uart0_hw
#define UARTx_IRQn UART0_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART1_PINS_4_5
#define GPIO_Rx 5
#define GPIO_Tx 4
#define UARTx uart1_hw
#define UARTx_IRQn UART1_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART1_PINS_8_9
#define GPIO_Rx 9
#define GPIO_Tx 8
#define UARTx uart1_hw
#define UARTx_IRQn UART1_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART1_PINS_20_21
#define GPIO_Rx 20
#define GPIO_Tx 21
#define UARTx uart1_hw
#define UARTx_IRQn UART1_IRQ_IRQn
#elif CONFIG_RP2040_SERIAL_UART1_PINS_24_25
#define GPIO_Rx 24
#define GPIO_Tx 25
#define UARTx uart1_hw
#define UARTx_IRQn UART1_IRQ_IRQn
#endif
// Write tx bytes to the serial port
static void
@@ -67,10 +111,19 @@ serial_enable_tx_irq(void)
void
serial_init(void)
{
enable_pclock(RESETS_RESET_UART0_BITS);
uint32_t pclk= 0x00;
if (UARTx == uart0_hw){
enable_pclock(RESETS_RESET_UART0_BITS);
pclk= get_pclock_frequency(RESETS_RESET_UART0_BITS);
} else {
enable_pclock(RESETS_RESET_UART1_BITS);
pclk = get_pclock_frequency(RESETS_RESET_UART1_BITS);
}
// Setup baud
uint32_t pclk = get_pclock_frequency(RESETS_RESET_UART0_BITS);
uint32_t div = DIV_ROUND_CLOSEST(pclk * 4, CONFIG_SERIAL_BAUD);
UARTx->ibrd = div >> 6;
UARTx->fbrd = div & 0x3f;