Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

serial: opencores_yanu: Avoid duplicate oc_serial_setbrg() implementation

Browse source 
The implementation of oc_serial_setbrg() for CONFIG_SYS_NIOS_FIXEDBAUD and
!CONFIG_SYS_NIOS_FIXEDBAUD are very similar.
Add a baudrate variable and set it to either CONFIG_BAUDRATE or gd->baudrate.
Then we can unify the code for both cases.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
This commit is contained in:
Axel Lin 2014-01-16 15:03:52 +08:00 committed by Thomas Chou
parent 18a6bcc139
commit 2d61e1bed2
1 changed files with 14 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/serial/opencores_yanu.c
View file

@ -18,62 +18,34 @@ DECLARE_GLOBAL_DATA_PTR;
static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE; static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE;
static void oc_serial_setbrg(void)
{
int n, k;
const unsigned max_uns = 0xFFFFFFFF;
unsigned best_n, best_m, baud;
unsigned baudrate;
#if defined(CONFIG_SYS_NIOS_FIXEDBAUD) #if defined(CONFIG_SYS_NIOS_FIXEDBAUD)
/* Everything's already setup for fixed-baud PTF assignment */
/* Everything's already setup for fixed-baud PTF assignment*/ baudrate = CONFIG_BAUDRATE;
static void oc_serial_setbrg(void)
{
int n, k;
const unsigned max_uns = 0xFFFFFFFF;
unsigned best_n, best_m, baud;
/* compute best N and M couple */
best_n = YANU_MAX_PRESCALER_N;
for (n = YANU_MAX_PRESCALER_N; n >= 0; n--) {
if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n + 4)) >=
(unsigned)CONFIG_BAUDRATE) {
best_n = n;
break;
}
}
for (k = 0;; k++) {
if ((unsigned)CONFIG_BAUDRATE <= (max_uns >> (15+n-k)))
break;
}
best_m =
((unsigned)CONFIG_BAUDRATE * (1 << (15 + n - k))) /
((unsigned)CONFIG_SYS_CLK_FREQ >> k);
baud = best_m + best_n * YANU_BAUDE;
writel(baud, &uart->baud);
return;
}
#else #else
baudrate = gd->baudrate;
static void oc_serial_setbrg(void) #endif
{
int n, k;
const unsigned max_uns = 0xFFFFFFFF;
unsigned best_n, best_m, baud;
/* compute best N and M couple */ /* compute best N and M couple */
best_n = YANU_MAX_PRESCALER_N; best_n = YANU_MAX_PRESCALER_N;
for (n = YANU_MAX_PRESCALER_N; n >= 0; n--) { for (n = YANU_MAX_PRESCALER_N; n >= 0; n--) {
if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n + 4)) >= if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n + 4)) >=
gd->baudrate) { baudrate) {
best_n = n; best_n = n;
break; break;
} }
} }
for (k = 0;; k++) { for (k = 0;; k++) {
if (gd->baudrate <= (max_uns >> (15+n-k))) if (baudrate <= (max_uns >> (15+n-k)))
break; break;
} }
best_m = best_m =
(gd->baudrate * (1 << (15 + n - k))) / (baudrate * (1 << (15 + n - k))) /
((unsigned)CONFIG_SYS_CLK_FREQ >> k); ((unsigned)CONFIG_SYS_CLK_FREQ >> k);
baud = best_m + best_n * YANU_BAUDE; baud = best_m + best_n * YANU_BAUDE;
@ -82,9 +54,6 @@ static void oc_serial_setbrg(void)
return; return;
} }
#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */
static int oc_serial_init(void) static int oc_serial_init(void)
{ {
unsigned action,control; unsigned action,control;