[Linux-mips-commits]CVS: linux/arch/mips/philips/nino TODO,NONE,1.1 power.c,1.4,1.5 Makefile,1.7,1.8 prom.c,1.5,1.6 setup.c,1.6,1.7 time.c,1.6,NONE

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/philips/nino
In directory usw-pr-cvs1:/tmp/cvs-serv26774/arch/mips/philips/nino

Modified Files:
	Makefile prom.c setup.c 
Added Files:
	TODO power.c 
Removed Files:
	time.c 
Log Message:
Nino updates.

--- NEW FILE: TODO ---
This is a basic TODO list for the Philips Nino porting effort. Things
will be added and removed from time to time. Pick an item and help
me out! Thanks!

- COMPACTFLASH
  * get IDE/PCMCIA chip interface working to read flash cards and the
    ethernet card
- FRAMEBUFFER
  * complete rewrite to match new framebuffer API
  * get 2bpp and 4bpp working (use Microwindows driver examples)
- GPIO
  * go through all the interrupt sources in status registers 1-5
    and see what all the different IO pins are hooked to
- KGDB
  * get stub working
- SERIAL
  * complete rewrite and use only one interrupt instead of two


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/philips/nino/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	2001/11/04 19:20:38	1.7
+++ Makefile	2001/11/13 17:10:09	1.8
@@ -15,12 +15,9 @@
 
 all: nino.o
 
-obj-y	 := int-handler.o irq.o setup.o		\
-	    prom.o power.o time.o
+obj-y	 := int-handler.o irq.o setup.o prom.o power.o
 
 int-handler.o: int-handler.S
-
-obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb.o
 
 clean:
 		rm -f *.o

Index: prom.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/philips/nino/prom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prom.c	2001/11/06 20:23:54	1.5
+++ prom.c	2001/11/13 17:10:09	1.6
@@ -30,7 +30,6 @@
 		unsigned long magic, int *prom_vec)
 {
 	unsigned long mem_size;
-	unsigned int i;
 
 	strcpy(arcs_cmdline, "console=tty0 console=ttyS0,115200");
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/philips/nino/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- setup.c	2001/11/06 20:23:54	1.6
+++ setup.c	2001/11/13 17:10:09	1.7
@@ -9,6 +9,7 @@
  *
  *  Interrupt and exception initialization for Philips Nino
  */
+#include <linux/console.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -46,15 +47,17 @@
 
 static __init void nino_time_init(void)
 {
-	unsigned int scratch = 0;
+	/* Load the counter and enable the timer */
+	outl(TX3912_SYS_TIMER_VALUE, TX3912_TIMER_PERIOD);
+	outl(TX3912_TIMER_CTRL_ENPERTIMER, TX3912_TIMER_CTRL);
 
-	RTCperiodTimer = PER_TIMER_COUNT;
-	RTCtimerControl = TIM_ENPERTIMER;
-	IntEnable5 |= INT5_PERIODICINT;
+	/* Enable the timer clock line */
+	outl(inl(TX3912_CLK_CTRL) | TX3912_CLK_CTRL_ENTIMERCLK,
+		TX3912_CLK_CTRL);
 
-	scratch = inl(TX3912_CLK_CTRL_BASE);
-	scratch |= TX3912_CLK_CTRL_ENTIMERCLK;
-	outl(scratch, TX3912_CLK_CTRL_BASE);
+	/* Enable the interrupt */
+	outl(inl(TX3912_INT5_ENABLE) | TX3912_INT5_PERINT,
+		TX3912_INT5_ENABLE);
 }
 
 static __init void nino_timer_setup(struct irqaction *irq)
@@ -79,6 +82,10 @@
 	board_timer_setup = nino_timer_setup;
 
 	cpu_wait = nino_wait;
+
+#ifdef CONFIG_FB
+	conswitchp = &dummy_con;
+#endif
 
 	nino_board_init();
 }

--- time.c DELETED ---