projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OMAP3: Print correct silicon revision
[oweals/u-boot.git]
/
cpu
/
mpc512x
/
serial.c
diff --git
a/cpu/mpc512x/serial.c
b/cpu/mpc512x/serial.c
index 200ff2c49646a8793cc598c5ac3651dd30cfc024..7db87a80a1a0a6d4caf1e82e35a881f84d571292 100644
(file)
--- a/
cpu/mpc512x/serial.c
+++ b/
cpu/mpc512x/serial.c
@@
-37,7
+37,7
@@
DECLARE_GLOBAL_DATA_PTR;
static void fifo_init (volatile psc512x_t *psc)
{
static void fifo_init (volatile psc512x_t *psc)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
/* reset Rx & Tx fifo slice */
psc->rfcmd = PSC_FIFO_RESET_SLICE;
/* reset Rx & Tx fifo slice */
psc->rfcmd = PSC_FIFO_RESET_SLICE;
@@
-60,7
+60,7
@@
static void fifo_init (volatile psc512x_t *psc)
int serial_init(void)
{
int serial_init(void)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
unsigned long baseclk;
int div;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
unsigned long baseclk;
int div;
@@
-86,7
+86,7
@@
int serial_init(void)
psc->mode = PSC_MODE_1_STOPBIT;
/* calculate dividor for setting PSC CTUR and CTLR registers */
psc->mode = PSC_MODE_1_STOPBIT;
/* calculate dividor for setting PSC CTUR and CTLR registers */
- baseclk = (gd->ip
b
_clk + 8) / 16;
+ baseclk = (gd->ip
s
_clk + 8) / 16;
div = (baseclk + (gd->baudrate / 2)) / gd->baudrate;
psc->ctur = (div >> 8) & 0xff;
div = (baseclk + (gd->baudrate / 2)) / gd->baudrate;
psc->ctur = (div >> 8) & 0xff;
@@
-106,7
+106,7
@@
int serial_init(void)
void serial_putc (const char c)
{
void serial_putc (const char c)
{
- volatile immap_t *im = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *)C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
if (c == '\n')
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
if (c == '\n')
@@
-121,7
+121,7
@@
void serial_putc (const char c)
void serial_putc_raw (const char c)
{
void serial_putc_raw (const char c)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
/* Wait for last character to go. */
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
/* Wait for last character to go. */
@@
-141,7
+141,7
@@
void serial_puts (const char *s)
int serial_getc (void)
{
int serial_getc (void)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
/* Wait for a character to arrive. */
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
/* Wait for a character to arrive. */
@@
-153,7
+153,7
@@
int serial_getc (void)
int serial_tstc (void)
{
int serial_tstc (void)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
return !(psc->rfstat & PSC_FIFO_EMPTY);
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
return !(psc->rfstat & PSC_FIFO_EMPTY);
@@
-161,7
+161,7
@@
int serial_tstc (void)
void serial_setbrg (void)
{
void serial_setbrg (void)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
unsigned long baseclk, div;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
unsigned long baseclk, div;
@@
-174,7
+174,7
@@
void serial_setbrg (void)
void serial_setrts(int s)
{
void serial_setrts(int s)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
if (s) {
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
if (s) {
@@
-189,7
+189,7
@@
void serial_setrts(int s)
int serial_getcts(void)
{
int serial_getcts(void)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
return (psc->ip & 0x1) ? 0 : 1;
volatile psc512x_t *psc = (psc512x_t *) &im->psc[CONFIG_PSC_CONSOLE];
return (psc->ip & 0x1) ? 0 : 1;