summaryrefslogtreecommitdiff
path: root/cpu/mpc8xx/serial.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2007-01-10 15:34:43 +0100
committerWolfgang Denk <wd@denx.de>2007-01-10 15:34:43 +0100
commit2e615814352d520a363f76ca169a3275ee1e1ed0 (patch)
treeea54fcb665b59d54a4943925de7dfbf67596fda3 /cpu/mpc8xx/serial.c
parent787fa15860a57833e50bd30555079a9cd4e519b8 (diff)
parent67fea022fa957f59653b5238c7496f80a6b70432 (diff)
downloadu-boot-imx-2e615814352d520a363f76ca169a3275ee1e1ed0.zip
u-boot-imx-2e615814352d520a363f76ca169a3275ee1e1ed0.tar.gz
u-boot-imx-2e615814352d520a363f76ca169a3275ee1e1ed0.tar.bz2
Merge with /home/mk/11-cmb1920/u-boot#4upstream
Diffstat (limited to 'cpu/mpc8xx/serial.c')
-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 8ae584f..c8caa79 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 ();