summaryrefslogtreecommitdiff
path: root/cpu/mpc8xx
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-03-31 13:44:12 +0200
committerStefan Roese <sr@denx.de>2007-03-31 13:44:12 +0200
commit0e7d4916afaf83083b9b70ad779f29f7b57bd8ed (patch)
tree40e9396ee819149a89f520f551d1ed31cb8f5216 /cpu/mpc8xx
parentda6ebc1bc082cbe3b6bbde079cafe09f7ebbad4b (diff)
parent6db7d0af2336c126e4d4b2f248cc23516bdd46a8 (diff)
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mpc8xx')
-rw-r--r--cpu/mpc8xx/serial.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c
index 9d0fc6b4fa..ffc898c587 100644
--- a/cpu/mpc8xx/serial.c
+++ b/cpu/mpc8xx/serial.c
@@ -236,8 +236,7 @@ static int smc_init (void)
im->im_ioport.iop_pdpar |= 0x800;
im->im_ioport.iop_pddir &= ~0x800;
- cp->cp_simode = 0x0000;
- cp->cp_simode |= 0x7000;
+ cp->cp_simode = ((cp->cp_simode & ~0xf000) | 0x7000);
#else
/* Set up the baud rate generator */
smc_setbrg ();