aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@openbsd.org>2023-01-26 14:44:09 +0100
committerTom Rini <trini@konsulko.com>2023-01-27 14:32:55 -0500
commit053827b3c39e5a3318002f570679ec46294aa98b (patch)
tree7e48b09347723530f615df31bd802cccd3352c03
parent424d4f4509a97887647fae9a2a390f043cd60772 (diff)
downloadu-boot-053827b3c39e5a3318002f570679ec46294aa98b.zip
u-boot-053827b3c39e5a3318002f570679ec46294aa98b.tar.gz
u-boot-053827b3c39e5a3318002f570679ec46294aa98b.tar.bz2
serial: s5p: Use IS_ENABLED where appropriate
There are no SPL/TPL variants of CONFIG_CLK_EXYNOS and CONFIG_ARCH_APPLE, so switch from CONFIG_IS_ENABLED to IS_ENABLED. Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/serial/serial_s5p.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 4b3947e..7aeb8c0 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -14,7 +14,7 @@
#include <asm/global_data.h>
#include <linux/compiler.h>
#include <asm/io.h>
-#if !CONFIG_IS_ENABLED(ARCH_APPLE)
+#if !IS_ENABLED(CONFIG_ARCH_APPLE)
#include <asm/arch/clk.h>
#endif
#include <asm/arch/uart.h>
@@ -116,7 +116,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)
struct s5p_uart *const uart = plat->reg;
u32 uclk;
-#if CONFIG_IS_ENABLED(CLK_EXYNOS) || CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_CLK_EXYNOS) || IS_ENABLED(CONFIG_ARCH_APPLE)
struct clk clk;
u32 ret;
@@ -279,7 +279,7 @@ static inline void _debug_uart_init(void)
struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE);
s5p_serial_init(uart);
-#if CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_ARCH_APPLE)
s5p_serial_baud(uart, 4, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
#else
s5p_serial_baud(uart, 1, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
@@ -290,7 +290,7 @@ static inline void _debug_uart_putc(int ch)
{
struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE);
-#if CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_ARCH_APPLE)
while (readl(&uart->ufstat) & S5L_TX_FIFO_FULL);
writel(ch, &uart->utxh);
#else