diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-22 13:15:35 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-22 13:15:35 +0800 |
| commit | ee460917afb74767aedc3da095d4fec4a50ba6f8 (patch) | |
| tree | fdead38c4681fc9adbedd6836792660f933614d3 /cpu/mpc8xx/serial.c | |
| parent | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff) | |
| parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
| download | u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.zip u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.gz u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.bz2 | |
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
Diffstat (limited to 'cpu/mpc8xx/serial.c')
| -rw-r--r-- | cpu/mpc8xx/serial.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c index 8ae584f..9d0fc6b 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 (); |