summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-01-13 08:01:31 +0100
committerStefan Roese <sr@denx.de>2007-01-13 08:01:31 +0100
commit44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd (patch)
tree9eee07aed4b22b114a2527ab24594df4b1e3d451 /cpu
parent95981778cff0038fd9941044d6a3eda810e33258 (diff)
parent6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff)
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc8xx/serial.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c
index 8ae584f2e1..c8caa793d2 100644
--- a/cpu/mpc8xx/serial.c
+++ b/cpu/mpc8xx/serial.c
@@ -227,8 +227,17 @@ static int smc_init (void)
sp->smc_smcm = 0;
sp->smc_smce = 0xff;
-#ifdef CFG_SPC1920_SMC1_CLK4 /* clock source is PLD */
- *((volatile uchar *) CFG_SPC1920_PLD_BASE+6) = 0xff;
+#ifdef CFG_SPC1920_SMC1_CLK4
+ /* clock source is PLD */
+
+ /* set freq to 19200 Baud */
+ *((volatile uchar *) CFG_SPC1920_PLD_BASE+6) = 0x3;
+ /* configure clk4 as input */
+ im->im_ioport.iop_pdpar |= 0x800;
+ im->im_ioport.iop_pddir &= ~0x800;
+
+ cp->cp_simode = 0x0000;
+ cp->cp_simode |= 0x7000;
#else
/* Set up the baud rate generator */
smc_setbrg ();