m68k: add DM model serial driver
PATCH v4 2/2 m68k: add DM model serial driver
Boards can now use DM serial driver, or still legacy mcf uart driver version.
---
Changes for v2:
- fixed commit message
- added white lines in cmd/mmc.c
- fixed help in cmd/mmc.c
Changes for v3:
- fixed command output to a single printf
- fixed return codes
- fixed macroes with parenthesis around parameter
Changes for v4:
- fix missing include/dm/platform_data/serial_coldfire.h
--- drivers/serial/mcfuart.c | 188 ++++++++++++++++++++++------- include/dm/platform_data/serial_coldfire.h | 23 ++++ 2 files changed, 167 insertions(+), 44 deletions(-) create mode 100644 include/dm/platform_data/serial_coldfire.h
drivers/serial/mcfuart.c +144 -44
@@ -2,6 +2,9 @@* (C) Copyright 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew, Tsi-Chung.Liew at freescale.com. * +* Modified to add device model (DM) support +* (C) Copyright 2015 Angelo Dureghello <[email protected]> +* * SPDX-License-Identifier: GPL-2.0+ */
@@ -11,9 +14,10 @@*/ #include <common.h> +#include <dm.h> +#include <dm/platform_data/serial_coldfire.h> #include <serial.h> #include <linux/compiler.h> -#include <asm/immap.h> #include <asm/uart.h>
@@ -21,91 +25,110 @@ DECLARE_GLOBAL_DATA_PTR;extern void uart_port_conf (int port); -static int mcf_serial_init (void ) +static int mcf_serial_init_common (uart_t *uart,int port_idx,int baudrate) { -volatile uart_t *uart;u32 counter; - uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE ); - -uart_port_conf (CONFIG_SYS_UART_PORT ); +uart_port_conf (port_idx);/* write to SICR: SIM2 = uart mode,dcd does not affect rx */ - uart->ucr =UART_UCR_RESET_RX ; - uart->ucr =UART_UCR_RESET_TX ; - uart->ucr =UART_UCR_RESET_ERROR ; - uart->ucr =UART_UCR_RESET_MR ; +writeb (UART_UCR_RESET_RX , &uart->ucr); +writeb (UART_UCR_RESET_TX , &uart->ucr); +writeb (UART_UCR_RESET_ERROR , &uart->ucr); +writeb (UART_UCR_RESET_MR , &uart->ucr); __asm__("nop" ); - uart->uimr =0 ; +writeb (0 , &uart->uimr);/* write to CSR: RX/TX baud rate from timers */ - uart->ucsr = (UART_UCSR_RCS_SYS_CLK |UART_UCSR_TCS_SYS_CLK ); +writeb (UART_UCSR_RCS_SYS_CLK |UART_UCSR_TCS_SYS_CLK , &uart->ucsr); - uart->umr = (UART_UMR_BC_8 |UART_UMR_PM_NONE ); - uart->umr =UART_UMR_SB_STOP_BITS_1 ; +writeb (UART_UMR_BC_8 |UART_UMR_PM_NONE , &uart->umr); +writeb (UART_UMR_SB_STOP_BITS_1 , &uart->umr);/* Setting up BaudRate */ - counter = (u32) ((gd->bus_clk /32 ) + (gd->baudrate /2 )); - counter = counter / gd->baudrate; + counter = (u32) ((gd->bus_clk /32 ) + (baudrate /2 )); + counter = counter / baudrate;/* write to CTUR: divide counter upper byte */ - uart->ubg1 = (u8) ((counter &0xff00 ) >>8 ); +writeb ((u8)((counter &0xff00 ) >>8 ), &uart->ubg1);/* write to CTLR: divide counter lower byte */ - uart->ubg2 = (u8) (counter &0x00ff ); +writeb ((u8)(counter &0x00ff ), &uart->ubg2); - uart->ucr = (UART_UCR_RX_ENABLED |UART_UCR_TX_ENABLED ); +writeb (UART_UCR_RX_ENABLED |UART_UCR_TX_ENABLED , &uart->ucr);return (0 ); } +static void mcf_serial_setbrg_common (uart_t *uart,int baudrate) +{ +u32 counter; + +/* Setting up BaudRate */ + counter = (u32) ((gd->bus_clk /32 ) + (baudrate /2 )); + counter = counter / baudrate; + +/* write to CTUR: divide counter upper byte */ +writeb (((counter &0xff00 ) >>8 ), &uart->ubg1); +/* write to CTLR: divide counter lower byte */ +writeb ((counter &0x00ff ), &uart->ubg2); + +writeb (UART_UCR_RESET_RX , &uart->ucr); +writeb (UART_UCR_RESET_TX , &uart->ucr); + +writeb (UART_UCR_RX_ENABLED |UART_UCR_TX_ENABLED , &uart->ucr); +} + +#ifndef CONFIG_DM_SERIAL + +static int mcf_serial_init (void ) +{ +uart_t *uart_base; +int port_idx; + + uart_base = (uart_t *)CONFIG_SYS_UART_BASE ; + port_idx =CONFIG_SYS_UART_PORT ; + +return mcf_serial_init_common (uart_base, port_idx, gd->baudrate); +} +static void mcf_serial_putc (const char c) { -volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE ); +uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ;if (c =='\n' )serial_putc ('\r' );/* Wait for last character to go. */ -while (!(uart->usr &UART_USR_TXRDY )) ; +while (!(readb (&uart->usr) &UART_USR_TXRDY )) + ; - uart->utb = c; +writeb (c, &uart->utb); }static int mcf_serial_getc (void ) { -volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE ); +uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ;/* Wait for a character to arrive. */ -while (!(uart->usr &UART_USR_RXRDY )) ; -return uart->urb; -} - -static int mcf_serial_tstc (void ) -{ -volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE ); +while (!(readb (&uart->usr) &UART_USR_RXRDY )) + ; -return (uart->usr &UART_USR_RXRDY ); +return readb (&uart->urb); }static void mcf_serial_setbrg (void ) { -volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE ); -u32 counter; - -/* Setting up BaudRate */ - counter = (u32) ((gd->bus_clk /32 ) + (gd->baudrate /2 )); - counter = counter / gd->baudrate; +uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; -/* write to CTUR: divide counter upper byte */ - uart->ubg1 = ((counter &0xff00 ) >>8 ); -/* write to CTLR: divide counter lower byte */ - uart->ubg2 = (counter &0x00ff ); +mcf_serial_setbrg_common (uart, gd->baudrate); +} - uart->ucr =UART_UCR_RESET_RX ; - uart->ucr =UART_UCR_RESET_TX ; +static int mcf_serial_tstc (void ) +{ +uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; - uart->ucr =UART_UCR_RX_ENABLED |UART_UCR_TX_ENABLED ; +return readb (&uart->usr) &UART_USR_RXRDY ; } static struct serial_device mcf_serial_drv = {
@@ -128,3 +151,80 @@ __weak struct serial_device *default_serial_console(void) {return &mcf_serial_drv; } + +#endif + +#ifdef CONFIG_DM_SERIAL + +static int coldfire_serial_probe (struct udevice *dev) +{ +struct coldfire_serial_platdata *plat = dev->platdata; + +return mcf_serial_init_common ((uart_t *)plat->base, + plat->port, plat->baudrate); +} + +static int coldfire_serial_putc (struct udevice *dev,const char ch) +{ +struct coldfire_serial_platdata *plat = dev->platdata; +uart_t *uart = (uart_t *)plat->base; + +/* Wait for last character to go. */ +if (!(readb (&uart->usr) &UART_USR_TXRDY )) +return -EAGAIN ; + +writeb (ch, &uart->utb); + +return 0 ; +} + +static int coldfire_serial_getc (struct udevice *dev) +{ +struct coldfire_serial_platdata *plat = dev->platdata; +uart_t *uart = (uart_t *)(plat->base); + +/* Wait for a character to arrive. */ +if (!(readb (&uart->usr) &UART_USR_RXRDY )) +return -EAGAIN ; + +return readb (&uart->urb); +} + +int coldfire_serial_setbrg (struct udevice *dev,int baudrate) +{ +struct coldfire_serial_platdata *plat = dev->platdata; +uart_t *uart = (uart_t *)(plat->base); + +mcf_serial_setbrg_common (uart, baudrate); + +return 0 ; +} + +static int coldfire_serial_pending (struct udevice *dev,bool input) +{ +struct coldfire_serial_platdata *plat = dev->platdata; +uart_t *uart = (uart_t *)(plat->base); + +if (input) +return readb (&uart->usr) &UART_USR_RXRDY ?1 :0 ; +else +return readb (&uart->usr) &UART_USR_TXRDY ?0 :1 ; + +return 0 ; +} + +static const struct dm_serial_ops coldfire_serial_ops = { + .putc = coldfire_serial_putc, + .pending = coldfire_serial_pending, + .getc = coldfire_serial_getc, + .setbrg = coldfire_serial_setbrg, +}; + +U_BOOT_DRIVER (serial_coldfire) = { + .name ="serial_coldfire" , + .id =UCLASS_SERIAL , + .probe = coldfire_serial_probe, + .ops = &coldfire_serial_ops, + .flags =DM_FLAG_PRE_RELOC , +}; +#endif
include/dm/platform_data/serial_coldfire.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Copyright (c) 2015 Angelo Dureghello <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __serial_coldfire_h +#define __serial_coldfire_h + +/* +* struct coldfire_serial_platdata - information about a coldfire port +* +* @base: Uart port base register address +* @port: Uart port index, for cpu with pinmux for uart / gpio +* baudrtatre: Uart port baudrate +*/ +struct coldfire_serial_platdata { +unsigned long base; +int port; +int baudrate; +}; + +#endif /* __serial_coldfire_h */
Signature · 1 line
2.7.0.rc3
PATCH v4 2/2 m68k: add DM model serial driver
Quoted 15 lines · Angelo Dureghello
Boards can now use DM serial driver, or still legacy mcf uart driver version.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- fixed commit message
- added white lines incmd/mmc.c
- fixed help incmd/mmc.c
Changes for v3:
- fixed command output to a single printf
- fixed return codes
- fixed macroes with parenthesis around parameter
Changes for v4:
- fix missinginclude/dm/platform_data/serial_coldfire.h
Quoted 5 lines
--- drivers/serial/mcfuart.c | 188 ++++++++++++++++++++++------- include/dm/platform_data/serial_coldfire.h | 23 ++++ 2 files changed, 167 insertions(+), 44 deletions(-) create mode 100644 include/dm/platform_data/serial_coldfire.h
PATCH v4 2/2 m68k: add DM model serial driver
Quoted 22 lines · Simon Glass
Quoted 15 lines · Angelo Dureghello
Boards can now use DM serial driver, or still legacy mcf uart driver version.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- fixed commit message
- added white lines incmd/mmc.c
- fixed help incmd/mmc.c
Changes for v3:
- fixed command output to a single printf
- fixed return codes
- fixed macroes with parenthesis around parameter
Changes for v4:
- fix missinginclude/dm/platform_data/serial_coldfire.hQuoted 5 lines
--- drivers/serial/mcfuart.c | 188 ++++++++++++++++++++++------- include/dm/platform_data/serial_coldfire.h | 23 ++++ 2 files changed, 167 insertions(+), 44 deletions(-) create mode 100644 include/dm/platform_data/serial_coldfire.h
Quoted 1 line
Acked-by Simon Glass <[email protected]>
Applied to u-boot-dm, thanks!