LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Fix receive FIFO level register of SH4A 

Receive FIFO level register is different in SH4A.
Because register is different, cannot occasionally receive data.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Nobuhiro Iwamatsu 2008-03-06 14:05:53 +09:00
parent c133c1fb0b
commit 3ecff1d70a
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/serial/serial_sh.c
View File

@ -37,41 +37,45 @@
#define SCFCR (vu_short *)(SCIF_BASE + 0x18) #define SCFCR (vu_short *)(SCIF_BASE + 0x18)
#define SCFDR (vu_short *)(SCIF_BASE + 0x1C) #define SCFDR (vu_short *)(SCIF_BASE + 0x1C)
#ifdef CONFIG_CPU_SH7720 /* SH7720 specific */ #ifdef CONFIG_CPU_SH7720 /* SH7720 specific */
#define SCFSR (vu_short *)(SCIF_BASE + 0x14) /* SCSSR */ # define SCFSR (vu_short *)(SCIF_BASE + 0x14) /* SCSSR */
#define SCFTDR (vu_char *)(SCIF_BASE + 0x20) # define SCFTDR (vu_char *)(SCIF_BASE + 0x20)
#define SCFRDR (vu_char *)(SCIF_BASE + 0x24) # define SCFRDR (vu_char *)(SCIF_BASE + 0x24)
#else #else
#define SCFTDR (vu_char *)(SCIF_BASE + 0xC) # define SCFTDR (vu_char *)(SCIF_BASE + 0xC)
#define SCFSR (vu_short *)(SCIF_BASE + 0x10) # define SCFSR (vu_short *)(SCIF_BASE + 0x10)
#define SCFRDR (vu_char *)(SCIF_BASE + 0x14) # define SCFRDR (vu_char *)(SCIF_BASE + 0x14)
#endif #endif
#if defined(CONFIG_CPU_SH7780) || \ #if defined(CONFIG_CPU_SH7780) || \
defined(CONFIG_CPU_SH7785) defined(CONFIG_CPU_SH7785)
#define SCRFDR (vu_short *)(SCIF_BASE + 0x20) # define SCRFDR (vu_short *)(SCIF_BASE + 0x20)
#define SCSPTR (vu_short *)(SCIF_BASE + 0x24) # define SCSPTR (vu_short *)(SCIF_BASE + 0x24)
#define SCLSR (vu_short *)(SCIF_BASE + 0x28) # define SCLSR (vu_short *)(SCIF_BASE + 0x28)
#define SCRER (vu_short *)(SCIF_BASE + 0x2C) # define SCRER (vu_short *)(SCIF_BASE + 0x2C)
#define LSR_ORER 1 # define LSR_ORER 1
# define FIFOLEVEL_MASK 0xFF
#elif defined(CONFIG_CPU_SH7750) || \ #elif defined(CONFIG_CPU_SH7750) || \
defined(CONFIG_CPU_SH7722) defined(CONFIG_CPU_SH7722)
#define SCSPTR (vu_short *)(SCIF_BASE + 0x20) # define SCSPTR (vu_short *)(SCIF_BASE + 0x20)
#define SCLSR (vu_short *)(SCIF_BASE + 0x24) # define SCLSR (vu_short *)(SCIF_BASE + 0x24)
#define LSR_ORER 1 # define LSR_ORER 1
# define FIFOLEVEL_MASK 0x1F
#elif defined(CONFIG_CPU_SH7720) #elif defined(CONFIG_CPU_SH7720)
#define SCLSR (vu_short *)(SCIF_BASE + 0x24) # define SCLSR (vu_short *)(SCIF_BASE + 0x24)
#define LSR_ORER 0x0200 # define LSR_ORER 0x0200
# define FIFOLEVEL_MASK 0x1F
#elif defined(CONFIG_CPU_SH7710) #elif defined(CONFIG_CPU_SH7710)
defined(CONFIG_CPU_SH7712) defined(CONFIG_CPU_SH7712)
#define SCLSR SCFSR /* SCSSR */ # define SCLSR SCFSR /* SCSSR */
#define LSR_ORER 1 # define LSR_ORER 1
# define FIFOLEVEL_MASK 0x1F
#endif #endif
/* SCBRR register value setting */ /* SCBRR register value setting */
#if defined(CONFIG_CPU_SH7720) #if defined(CONFIG_CPU_SH7720)
#define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1) # define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1)
#else /* Generic SuperH */ #else /* Generic SuperH */
#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1) # define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1)
#endif #endif
#define SCR_RE (1 << 4) #define SCR_RE (1 << 4)
@ -109,12 +113,16 @@ int serial_init (void)
static int serial_tx_fifo_level (void) static int serial_tx_fifo_level (void)
{ {
return (*SCFDR >> 8) & 0x1F; return (*SCFDR >> 8) & FIFOLEVEL_MASK;
} }
static int serial_rx_fifo_level (void) static int serial_rx_fifo_level (void)
{ {
return (*SCFDR >> 0) & 0x1F; #if defined(CONFIG_SH4A)
return (*SCRFDR >> 0) & FIFOLEVEL_MASK;
#else
return (*SCFDR >> 0) & FIFOLEVEL_MASK;
#endif
} }
void serial_raw_putc (const char c) void serial_raw_putc (const char c)