serial: bcm283x_mu: make pending values more explicit

[u-boot] / drivers / serial / serial_stm32.c

diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 3c800961d1affb49bb23154e877ea4e4efb0dfca..c793ba6e9009f3f9c82ec719743c79468d542613 100644 (file)
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -1,22 +1,18 @@
 /*
  * (C) Copyright 2015
- * Kamil Lulko, <rev13@wp.pl>
+ * Kamil Lulko, <kamil.lulko@gmail.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/io.h>
 #include <serial.h>
 #include <asm/arch/stm32.h>
+#include <dm/platform_data/serial_stm32.h>
 
-#define STM32_USART1_BASE      (STM32_APB2PERIPH_BASE + 0x1000)
-#define RCC_APB2ENR_USART1EN   (1 << 4)
-
-#define USART_BASE             STM32_USART1_BASE
-#define RCC_USART_ENABLE       RCC_APB2ENR_USART1EN
-
-struct stm32_serial {
+struct stm32_usart {
        u32 sr;
        u32 dr;
        u32 brr;
@@ -26,92 +22,96 @@ struct stm32_serial {
        u32 gtpr;
 };
 
-#define USART_CR1_RE           (1 << 2)
-#define USART_CR1_TE           (1 << 3)
-#define USART_CR1_UE           (1 << 13)
+#define USART_CR1_RE                   (1 << 2)
+#define USART_CR1_TE                   (1 << 3)
+#define USART_CR1_UE                   (1 << 13)
 
 #define USART_SR_FLAG_RXNE     (1 << 5)
-#define USART_SR_FLAG_TXE      (1 << 7)
+#define USART_SR_FLAG_TXE              (1 << 7)
 
-#define USART_BRR_F_MASK       0xF
+#define USART_BRR_F_MASK               0xF
 #define USART_BRR_M_SHIFT      4
 #define USART_BRR_M_MASK       0xFFF0
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void stm32_serial_setbrg(void)
-{
-       serial_init();
-}
-
-static int stm32_serial_init(void)
+static int stm32_serial_setbrg(struct udevice *dev, int baudrate)
 {
-       struct stm32_serial *usart = (struct stm32_serial *)USART_BASE;
-       u32 clock, int_div, frac_div, tmp;
+       struct stm32_serial_platdata *plat = dev->platdata;
+       struct stm32_usart *const usart = plat->base;
+       u32  clock, int_div, frac_div, tmp;
 
-       if ((USART_BASE & STM32_BUS_MASK) == STM32_APB1PERIPH_BASE) {
-               setbits_le32(&STM32_RCC->apb1enr, RCC_USART_ENABLE);
+       if (((u32)usart & STM32_BUS_MASK) == STM32_APB1PERIPH_BASE)
                clock = clock_get(CLOCK_APB1);
-       } else if ((USART_BASE & STM32_BUS_MASK) == STM32_APB2PERIPH_BASE) {
-               setbits_le32(&STM32_RCC->apb2enr, RCC_USART_ENABLE);
+       else if (((u32)usart & STM32_BUS_MASK) == STM32_APB2PERIPH_BASE)
                clock = clock_get(CLOCK_APB2);
-       } else {
-               return -1;
-       }
+       else
+               return -EINVAL;
 
-       int_div = (25 * clock) / (4 * gd->baudrate);
+       int_div = (25 * clock) / (4 * baudrate);
        tmp = ((int_div / 100) << USART_BRR_M_SHIFT) & USART_BRR_M_MASK;
        frac_div = int_div - (100 * (tmp >> USART_BRR_M_SHIFT));
        tmp |= (((frac_div * 16) + 50) / 100) & USART_BRR_F_MASK;
-
        writel(tmp, &usart->brr);
-       setbits_le32(&usart->cr1, USART_CR1_RE | USART_CR1_TE | USART_CR1_UE);
 
        return 0;
 }
 
-static int stm32_serial_getc(void)
+static int stm32_serial_getc(struct udevice *dev)
 {
-       struct stm32_serial *usart = (struct stm32_serial *)USART_BASE;
-       while ((readl(&usart->sr) & USART_SR_FLAG_RXNE) == 0)
-               ;
+       struct stm32_serial_platdata *plat = dev->platdata;
+       struct stm32_usart *const usart = plat->base;
+
+       if ((readl(&usart->sr) & USART_SR_FLAG_RXNE) == 0)
+               return -EAGAIN;
+
        return readl(&usart->dr);
 }
 
-static void stm32_serial_putc(const char c)
+static int stm32_serial_putc(struct udevice *dev, const char c)
 {
-       struct stm32_serial *usart = (struct stm32_serial *)USART_BASE;
-       while ((readl(&usart->sr) & USART_SR_FLAG_TXE) == 0)
-               ;
+       struct stm32_serial_platdata *plat = dev->platdata;
+       struct stm32_usart *const usart = plat->base;
+
+       if ((readl(&usart->sr) & USART_SR_FLAG_TXE) == 0)
+               return -EAGAIN;
+
        writel(c, &usart->dr);
+
+       return 0;
 }
 
-static int stm32_serial_tstc(void)
+static int stm32_serial_pending(struct udevice *dev, bool input)
 {
-       struct stm32_serial *usart = (struct stm32_serial *)USART_BASE;
-       u8 ret;
+       struct stm32_serial_platdata *plat = dev->platdata;
+       struct stm32_usart *const usart = plat->base;
 
-       ret = readl(&usart->sr) & USART_SR_FLAG_RXNE;
-       return ret;
+       if (input)
+               return readl(&usart->sr) & USART_SR_FLAG_RXNE ? 1 : 0;
+       else
+               return readl(&usart->sr) & USART_SR_FLAG_TXE ? 0 : 1;
 }
 
-static struct serial_device stm32_serial_drv = {
-       .name   = "stm32_serial",
-       .start  = stm32_serial_init,
-       .stop   = NULL,
-       .setbrg = stm32_serial_setbrg,
-       .putc   = stm32_serial_putc,
-       .puts   = default_serial_puts,
-       .getc   = stm32_serial_getc,
-       .tstc   = stm32_serial_tstc,
-};
-
-void stm32_serial_initialize(void)
+static int stm32_serial_probe(struct udevice *dev)
 {
-       serial_register(&stm32_serial_drv);
-}
+       struct stm32_serial_platdata *plat = dev->platdata;
+       struct stm32_usart *const usart = plat->base;
+       setbits_le32(&usart->cr1, USART_CR1_RE | USART_CR1_TE | USART_CR1_UE);
 
-__weak struct serial_device *default_serial_console(void)
-{
-       return &stm32_serial_drv;
+       return 0;
 }
+
+static const struct dm_serial_ops stm32_serial_ops = {
+       .putc = stm32_serial_putc,
+       .pending = stm32_serial_pending,
+       .getc = stm32_serial_getc,
+       .setbrg = stm32_serial_setbrg,
+};
+
+U_BOOT_DRIVER(serial_stm32) = {
+       .name = "serial_stm32",
+       .id = UCLASS_SERIAL,
+       .ops = &stm32_serial_ops,
+       .probe = stm32_serial_probe,
+       .flags = DM_FLAG_PRE_RELOC,
+};