summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@creamnet.de>2007-01-09 14:57:13 +0100
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-01-09 14:57:13 +0100
commit5921e5313fc3eadd42770c2b99badd7fae5ecf1e (patch)
treeaa9d40470e5b0d5f98561ff187f783280b3089d1 /board
parente4c2d37adc8bb1bf69dcf600cbc6c75f916a6120 (diff)
Miscellanious spc1920 related cleanups
Diffstat (limited to 'board')
-rw-r--r--board/spc1920/hpi.c1
-rw-r--r--board/spc1920/spc1920.c14
2 files changed, 12 insertions, 3 deletions
diff --git a/board/spc1920/hpi.c b/board/spc1920/hpi.c
index 687c170a85..05dd8bd5cb 100644
--- a/board/spc1920/hpi.c
+++ b/board/spc1920/hpi.c
@@ -40,7 +40,6 @@
#include "pld.h"
#include "hpi.h"
-#include "spc1920.h" /* led function */
#define _NOT_USED_ 0xFFFFFFFF
diff --git a/board/spc1920/spc1920.c b/board/spc1920/spc1920.c
index d0a6ff1eba..d69b915172 100644
--- a/board/spc1920/spc1920.c
+++ b/board/spc1920/spc1920.c
@@ -220,10 +220,20 @@ int board_early_init_f(void)
immap->im_ioport.iop_pdpar &= ~(0x0040);
immap->im_ioport.iop_pddir |= 0x0040;
immap->im_ioport.iop_pddat |= 0x0040;
-
#endif
- /* Enable PD10 (COM2_EN) */
+ /*
+ * Enable console on SMC1. This requires turning on
+ * the com2_en signal and SMC1_DISABLE
+ */
+
+ /* SMC1_DISABLE: PB17 */
+ immap->im_cpm.cp_pbodr &= ~0x4000;
+ immap->im_cpm.cp_pbpar &= ~0x4000;
+ immap->im_cpm.cp_pbdir |= 0x4000;
+ immap->im_cpm.cp_pbdat &= ~0x4000;
+
+ /* COM2_EN: PD10 */
immap->im_ioport.iop_pdpar &= ~0x0020;
immap->im_ioport.iop_pddir &= ~0x4000;
immap->im_ioport.iop_pddir |= 0x0020;