mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
mpc512x: add multi serial PSC support
Extend mpc512x serial driver to support multiple PSC ports. Subsequent patches for PDM360NG board support make use of this functionality by defining CONFIG_SERIAL_MULTI in the board config file. Additionally the used PSC devices are specified by defining e.g. CONFIG_SYS_PSC1, CONFIG_SYS_PSC4 and CONFIG_SYS_PSC6. Support for PSC devices other than 1, 3, 4 and 6 is not added by this patch because these aren't used currently. In the future it can be easily added using DECLARE_PSC_SERIAL_FUNCTIONS(N) and INIT_PSC_SERIAL_STRUCTURE(N) macros in cpu/mpc512x/serial.c. Additionally you have to add code for registering added devices in serial_initialize() in common/serial.c. Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Anatolij Gustschin
Wolfgang Denk
parent
fbb0030e38
commit
e3b28e6732
4 changed files with 315 additions and 73 deletions
|
|
@ -32,14 +32,16 @@
|
|||
#include <common.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/processor.h>
|
||||
#include <serial.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#if defined(CONFIG_PSC_CONSOLE)
|
||||
#if defined(CONFIG_PSC_CONSOLE) || defined(CONFIG_SERIAL_MULTI)
|
||||
|
||||
static void fifo_init (volatile psc512x_t *psc)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
u32 tfsize, rfsize;
|
||||
|
||||
/* reset Rx & Tx fifo slice */
|
||||
out_be32(&psc->rfcmd, PSC_FIFO_RESET_SLICE);
|
||||
|
|
@ -49,8 +51,65 @@ static void fifo_init (volatile psc512x_t *psc)
|
|||
out_be32(&psc->rfintmask, 0);
|
||||
out_be32(&psc->tfintmask, 0);
|
||||
|
||||
out_be32(&psc->tfsize, CONSOLE_FIFO_TX_SIZE | (CONSOLE_FIFO_TX_ADDR << 16));
|
||||
out_be32(&psc->rfsize, CONSOLE_FIFO_RX_SIZE | (CONSOLE_FIFO_RX_ADDR << 16));
|
||||
#if defined(CONFIG_SERIAL_MULTI)
|
||||
switch (((u32)psc & 0xf00) >> 8) {
|
||||
case 0:
|
||||
tfsize = FIFOC_PSC0_TX_SIZE | (FIFOC_PSC0_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC0_RX_SIZE | (FIFOC_PSC0_RX_ADDR << 16);
|
||||
break;
|
||||
case 1:
|
||||
tfsize = FIFOC_PSC1_TX_SIZE | (FIFOC_PSC1_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC1_RX_SIZE | (FIFOC_PSC1_RX_ADDR << 16);
|
||||
break;
|
||||
case 2:
|
||||
tfsize = FIFOC_PSC2_TX_SIZE | (FIFOC_PSC2_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC2_RX_SIZE | (FIFOC_PSC2_RX_ADDR << 16);
|
||||
break;
|
||||
case 3:
|
||||
tfsize = FIFOC_PSC3_TX_SIZE | (FIFOC_PSC3_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC3_RX_SIZE | (FIFOC_PSC3_RX_ADDR << 16);
|
||||
break;
|
||||
case 4:
|
||||
tfsize = FIFOC_PSC4_TX_SIZE | (FIFOC_PSC4_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC4_RX_SIZE | (FIFOC_PSC4_RX_ADDR << 16);
|
||||
break;
|
||||
case 5:
|
||||
tfsize = FIFOC_PSC5_TX_SIZE | (FIFOC_PSC5_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC5_RX_SIZE | (FIFOC_PSC5_RX_ADDR << 16);
|
||||
break;
|
||||
case 6:
|
||||
tfsize = FIFOC_PSC6_TX_SIZE | (FIFOC_PSC6_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC6_RX_SIZE | (FIFOC_PSC6_RX_ADDR << 16);
|
||||
break;
|
||||
case 7:
|
||||
tfsize = FIFOC_PSC7_TX_SIZE | (FIFOC_PSC7_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC7_RX_SIZE | (FIFOC_PSC7_RX_ADDR << 16);
|
||||
break;
|
||||
case 8:
|
||||
tfsize = FIFOC_PSC8_TX_SIZE | (FIFOC_PSC8_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC8_RX_SIZE | (FIFOC_PSC8_RX_ADDR << 16);
|
||||
break;
|
||||
case 9:
|
||||
tfsize = FIFOC_PSC9_TX_SIZE | (FIFOC_PSC9_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC9_RX_SIZE | (FIFOC_PSC9_RX_ADDR << 16);
|
||||
break;
|
||||
case 10:
|
||||
tfsize = FIFOC_PSC10_TX_SIZE | (FIFOC_PSC10_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC10_RX_SIZE | (FIFOC_PSC10_RX_ADDR << 16);
|
||||
break;
|
||||
case 11:
|
||||
tfsize = FIFOC_PSC11_TX_SIZE | (FIFOC_PSC11_TX_ADDR << 16);
|
||||
rfsize = FIFOC_PSC11_RX_SIZE | (FIFOC_PSC11_RX_ADDR << 16);
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
#else
|
||||
tfsize = CONSOLE_FIFO_TX_SIZE | (CONSOLE_FIFO_TX_ADDR << 16);
|
||||
rfsize = CONSOLE_FIFO_RX_SIZE | (CONSOLE_FIFO_RX_ADDR << 16);
|
||||
#endif
|
||||
out_be32(&psc->tfsize, tfsize);
|
||||
out_be32(&psc->rfsize, rfsize);
|
||||
|
||||
/* enable Tx & Rx FIFO slice */
|
||||
out_be32(&psc->rfcmd, PSC_FIFO_ENABLE_SLICE);
|
||||
|
|
@ -60,24 +119,47 @@ static void fifo_init (volatile psc512x_t *psc)
|
|||
__asm__ volatile ("sync");
|
||||
}
|
||||
|
||||
void serial_setbrg(void)
|
||||
void serial_setbrg_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
unsigned long baseclk, div;
|
||||
unsigned long baudrate;
|
||||
char buf[16];
|
||||
char *br_env;
|
||||
|
||||
/* calculate dividor for setting PSC CTUR and CTLR registers */
|
||||
baudrate = gd->baudrate;
|
||||
if (idx != CONFIG_PSC_CONSOLE) {
|
||||
/* Allows setting baudrate for other serial devices
|
||||
* on PSCx using environment. If not specified, use
|
||||
* the same baudrate as for console.
|
||||
*/
|
||||
sprintf(buf, "psc%d_baudrate", idx);
|
||||
br_env = getenv(buf);
|
||||
if (br_env)
|
||||
baudrate = simple_strtoul(br_env, NULL, 10);
|
||||
|
||||
debug("%s: idx %d, baudrate %d\n", __func__, idx, baudrate);
|
||||
}
|
||||
|
||||
/* calculate divisor for setting PSC CTUR and CTLR registers */
|
||||
baseclk = (gd->ips_clk + 8) / 16;
|
||||
div = (baseclk + (gd->baudrate / 2)) / gd->baudrate;
|
||||
div = (baseclk + (baudrate / 2)) / baudrate;
|
||||
|
||||
out_8(&psc->ctur, (div >> 8) & 0xff);
|
||||
out_8(&psc->ctlr, div & 0xff); /* set baudrate */
|
||||
}
|
||||
|
||||
int serial_init(void)
|
||||
int serial_init_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
#if defined(CONFIG_SERIAL_MULTI)
|
||||
u32 reg;
|
||||
|
||||
reg = in_be32(&im->clk.sccr[0]);
|
||||
out_be32(&im->clk.sccr[0], reg | CLOCK_SCCR1_PSC_EN(idx));
|
||||
#endif
|
||||
|
||||
fifo_init (psc);
|
||||
|
||||
|
|
@ -100,7 +182,7 @@ int serial_init(void)
|
|||
out_8(&psc->mode, PSC_MODE_1_STOPBIT);
|
||||
|
||||
/* set baudrate */
|
||||
serial_setbrg();
|
||||
serial_setbrg_dev(idx);
|
||||
|
||||
/* disable all interrupts */
|
||||
out_be16(&psc->psc_imr, 0);
|
||||
|
|
@ -113,13 +195,27 @@ int serial_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void serial_putc (const char c)
|
||||
int serial_uninit_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
u32 reg;
|
||||
|
||||
out_8(&psc->command, PSC_RX_DISABLE | PSC_TX_DISABLE);
|
||||
reg = in_be32(&im->clk.sccr[0]);
|
||||
reg &= ~CLOCK_SCCR1_PSC_EN(idx);
|
||||
out_be32(&im->clk.sccr[0], reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void serial_putc_dev(unsigned int idx, const char c)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
if (c == '\n')
|
||||
serial_putc ('\r');
|
||||
serial_putc_dev(idx, '\r');
|
||||
|
||||
/* Wait for last character to go. */
|
||||
while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP))
|
||||
|
|
@ -128,10 +224,10 @@ void serial_putc (const char c)
|
|||
out_8(&psc->tfdata_8, c);
|
||||
}
|
||||
|
||||
void serial_putc_raw (const char c)
|
||||
void serial_putc_raw_dev(unsigned int idx, const char c)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
/* Wait for last character to go. */
|
||||
while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP))
|
||||
|
|
@ -140,18 +236,16 @@ void serial_putc_raw (const char c)
|
|||
out_8(&psc->tfdata_8, c);
|
||||
}
|
||||
|
||||
|
||||
void serial_puts (const char *s)
|
||||
void serial_puts_dev(unsigned int idx, const char *s)
|
||||
{
|
||||
while (*s) {
|
||||
serial_putc (*s++);
|
||||
}
|
||||
while (*s)
|
||||
serial_putc_dev(idx, *s++);
|
||||
}
|
||||
|
||||
int serial_getc (void)
|
||||
int serial_getc_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
/* Wait for a character to arrive. */
|
||||
while (in_be32(&psc->rfstat) & PSC_FIFO_EMPTY)
|
||||
|
|
@ -160,18 +254,18 @@ int serial_getc (void)
|
|||
return in_8(&psc->rfdata_8);
|
||||
}
|
||||
|
||||
int serial_tstc (void)
|
||||
int serial_tstc_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
return !(in_be32(&psc->rfstat) & PSC_FIFO_EMPTY);
|
||||
}
|
||||
|
||||
void serial_setrts(int s)
|
||||
void serial_setrts_dev(unsigned int idx, int s)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
if (s) {
|
||||
/* Assert RTS (become LOW) */
|
||||
|
|
@ -183,11 +277,127 @@ void serial_setrts(int s)
|
|||
}
|
||||
}
|
||||
|
||||
int serial_getcts(void)
|
||||
int serial_getcts_dev(unsigned int idx)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
|
||||
volatile psc512x_t *psc = (psc512x_t *) &im->psc[idx];
|
||||
|
||||
return (in_8(&psc->ip) & 0x1) ? 0 : 1;
|
||||
}
|
||||
#endif /* CONFIG_PSC_CONSOLE || CONFIG_SERIAL_MULTI */
|
||||
|
||||
#if defined(CONFIG_SERIAL_MULTI)
|
||||
|
||||
#define DECLARE_PSC_SERIAL_FUNCTIONS(port) \
|
||||
int serial##port##_init(void) \
|
||||
{ \
|
||||
return serial_init_dev(port); \
|
||||
} \
|
||||
int serial##port##_uninit(void) \
|
||||
{ \
|
||||
return serial_uninit_dev(port); \
|
||||
} \
|
||||
void serial##port##_setbrg(void) \
|
||||
{ \
|
||||
serial_setbrg_dev(port); \
|
||||
} \
|
||||
int serial##port##_getc(void) \
|
||||
{ \
|
||||
return serial_getc_dev(port); \
|
||||
} \
|
||||
int serial##port##_tstc(void) \
|
||||
{ \
|
||||
return serial_tstc_dev(port); \
|
||||
} \
|
||||
void serial##port##_putc(const char c) \
|
||||
{ \
|
||||
serial_putc_dev(port, c); \
|
||||
} \
|
||||
void serial##port##_puts(const char *s) \
|
||||
{ \
|
||||
serial_puts_dev(port, s); \
|
||||
}
|
||||
|
||||
#define INIT_PSC_SERIAL_STRUCTURE(port, name, bus) { \
|
||||
name, \
|
||||
bus, \
|
||||
serial##port##_init, \
|
||||
serial##port##_uninit, \
|
||||
serial##port##_setbrg, \
|
||||
serial##port##_getc, \
|
||||
serial##port##_tstc, \
|
||||
serial##port##_putc, \
|
||||
serial##port##_puts, \
|
||||
}
|
||||
|
||||
#if defined(CONFIG_SYS_PSC1)
|
||||
DECLARE_PSC_SERIAL_FUNCTIONS(1);
|
||||
struct serial_device serial1_device =
|
||||
INIT_PSC_SERIAL_STRUCTURE(1, "psc1", "UART1");
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SYS_PSC3)
|
||||
DECLARE_PSC_SERIAL_FUNCTIONS(3);
|
||||
struct serial_device serial3_device =
|
||||
INIT_PSC_SERIAL_STRUCTURE(3, "psc3", "UART3");
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SYS_PSC4)
|
||||
DECLARE_PSC_SERIAL_FUNCTIONS(4);
|
||||
struct serial_device serial4_device =
|
||||
INIT_PSC_SERIAL_STRUCTURE(4, "psc4", "UART4");
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SYS_PSC6)
|
||||
DECLARE_PSC_SERIAL_FUNCTIONS(6);
|
||||
struct serial_device serial6_device =
|
||||
INIT_PSC_SERIAL_STRUCTURE(6, "psc6", "UART6");
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
void serial_setbrg(void)
|
||||
{
|
||||
serial_setbrg_dev(CONFIG_PSC_CONSOLE);
|
||||
}
|
||||
|
||||
int serial_init(void)
|
||||
{
|
||||
return serial_init_dev(CONFIG_PSC_CONSOLE);
|
||||
}
|
||||
|
||||
void serial_putc(const char c)
|
||||
{
|
||||
serial_putc_dev(CONFIG_PSC_CONSOLE, c);
|
||||
}
|
||||
|
||||
void serial_putc_raw(const char c)
|
||||
{
|
||||
serial_putc_raw_dev(CONFIG_PSC_CONSOLE, c);
|
||||
}
|
||||
|
||||
void serial_puts(const char *s)
|
||||
{
|
||||
serial_puts_dev(CONFIG_PSC_CONSOLE, s);
|
||||
}
|
||||
|
||||
int serial_getc(void)
|
||||
{
|
||||
return serial_getc_dev(CONFIG_PSC_CONSOLE);
|
||||
}
|
||||
|
||||
int serial_tstc(void)
|
||||
{
|
||||
return serial_tstc_dev(CONFIG_PSC_CONSOLE);
|
||||
}
|
||||
|
||||
void serial_setrts(int s)
|
||||
{
|
||||
return serial_setrts_dev(CONFIG_PSC_CONSOLE, s);
|
||||
}
|
||||
|
||||
int serial_getcts(void)
|
||||
{
|
||||
return serial_getcts_dev(CONFIG_PSC_CONSOLE);
|
||||
}
|
||||
#endif /* CONFIG_PSC_CONSOLE */
|
||||
|
|
|
|||
|
|
@ -1116,66 +1116,68 @@ typedef struct fifoc512x {
|
|||
*
|
||||
* Overall size of FIFOC memory is not documented in the MPC5121e RM, but
|
||||
* tests indicate that it is 1024 words total.
|
||||
*
|
||||
* *_TX_SIZE and *_RX_SIZE is the number of 4-byte words for FIFO slice.
|
||||
*/
|
||||
#define FIFOC_PSC0_TX_SIZE 0x0 /* number of 4-byte words for FIFO slice */
|
||||
#define FIFOC_PSC0_TX_SIZE 0x04
|
||||
#define FIFOC_PSC0_TX_ADDR 0x0
|
||||
#define FIFOC_PSC0_RX_SIZE 0x0
|
||||
#define FIFOC_PSC0_RX_ADDR 0x0
|
||||
#define FIFOC_PSC0_RX_SIZE 0x04
|
||||
#define FIFOC_PSC0_RX_ADDR 0x10
|
||||
|
||||
#define FIFOC_PSC1_TX_SIZE 0x0
|
||||
#define FIFOC_PSC1_TX_ADDR 0x0
|
||||
#define FIFOC_PSC1_RX_SIZE 0x0
|
||||
#define FIFOC_PSC1_RX_ADDR 0x0
|
||||
#define FIFOC_PSC1_TX_SIZE 0x04
|
||||
#define FIFOC_PSC1_TX_ADDR 0x20
|
||||
#define FIFOC_PSC1_RX_SIZE 0x04
|
||||
#define FIFOC_PSC1_RX_ADDR 0x30
|
||||
|
||||
#define FIFOC_PSC2_TX_SIZE 0x0
|
||||
#define FIFOC_PSC2_TX_ADDR 0x0
|
||||
#define FIFOC_PSC2_RX_SIZE 0x0
|
||||
#define FIFOC_PSC2_RX_ADDR 0x0
|
||||
#define FIFOC_PSC2_TX_SIZE 0x04
|
||||
#define FIFOC_PSC2_TX_ADDR 0x40
|
||||
#define FIFOC_PSC2_RX_SIZE 0x04
|
||||
#define FIFOC_PSC2_RX_ADDR 0x50
|
||||
|
||||
#define FIFOC_PSC3_TX_SIZE 0x04
|
||||
#define FIFOC_PSC3_TX_ADDR 0x0
|
||||
#define FIFOC_PSC3_TX_ADDR 0x60
|
||||
#define FIFOC_PSC3_RX_SIZE 0x04
|
||||
#define FIFOC_PSC3_RX_ADDR 0x10
|
||||
#define FIFOC_PSC3_RX_ADDR 0x70
|
||||
|
||||
#define FIFOC_PSC4_TX_SIZE 0x0
|
||||
#define FIFOC_PSC4_TX_ADDR 0x0
|
||||
#define FIFOC_PSC4_RX_SIZE 0x0
|
||||
#define FIFOC_PSC4_RX_ADDR 0x0
|
||||
#define FIFOC_PSC4_TX_SIZE 0x04
|
||||
#define FIFOC_PSC4_TX_ADDR 0x80
|
||||
#define FIFOC_PSC4_RX_SIZE 0x04
|
||||
#define FIFOC_PSC4_RX_ADDR 0x90
|
||||
|
||||
#define FIFOC_PSC5_TX_SIZE 0x0
|
||||
#define FIFOC_PSC5_TX_ADDR 0x0
|
||||
#define FIFOC_PSC5_RX_SIZE 0x0
|
||||
#define FIFOC_PSC5_RX_ADDR 0x0
|
||||
#define FIFOC_PSC5_TX_SIZE 0x04
|
||||
#define FIFOC_PSC5_TX_ADDR 0xa0
|
||||
#define FIFOC_PSC5_RX_SIZE 0x04
|
||||
#define FIFOC_PSC5_RX_ADDR 0xb0
|
||||
|
||||
#define FIFOC_PSC6_TX_SIZE 0x0
|
||||
#define FIFOC_PSC6_TX_ADDR 0x0
|
||||
#define FIFOC_PSC6_RX_SIZE 0x0
|
||||
#define FIFOC_PSC6_RX_ADDR 0x0
|
||||
#define FIFOC_PSC6_TX_SIZE 0x04
|
||||
#define FIFOC_PSC6_TX_ADDR 0xc0
|
||||
#define FIFOC_PSC6_RX_SIZE 0x04
|
||||
#define FIFOC_PSC6_RX_ADDR 0xd0
|
||||
|
||||
#define FIFOC_PSC7_TX_SIZE 0x0
|
||||
#define FIFOC_PSC7_TX_ADDR 0x0
|
||||
#define FIFOC_PSC7_RX_SIZE 0x0
|
||||
#define FIFOC_PSC7_RX_ADDR 0x0
|
||||
#define FIFOC_PSC7_TX_SIZE 0x04
|
||||
#define FIFOC_PSC7_TX_ADDR 0xe0
|
||||
#define FIFOC_PSC7_RX_SIZE 0x04
|
||||
#define FIFOC_PSC7_RX_ADDR 0xf0
|
||||
|
||||
#define FIFOC_PSC8_TX_SIZE 0x0
|
||||
#define FIFOC_PSC8_TX_ADDR 0x0
|
||||
#define FIFOC_PSC8_RX_SIZE 0x0
|
||||
#define FIFOC_PSC8_RX_ADDR 0x0
|
||||
#define FIFOC_PSC8_TX_SIZE 0x04
|
||||
#define FIFOC_PSC8_TX_ADDR 0x100
|
||||
#define FIFOC_PSC8_RX_SIZE 0x04
|
||||
#define FIFOC_PSC8_RX_ADDR 0x110
|
||||
|
||||
#define FIFOC_PSC9_TX_SIZE 0x0
|
||||
#define FIFOC_PSC9_TX_ADDR 0x0
|
||||
#define FIFOC_PSC9_RX_SIZE 0x0
|
||||
#define FIFOC_PSC9_RX_ADDR 0x0
|
||||
#define FIFOC_PSC9_TX_SIZE 0x04
|
||||
#define FIFOC_PSC9_TX_ADDR 0x120
|
||||
#define FIFOC_PSC9_RX_SIZE 0x04
|
||||
#define FIFOC_PSC9_RX_ADDR 0x130
|
||||
|
||||
#define FIFOC_PSC10_TX_SIZE 0x0
|
||||
#define FIFOC_PSC10_TX_ADDR 0x0
|
||||
#define FIFOC_PSC10_RX_SIZE 0x0
|
||||
#define FIFOC_PSC10_RX_ADDR 0x0
|
||||
#define FIFOC_PSC10_TX_SIZE 0x04
|
||||
#define FIFOC_PSC10_TX_ADDR 0x140
|
||||
#define FIFOC_PSC10_RX_SIZE 0x04
|
||||
#define FIFOC_PSC10_RX_ADDR 0x150
|
||||
|
||||
#define FIFOC_PSC11_TX_SIZE 0x0
|
||||
#define FIFOC_PSC11_TX_ADDR 0x0
|
||||
#define FIFOC_PSC11_RX_SIZE 0x0
|
||||
#define FIFOC_PSC11_RX_ADDR 0x0
|
||||
#define FIFOC_PSC11_TX_SIZE 0x04
|
||||
#define FIFOC_PSC11_TX_ADDR 0x160
|
||||
#define FIFOC_PSC11_RX_SIZE 0x04
|
||||
#define FIFOC_PSC11_RX_ADDR 0x170
|
||||
|
||||
/*
|
||||
* SATA
|
||||
|
|
|
|||
|
|
@ -59,6 +59,14 @@ struct serial_device *__default_serial_console (void)
|
|||
#else
|
||||
return &serial0_device;
|
||||
#endif
|
||||
#elif defined(CONFIG_MPC512X)
|
||||
#if (CONFIG_PSC_CONSOLE == 3)
|
||||
return &serial3_device;
|
||||
#elif (CONFIG_PSC_CONSOLE == 6)
|
||||
return &serial6_device;
|
||||
#else
|
||||
#error "Bad CONFIG_PSC_CONSOLE."
|
||||
#endif
|
||||
#elif defined(CONFIG_S3C2410)
|
||||
#if defined(CONFIG_SERIAL1)
|
||||
return &s3c24xx_serial0_device;
|
||||
|
|
@ -158,6 +166,20 @@ void serial_initialize (void)
|
|||
serial_register(&s5pc1xx_serial1_device);
|
||||
serial_register(&s5pc1xx_serial2_device);
|
||||
serial_register(&s5pc1xx_serial3_device);
|
||||
#endif
|
||||
#if defined(CONFIG_MPC512X)
|
||||
#if defined(CONFIG_SYS_PSC1)
|
||||
serial_register(&serial1_device);
|
||||
#endif
|
||||
#if defined(CONFIG_SYS_PSC3)
|
||||
serial_register(&serial3_device);
|
||||
#endif
|
||||
#if defined(CONFIG_SYS_PSC4)
|
||||
serial_register(&serial4_device);
|
||||
#endif
|
||||
#if defined(CONFIG_SYS_PSC6)
|
||||
serial_register(&serial6_device);
|
||||
#endif
|
||||
#endif
|
||||
serial_assign (default_serial_console ()->name);
|
||||
}
|
||||
|
|
@ -174,6 +196,7 @@ void serial_stdio_init (void)
|
|||
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
|
||||
|
||||
dev.start = s->init;
|
||||
dev.stop = s->uninit;
|
||||
dev.putc = s->putc;
|
||||
dev.puts = s->puts;
|
||||
dev.getc = s->getc;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,13 @@ extern struct serial_device eserial4_device;
|
|||
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_MPC512X)
|
||||
extern struct serial_device serial1_device;
|
||||
extern struct serial_device serial3_device;
|
||||
extern struct serial_device serial4_device;
|
||||
extern struct serial_device serial6_device;
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_S3C2410)
|
||||
extern struct serial_device s3c24xx_serial0_device;
|
||||
extern struct serial_device s3c24xx_serial1_device;
|
||||
|
|
|
|||
Loading…
Reference in a new issue