From: Markus Klotzbuecher <mk@creamnet.de>
Date: Tue, 9 Jan 2007 13:57:11 +0000 (+0100)
Subject: SMC1 uses external CLK4 instead of BRG on spc1920
X-Git-Tag: v1.3.0-rc1~198^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8139567b60d678584b05f0718a681f2047c5e14f;p=u-boot

SMC1 uses external CLK4 instead of BRG on spc1920
---

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 ();
diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index f8909b1d1d..a836d82992 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -44,7 +44,7 @@
 #define CONFIG_BAUDRATE		19200
 
 /* use PLD CLK4 instead of brg */
-#undef CFG_SPC1920_SMC1_CLK4
+#define CFG_SPC1920_SMC1_CLK4
 
 #define CONFIG_8xx_OSCLK		10000000 /* 10 MHz oscillator on EXTCLK  */
 #define CONFIG_8xx_CPUCLK_DEFAULT	50000000