phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Coding style cleanup, update CHANGELOG. 

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2010-05-26 23:51:22 +02:00
parent 45b728cdee
commit c4976807cb
3 changed files with 4057 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4045
CHANGELOG
View File

File diff suppressed because it is too large Load Diff

3
arch/i386/include/asm/bootparam.h
View File

@ -117,7 +117,4 @@ enum {
X86_SUBARCH_MRST, X86_SUBARCH_MRST,
X86_NR_SUBARCHS, X86_NR_SUBARCHS,
}; };
#endif /* _ASM_X86_BOOTPARAM_H */ #endif /* _ASM_X86_BOOTPARAM_H */

22
drivers/serial/opencores_yanu.c
View File

@ -69,7 +69,7 @@ void serial_setbrg (void)
#else #else
void serial_setbrg (void) void serial_setbrg (void)
{ {
int n, k; int n, k;
const unsigned max_uns = 0xFFFFFFFF; const unsigned max_uns = 0xFFFFFFFF;
unsigned best_n, best_m, baud; unsigned best_n, best_m, baud;
@ -114,12 +114,14 @@ int serial_init (void)
YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR; YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR;
writel(action, &uart->action); writel(action, &uart->action);
/* control register cleanup */ /*
/* no interrupts enabled */ * control register cleanup
/* one stop bit */ * no interrupts enabled
/* hardware flow control disabled */ * one stop bit
/* 8 bits */ * hardware flow control disabled
* 8 bits
*/
control = (0x7 << YANU_CONTROL_BITS_POS); control = (0x7 << YANU_CONTROL_BITS_POS);
/* enven parity just to be clean */ /* enven parity just to be clean */
control |= YANU_CONTROL_PAREVEN; control |= YANU_CONTROL_PAREVEN;
@ -146,7 +148,7 @@ void serial_putc (char c)
if (c == '\n') if (c == '\n')
serial_putc ('\r'); serial_putc ('\r');
while (1) { while (1) {
status = readl(&uart->status); status = readl(&uart->status);
tx_chars = (status>>YANU_TFIFO_CHARS_POS) tx_chars = (status>>YANU_TFIFO_CHARS_POS)
@ -174,13 +176,13 @@ int serial_tstc(void)
status = readl(&uart->status); status = readl(&uart->status);
return (((status >> YANU_RFIFO_CHARS_POS) & return (((status >> YANU_RFIFO_CHARS_POS) &
((1 << YANU_RFIFO_CHARS_N) - 1)) > 0); ((1 << YANU_RFIFO_CHARS_N) - 1)) > 0);
} }
int serial_getc (void) int serial_getc (void)
{ {
while (serial_tstc() == 0) while (serial_tstc() == 0)
WATCHDOG_RESET (); WATCHDOG_RESET ();
/* first we pull the char */ /* first we pull the char */
writel(YANU_ACTION_RFIFO_PULL, &uart->action); writel(YANU_ACTION_RFIFO_PULL, &uart->action);