diff options
| author | Tom Rini <trini@ti.com> | 2014-11-04 18:24:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-04 18:24:44 -0500 |
| commit | 2dbbda08b92b006b541a099a3025cac12c6d720e (patch) | |
| tree | bace5d2ed5c6295e5710f8f095d1304fa286c857 /drivers/serial | |
| parent | 26f195c71252e98aebfffd5cfa994a4475559370 (diff) | |
| parent | f7ca1f76fd01f3fc7e75fb3fd801c7bef16598db (diff) | |
| download | u-boot-imx-2dbbda08b92b006b541a099a3025cac12c6d720e.zip u-boot-imx-2dbbda08b92b006b541a099a3025cac12c6d720e.tar.gz u-boot-imx-2dbbda08b92b006b541a099a3025cac12c6d720e.tar.bz2 | |
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_sh.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index fe8cde4..53406e5 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -227,7 +227,7 @@ struct uart_port { # define SCIF_ORER 0x0001 /* Overrun error bit */ # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ #elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ - defined(CONFIG_R8A7794) + defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) # define SCIF_ORER 0x0001 # define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0, */ #else @@ -304,7 +304,8 @@ struct uart_port { /* SH7763 SCIF2 support */ # define SCIF2_RFDC_MASK 0x001f # define SCIF2_TXROOM_MAX 16 -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ + defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) # define SCIF_RFDC_MASK 0x003f #else @@ -589,7 +590,7 @@ SCIF_FNS(SCSPTR, 0, 0, 0, 0) SCIF_FNS(SCSPTR, 0, 0, 0x20, 16) #endif #if defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ - defined(CONFIG_R8A7794) + defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) SCIF_FNS(DL, 0, 0, 0x30, 16) SCIF_FNS(CKS, 0, 0, 0x34, 16) #endif @@ -734,7 +735,8 @@ static inline int scbrr_calc(struct uart_port port, int bps, int clk) #define SCBRR_VALUE(bps, clk) scbrr_calc(sh_sci, bps, clk) #elif defined(__H8300H__) || defined(__H8300S__) #define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1) -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ + defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */ #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1) /* Internal Clock */ #else /* Generic SH */ |