mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-31 19:41:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master_uart_test' of https://source.denx.de/u-boot/custodians/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini 2023-10-19 16:27:09 -04:00
commit a65c3990e5
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-rmobile/Kconfig
View File

@ -77,6 +77,7 @@ config RZG2L
imply PINCTRL_RZG2L
imply RENESAS_SDHI
imply RZG2L_GPIO
imply SCIF_CONSOLE
imply SYS_MALLOC_F
help
Enable support for the Renesas RZ/G2L family of SoCs. Currently

31
drivers/serial/serial_sh.c
View File

@ -12,10 +12,12 @@
#include <asm/processor.h>
#include <clk.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <dm/platform_data/serial_sh.h>
#include <errno.h>
#include <linux/compiler.h>
#include <linux/delay.h>
#include <reset.h>
#include <serial.h>
#include "serial_sh.h"
@ -79,10 +81,22 @@ sh_serial_setbrg_generic(struct uart_port *port, int clk, int baudrate)
static void handle_error(struct uart_port *port)
{
sci_in(port, SCxSR);
sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
/*
* Most errors are cleared by resetting the relevant error bits to zero
* in the FSR & LSR registers. For each register, a read followed by a
* write is needed according to the relevant datasheets.
*/
unsigned short status = sci_in(port, SCxSR);
sci_out(port, SCxSR, status & ~SCxSR_ERRORS(port));
sci_in(port, SCLSR);
sci_out(port, SCLSR, 0x00);
/*
* To clear framing errors, we also need to read and discard a
* character.
*/
if ((port->type != PORT_SCI) && (status & SCIF_FER))
sci_in(port, SCxRDR);
}
static int serial_raw_putc(struct uart_port *port, const char c)
@ -187,12 +201,24 @@ static int sh_serial_probe(struct udevice *dev)
{
struct sh_serial_plat *plat = dev_get_plat(dev);
struct uart_port *priv = dev_get_priv(dev);
struct reset_ctl rst;
int ret;
priv->membase = (unsigned char *)plat->base;
priv->mapbase = plat->base;
priv->type = plat->type;
priv->clk_mode = plat->clk_mode;
/* De-assert the module reset if it is defined. */
ret = reset_get_by_index(dev, 0, &rst);
if (!ret) {
ret = reset_deassert(&rst);
if (ret < 0) {
dev_err(dev, "failed to de-assert reset line\n");
return ret;
}
}
sh_serial_init_generic(priv);
return 0;
@ -209,6 +235,7 @@ static const struct dm_serial_ops sh_serial_ops = {
static const struct udevice_id sh_serial_id[] ={
{.compatible = "renesas,sci", .data = PORT_SCI},
{.compatible = "renesas,scif", .data = PORT_SCIF},
{.compatible = "renesas,scif-r9a07g044", .data = PORT_SCIFA},
{.compatible = "renesas,scifa", .data = PORT_SCIFA},
{.compatible = "renesas,hscif", .data = PORT_HSCIF},
{}

19
drivers/serial/serial_sh.h
View File

@ -90,7 +90,7 @@ struct uart_port {
# define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
# define SCIF_ORER 0x0001 /* overrun error bit */
#elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_64) || \
defined(CONFIG_R7S72100)
defined(CONFIG_R7S72100) || defined(CONFIG_RZG2L)
# if defined(CFG_SCIF_A)
# define SCIF_ORER 0x0200
# else
@ -312,6 +312,9 @@ static inline void sci_##name##_out(struct uart_port *port,\
sh4_scif_offset, sh4_scif_size)
#define SCIF_FNS(name, sh4_scif_offset, sh4_scif_size) \
CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
#elif defined(CONFIG_RZG2L)
#define SCIF_FNS(reg_name, reg_offset, reg_size) \
CPU_SCIF_FNS(reg_name, reg_offset, reg_size)
#else
#define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size,\
sh4_sci_offset, sh4_sci_size, \
@ -387,6 +390,20 @@ SCIF_FNS(SCLSR, 0, 0, 0x14, 16)
#else
SCIF_FNS(SCLSR, 0, 0, 0x24, 16)
#endif
#elif defined(CONFIG_RZG2L)
SCIF_FNS(SCSMR, 0x00, 16)
SCIF_FNS(SCBRR, 0x02, 8)
SCIF_FNS(SCSCR, 0x04, 16)
SCIF_FNS(SCxTDR, 0x06, 8)
SCIF_FNS(SCxSR, 0x08, 16)
SCIF_FNS(SCxRDR, 0x0A, 8)
SCIF_FNS(SCFCR, 0x0C, 16)
SCIF_FNS(SCFDR, 0x0E, 16)
SCIF_FNS(SCSPTR, 0x10, 16)
SCIF_FNS(SCLSR, 0x12, 16)
SCIF_FNS(SCSEMR, 0x14, 8)
SCIF_FNS(SCxTCR, 0x16, 16)
SCIF_FNS(DL, 0x00, 0)
#else
/* reg SCI/SH3 SCI/SH4 SCIF/SH3 SCIF/SH4 SCI/H8*/
/* name off sz off sz off sz off sz off sz*/