projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
arch
/
ppc
/
platforms
/
85xx
/
mpc8540_ads.c
diff --git
a/arch/ppc/platforms/85xx/mpc8540_ads.c
b/arch/ppc/platforms/85xx/mpc8540_ads.c
index
2eceb1e
..
408d64f
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/
arch/ppc/platforms/85xx/mpc8540_ads.c
@@
-162,14
+162,14
@@
platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
memset(&p, 0, sizeof (p));
binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
memset(&p, 0, sizeof (p));
- p.iotype =
SERIAL_
IO_MEM;
+ p.iotype =
UP
IO_MEM;
p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
p.uartclk = binfo->bi_busfreq;
gen550_init(0, &p);
memset(&p, 0, sizeof (p));
p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
p.uartclk = binfo->bi_busfreq;
gen550_init(0, &p);
memset(&p, 0, sizeof (p));
- p.iotype =
SERIAL_
IO_MEM;
+ p.iotype =
UP
IO_MEM;
p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
p.uartclk = binfo->bi_busfreq;
p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
p.uartclk = binfo->bi_busfreq;