michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: ns16550: Remove DLF & PCP instance count assumptions

Browse source 
Take advantage of DT_INST_FOREACH_STATUS_OKAY() to look for DLF and
PCP properties on any matching nodes with "okay" status.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2020-12-19 17:57:07 +02:00 • committed by Anas Nashif
commit 0cb118968d
1 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/serial/uart_ns16550.c
View file

@ -38,24 +38,13 @@
#include "uart_ns16550.h" #include "uart_ns16550.h"
/* #define INST_HAS_PCP_HELPER(inst) DT_INST_NODE_HAS_PROP(inst, pcp) ||
* If PCP is set for any of the ports, enable support. #define INST_HAS_DLF_HELPER(inst) DT_INST_NODE_HAS_PROP(inst, dlf) ||
* Ditto for DLF and PCI(e).
*/
#if DT_INST_NODE_HAS_PROP(0, pcp) || \ #define UART_NS16550_PCP_ENABLED \
DT_INST_NODE_HAS_PROP(1, pcp) || \ (DT_INST_FOREACH_STATUS_OKAY(INST_HAS_PCP_HELPER) 0)
DT_INST_NODE_HAS_PROP(2, pcp) || \ #define UART_NS16550_DLF_ENABLED \
DT_INST_NODE_HAS_PROP(3, pcp) (DT_INST_FOREACH_STATUS_OKAY(INST_HAS_DLF_HELPER) 0)
#define UART_NS16550_PCP_ENABLED
#endif
#if DT_INST_NODE_HAS_PROP(0, dlf) || \
DT_INST_NODE_HAS_PROP(1, dlf) || \
DT_INST_NODE_HAS_PROP(2, dlf) || \
DT_INST_NODE_HAS_PROP(3, dlf)
#define UART_NS16550_DLF_ENABLED
#endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie) #if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie)
BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "NS16550(s) in DT need CONFIG_PCIE"); BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "NS16550(s) in DT need CONFIG_PCIE");
@ -261,7 +250,7 @@ struct uart_ns16550_device_config {
#if defined(CONFIG_UART_INTERRUPT_DRIVEN) || defined(CONFIG_UART_ASYNC_API) #if defined(CONFIG_UART_INTERRUPT_DRIVEN) || defined(CONFIG_UART_ASYNC_API)
uart_irq_config_func_t irq_config_func; uart_irq_config_func_t irq_config_func;
#endif #endif
#ifdef UART_NS16550_PCP_ENABLED #if UART_NS16550_PCP_ENABLED
uint32_t pcp; uint32_t pcp;
#endif #endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie) #if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie)
@ -285,7 +274,7 @@ struct uart_ns16550_dev_data_t {
void *cb_data; /**< Callback function arg */ void *cb_data; /**< Callback function arg */
#endif #endif
#ifdef UART_NS16550_DLF_ENABLED #if UART_NS16550_DLF_ENABLED
uint8_t dlf; /**< DLF value */ uint8_t dlf; /**< DLF value */
#endif #endif
}; };
@ -372,11 +361,11 @@ static int uart_ns16550_configure(const struct device *dev,
dev_data->iir_cache = 0U; dev_data->iir_cache = 0U;
#endif #endif
#ifdef UART_NS16550_DLF_ENABLED #if UART_NS16550_DLF_ENABLED
OUTBYTE(DLF(dev), dev_data->dlf); OUTBYTE(DLF(dev), dev_data->dlf);
#endif #endif
#ifdef UART_NS16550_PCP_ENABLED #if UART_NS16550_PCP_ENABLED
uint32_t pcp = dev_cfg->pcp; uint32_t pcp = dev_cfg->pcp;
if (pcp) { if (pcp) {
@ -919,7 +908,7 @@ static int uart_ns16550_line_ctrl_set(const struct device *dev,
static int uart_ns16550_drv_cmd(const struct device *dev, uint32_t cmd, static int uart_ns16550_drv_cmd(const struct device *dev, uint32_t cmd,
uint32_t p) uint32_t p)
{ {
#ifdef UART_NS16550_DLF_ENABLED #if UART_NS16550_DLF_ENABLED
if (cmd == CMD_SET_DLF) { if (cmd == CMD_SET_DLF) {
struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev); struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev);
k_spinlock_key_t key = k_spin_lock(&dev_data->lock); k_spinlock_key_t key = k_spin_lock(&dev_data->lock);