ppc4xx: Add lcd4_lwmon5 support

[u-boot] / board / esd / ocrtc / ocrtc.c

diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c
index 3c3d56eb4fb54fc21592edf17b2898493b75ee6c..24c92e35a5d911571a28b0ae94af526757eb9701 100644 (file)
--- a/board/esd/ocrtc/ocrtc.c
+++ b/board/esd/ocrtc/ocrtc.c
@@ -26,11 +26,12 @@
 #include <asm/processor.h>
 #include <i2c.h>
 #include <command.h>
-#include <cmd_boot.h>
 
-/* ------------------------------------------------------------------------- */
 
-int board_pre_init (void)
+extern void lxt971_no_sleep(void);
+
+
+int board_early_init_f (void)
 {
        /*
         * IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -44,40 +45,30 @@ int board_pre_init (void)
         * IRQ 30 (EXT IRQ 5) PCI SLOT 3; active low; level sensitive
         * IRQ 31 (EXT IRQ 6) COMPACT FLASH; active high; level sensitive
         */
-       mtdcr (uicsr, 0xFFFFFFFF);      /* clear all ints */
-       mtdcr (uicer, 0x00000000);      /* disable all ints */
-       mtdcr (uiccr, 0x00000000);      /* set all to be non-critical */
-       mtdcr (uicpr, 0xFFFFFF81);      /* set int polarities */
-       mtdcr (uictr, 0x10000000);      /* set int trigger levels */
-       mtdcr (uicvcr, 0x00000001);     /* set vect base=0,INT0 highest priority */
-       mtdcr (uicsr, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr (UIC0SR, 0xFFFFFFFF);     /* clear all ints */
+       mtdcr (UIC0ER, 0x00000000);     /* disable all ints */
+       mtdcr (UIC0CR, 0x00000000);     /* set all to be non-critical */
+       mtdcr (UIC0PR, 0xFFFFFF81);     /* set int polarities */
+       mtdcr (UIC0TR, 0x10000000);     /* set int trigger levels */
+       mtdcr (UIC0VCR, 0x00000001);    /* set vect base=0,INT0 highest priority */
+       mtdcr (UIC0SR, 0xFFFFFFFF);     /* clear all ints */
 
        /*
         * EBC Configuration Register: clear EBTC -> high-Z ebc signals between
         * transfers, set device-paced timeout to 256 cycles
         */
-       mtebc (epcr, 0x20400000);
+       mtebc (EBC0_CFG, 0x20400000);
 
        return 0;
 }
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-       return 0;                                       /* dummy implementation */
-}
-
-
 /*
  * Check Board Identity:
  */
-
 int checkboard (void)
 {
-       unsigned char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       char str[64];
+       int i = getenv_f("serial#", str, sizeof (str));
 
        puts ("Board: ");
 
@@ -94,34 +85,10 @@ int checkboard (void)
 
        putc ('\n');
 
-       return (0);
-}
-
-/* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
-{
-       unsigned long val;
-
-       mtdcr (memcfga, mem_mb0cf);
-       val = mfdcr (memcfgd);
-
-#if 0
-       printf ("\nmb0cf=%x\n", val);   /* test-only */
-       printf ("strap=%x\n", mfdcr (strap));   /* test-only */
-#endif
-
-       return (4 * 1024 * 1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
 
        return (0);
 }
-
-/* ------------------------------------------------------------------------- */