From 5921e5313fc3eadd42770c2b99badd7fae5ecf1e Mon Sep 17 00:00:00 2001 From: Markus Klotzbuecher Date: Tue, 9 Jan 2007 14:57:13 +0100 Subject: Miscellanious spc1920 related cleanups --- board/spc1920/hpi.c | 1 - board/spc1920/spc1920.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'board/spc1920') diff --git a/board/spc1920/hpi.c b/board/spc1920/hpi.c index 687c170..05dd8bd 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 d0a6ff1..d69b915 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; -- cgit v1.1