GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

serial: bcm6345: switch to raw I/O functions

Browse source 
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2018-12-01 18:42:07 +01:00 • committed by Tom Rini
parent 2aadff0feb
commit 09ace9161b
1 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/serial/serial_bcm6345.c
View file

@ -89,14 +89,14 @@ struct bcm6345_serial_priv {
/* enable rx & tx operation on uart */ /* enable rx & tx operation on uart */
static void bcm6345_serial_enable(void __iomem *base) static void bcm6345_serial_enable(void __iomem *base)
{ {
setbits_be32(base + UART_CTL_REG, UART_CTL_BRGEN_MASK | setbits_32(base + UART_CTL_REG, UART_CTL_BRGEN_MASK |
UART_CTL_TXEN_MASK | UART_CTL_RXEN_MASK); UART_CTL_TXEN_MASK | UART_CTL_RXEN_MASK);
} }
/* disable rx & tx operation on uart */ /* disable rx & tx operation on uart */
static void bcm6345_serial_disable(void __iomem *base) static void bcm6345_serial_disable(void __iomem *base)
{ {
clrbits_be32(base + UART_CTL_REG, UART_CTL_BRGEN_MASK | clrbits_32(base + UART_CTL_REG, UART_CTL_BRGEN_MASK |
UART_CTL_TXEN_MASK | UART_CTL_RXEN_MASK); UART_CTL_TXEN_MASK | UART_CTL_RXEN_MASK);
} }
@ -104,11 +104,11 @@ static void bcm6345_serial_disable(void __iomem *base)
static void bcm6345_serial_flush(void __iomem *base) static void bcm6345_serial_flush(void __iomem *base)
{ {
/* empty rx and tx fifo */ /* empty rx and tx fifo */
setbits_be32(base + UART_CTL_REG, UART_CTL_RSTRXFIFO_MASK | setbits_32(base + UART_CTL_REG, UART_CTL_RSTRXFIFO_MASK |
UART_CTL_RSTTXFIFO_MASK); UART_CTL_RSTTXFIFO_MASK);
/* read any pending char to make sure all irq status are cleared */ /* read any pending char to make sure all irq status are cleared */
readl_be(base + UART_FIFO_REG); readl(base + UART_FIFO_REG);
} }
static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate) static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate)
@ -120,7 +120,7 @@ static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate)
bcm6345_serial_flush(base); bcm6345_serial_flush(base);
/* set uart control config */ /* set uart control config */
clrsetbits_be32(base + UART_CTL_REG, clrsetbits_32(base + UART_CTL_REG,
/* clear rx timeout */ /* clear rx timeout */
UART_CTL_RXTIMEOUT_MASK | UART_CTL_RXTIMEOUT_MASK |
/* clear stop bits */ /* clear stop bits */
@ -147,7 +147,7 @@ static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate)
UART_CTL_TXPAREVEN_MASK); UART_CTL_TXPAREVEN_MASK);
/* set uart fifo config */ /* set uart fifo config */
clrsetbits_be32(base + UART_FIFO_CFG_REG, clrsetbits_32(base + UART_FIFO_CFG_REG,
/* clear fifo config */ /* clear fifo config */
UART_FIFO_CFG_RX_MASK | UART_FIFO_CFG_RX_MASK |
UART_FIFO_CFG_TX_MASK, UART_FIFO_CFG_TX_MASK,
@ -161,10 +161,10 @@ static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate)
val = (val >> 1); val = (val >> 1);
else else
val = (val >> 1) - 1; val = (val >> 1) - 1;
writel_be(val, base + UART_BAUD_REG); writel(val, base + UART_BAUD_REG);
/* clear interrupts */ /* clear interrupts */
writel_be(0, base + UART_IR_REG); writel(0, base + UART_IR_REG);
/* enable uart */ /* enable uart */
bcm6345_serial_enable(base); bcm6345_serial_enable(base);
@ -175,7 +175,7 @@ static int bcm6345_serial_init(void __iomem *base, ulong clk, u32 baudrate)
static int bcm6345_serial_pending(struct udevice *dev, bool input) static int bcm6345_serial_pending(struct udevice *dev, bool input)
{ {
struct bcm6345_serial_priv *priv = dev_get_priv(dev); struct bcm6345_serial_priv *priv = dev_get_priv(dev);
u32 val = readl_be(priv->base + UART_IR_REG); u32 val = readl(priv->base + UART_IR_REG);
if (input) if (input)
return !!(val & UART_IR_STAT(UART_IR_RXNOTEMPTY)); return !!(val & UART_IR_STAT(UART_IR_RXNOTEMPTY));
@ -195,11 +195,11 @@ static int bcm6345_serial_putc(struct udevice *dev, const char ch)
struct bcm6345_serial_priv *priv = dev_get_priv(dev); struct bcm6345_serial_priv *priv = dev_get_priv(dev);
u32 val; u32 val;
val = readl_be(priv->base + UART_IR_REG); val = readl(priv->base + UART_IR_REG);
if (!(val & UART_IR_STAT(UART_IR_TXEMPTY))) if (!(val & UART_IR_STAT(UART_IR_TXEMPTY)))
return -EAGAIN; return -EAGAIN;
writel_be(ch, priv->base + UART_FIFO_REG); writel(ch, priv->base + UART_FIFO_REG);
return 0; return 0;
} }
@ -209,14 +209,13 @@ static int bcm6345_serial_getc(struct udevice *dev)
struct bcm6345_serial_priv *priv = dev_get_priv(dev); struct bcm6345_serial_priv *priv = dev_get_priv(dev);
u32 val; u32 val;
val = readl_be(priv->base + UART_IR_REG); val = readl(priv->base + UART_IR_REG);
if (val & UART_IR_STAT(UART_IR_RXOVER)) if (val & UART_IR_STAT(UART_IR_RXOVER))
setbits_be32(priv->base + UART_CTL_REG, setbits_32(priv->base + UART_CTL_REG, UART_CTL_RSTRXFIFO_MASK);
UART_CTL_RSTRXFIFO_MASK);
if (!(val & UART_IR_STAT(UART_IR_RXNOTEMPTY))) if (!(val & UART_IR_STAT(UART_IR_RXNOTEMPTY)))
return -EAGAIN; return -EAGAIN;
val = readl_be(priv->base + UART_FIFO_REG); val = readl(priv->base + UART_FIFO_REG);
if (val & UART_FIFO_ANYERR_MASK) if (val & UART_FIFO_ANYERR_MASK)
return -EAGAIN; return -EAGAIN;
@ -277,7 +276,7 @@ static inline void _debug_uart_init(void)
static inline void wait_xfered(void __iomem *base) static inline void wait_xfered(void __iomem *base)
{ {
do { do {
u32 val = readl_be(base + UART_IR_REG); u32 val = readl(base + UART_IR_REG);
if (val & UART_IR_STAT(UART_IR_TXEMPTY)) if (val & UART_IR_STAT(UART_IR_TXEMPTY))
break; break;
} while (1); } while (1);
@ -288,7 +287,7 @@ static inline void _debug_uart_putc(int ch)
void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE; void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
wait_xfered(base); wait_xfered(base);
writel_be(ch, base + UART_FIFO_REG); writel(ch, base + UART_FIFO_REG);
wait_xfered(base); wait_xfered(base);
} }