Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[oweals/u-boot.git] / board / esd / pmc405 / pmc405.c
index 5c2e98c57e281e6a34871287acb5b56b982f5c8f..c0781dc950ef7b1815764d03660516778ece4f00 100644 (file)
@@ -1,6 +1,9 @@
 /*
  * (C) Copyright 2001-2003
- * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
+ * Stefan Roese, DENX Software Engineering, sr@denx.de.
+ *
+ * (C) Copyright 2005
+ * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
 #include <command.h>
 #include <malloc.h>
 
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
 
+extern void lxt971_no_sleep(void);
 
-/* Prototypes */
-int gunzip(void *, int, unsigned char *, int *);
+/* fpga configuration data - not compressed, generated by bin2c */
+const unsigned char fpgadata[] =
+{
+#include "fpgadata.c"
+};
+int filesize = sizeof(fpgadata);
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        /*
         * IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -60,169 +68,141 @@ int board_pre_init (void)
         */
        mtebc (epcr, 0xa8400000);
 
-       return 0;
-}
-
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-       return 0;  /* dummy implementation */
-}
-
-
-int misc_init_r (void)
-{
-#if 0 /* test-only */
-       DECLARE_GLOBAL_DATA_PTR;
-       volatile unsigned short *fpga_mode =
-               (unsigned short *)((ulong)CFG_FPGA_BASE_ADDR + CFG_FPGA_CTRL);
-       volatile unsigned char *duart0_mcr =
-               (unsigned char *)((ulong)DUART0_BA + 4);
-       volatile unsigned char *duart1_mcr =
-               (unsigned char *)((ulong)DUART1_BA + 4);
-       bd_t *bd = gd->bd;
-       char *  tmp;                    /* Temporary char pointer      */
-       unsigned char *dst;
-       ulong len = sizeof(fpgadata);
-       int status;
-       int index;
-       int i;
-       unsigned long cntrl0Reg;
-
        /*
-        * Setup GPIO pins (CS6+CS7 as GPIO)
+        * Setup GPIO pins
         */
-       cntrl0Reg = mfdcr(cntrl0);
-       mtdcr(cntrl0, cntrl0Reg | 0x00300000);
 
-       dst = malloc(CFG_FPGA_MAX_SIZE);
-       if (gunzip (dst, CFG_FPGA_MAX_SIZE, (uchar *)fpgadata, (int *)&len) != 0) {
-               printf ("GUNZIP ERROR - must RESET board to recover\n");
-               do_reset (NULL, 0, 0, NULL);
-       }
-
-       status = fpga_boot(dst, len);
-       if (status != 0) {
-               printf("\nFPGA: Booting failed ");
-               switch (status) {
-               case ERROR_FPGA_PRG_INIT_LOW:
-                       printf("(Timeout: INIT not low after asserting PROGRAM*)\n ");
-                       break;
-               case ERROR_FPGA_PRG_INIT_HIGH:
-                       printf("(Timeout: INIT not high after deasserting PROGRAM*)\n ");
-                       break;
-               case ERROR_FPGA_PRG_DONE:
-                       printf("(Timeout: DONE not high after programming FPGA)\n ");
-                       break;
-               }
+       mtdcr(cntrl0, mfdcr(cntrl0) | ((CONFIG_SYS_FPGA_INIT | \
+                                       CONFIG_SYS_FPGA_DONE | \
+                                       CONFIG_SYS_XEREADY | \
+                                       CONFIG_SYS_NONMONARCH | \
+                                       CONFIG_SYS_REV1_2) << 5));
 
-               /* display infos on fpgaimage */
-               index = 15;
-               for (i=0; i<4; i++) {
-                       len = dst[index];
-                       printf("FPGA: %s\n", &(dst[index+1]));
-                       index += len+3;
-               }
-               putc ('\n');
-               /* delayed reboot */
-               for (i=20; i>0; i--) {
-                       printf("Rebooting in %2d seconds \r",i);
-                       for (index=0;index<1000;index++)
-                               udelay(1000);
-               }
-               putc ('\n');
-               do_reset(NULL, 0, 0, NULL);
+       if (!(in32(GPIO0_IR) & CONFIG_SYS_REV1_2)) {
+               /* rev 1.2 boards */
+               mtdcr(cntrl0, mfdcr(cntrl0) | ((CONFIG_SYS_INTA_FAKE | \
+                                               CONFIG_SYS_SELF_RST) << 5));
        }
 
-       /* restore gpio/cs settings */
-       mtdcr(cntrl0, cntrl0Reg);
+       out32(GPIO0_OR, 0);
+       out32(GPIO0_TCR, CONFIG_SYS_FPGA_PRG | CONFIG_SYS_FPGA_CLK | CONFIG_SYS_FPGA_DATA | CONFIG_SYS_XEREADY); /* setup for output */
 
-       puts("FPGA:  ");
+       /* - check if rev1_2 is low, then:
+        * - set/reset CONFIG_SYS_INTA_FAKE/CONFIG_SYS_SELF_RST in TCR to assert INTA# or SELFRST#
+        */
 
-       /* display infos on fpgaimage */
-       index = 15;
-       for (i=0; i<4; i++) {
-               len = dst[index];
-               printf("%s ", &(dst[index+1]));
-               index += len+3;
-       }
-       putc ('\n');
+       return 0;
+}
 
-       free(dst);
 
-       /*
-        * Reset FPGA via FPGA_DATA pin
-        */
-       SET_FPGA(FPGA_PRG | FPGA_CLK);
-       udelay(1000); /* wait 1ms */
-       SET_FPGA(FPGA_PRG | FPGA_CLK | FPGA_DATA);
-       udelay(1000); /* wait 1ms */
+/* ------------------------------------------------------------------------- */
 
-       /*
-        * Enable power on PS/2 interface
-        */
-       *fpga_mode |= CFG_FPGA_CTRL_PS2_RESET;
 
-       /*
-        * Enable interrupts in exar duart mcr[3]
-        */
-       *duart0_mcr = 0x08;
-       *duart1_mcr = 0x08;
-#endif
+int misc_init_r (void)
+{
+       /* adjust flash start and offset */
+       gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
+       gd->bd->bi_flashoffset = 0;
 
+       out32(GPIO0_OR, in32(GPIO0_OR) | CONFIG_SYS_XEREADY); /* deassert EREADY# */
        return (0);
 }
 
+ushort pmc405_pci_subsys_deviceid(void)
+{
+       ulong val;
+       val = in32(GPIO0_IR);
+       if (!(val & CONFIG_SYS_REV1_2)) { /* low=rev1.2 */
+               if (val & CONFIG_SYS_NONMONARCH) { /* monarch# signal */
+                       return CONFIG_SYS_PCI_SUBSYS_DEVICEID_NONMONARCH;
+               }
+               return CONFIG_SYS_PCI_SUBSYS_DEVICEID_MONARCH;
+       }
+       return CONFIG_SYS_PCI_SUBSYS_DEVICEID_NONMONARCH;
+}
 
 /*
  * Check Board Identity:
  */
-
 int checkboard (void)
 {
-       unsigned char str[64];
+       ulong val;
+
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof(str));
 
        puts ("Board: ");
 
        if (i == -1) {
-               puts ("### No HW ID - assuming ABG405");
+               puts ("### No HW ID - assuming PMC405");
        } else {
                puts(str);
        }
 
+       val = in32(GPIO0_IR);
+       if (!(val & CONFIG_SYS_REV1_2)) { /* low=rev1.2 */
+               puts(" rev1.2 (");
+               if (val & CONFIG_SYS_NONMONARCH) { /* monarch# signal */
+                       puts("non-");
+               }
+               puts("monarch)");
+       } else {
+               puts(" <=rev1.1");
+       }
+
        putc ('\n');
 
        return 0;
 }
 
 /* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
+void reset_phy(void)
 {
-       unsigned long val;
-
-       mtdcr(memcfga, mem_mb0cf);
-       val = mfdcr(memcfgd);
+#ifdef CONFIG_LXT971_NO_SLEEP
 
-#if 0
-       printf("\nmb0cf=%x\n", val); /* test-only */
-       printf("strap=%x\n", mfdcr(strap)); /* test-only */
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
 #endif
-
-       return (4*1024*1024 << ((val & 0x000e0000) >> 17));
 }
 
-/* ------------------------------------------------------------------------- */
 
-int testdram (void)
+int do_cantest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
+       ulong addr;
+       volatile uchar *ptr;
+       volatile uchar val;
+       int i;
 
-       return (0);
-}
+       addr = simple_strtol (argv[1], NULL, 16) + 0x16;
 
-/* ------------------------------------------------------------------------- */
+       i = 0;
+       for (;;) {
+               ptr = (uchar *)addr;
+               for (i=0; i<8; i++) {
+                       *ptr = i;
+                       val = *ptr;
+
+                       if (val != i) {
+                               printf("ERROR: addr=%p write=0x%02X, read=0x%02X\n", ptr, i, val);
+                               return 0;
+                       }
+
+                       /* Abort if ctrl-c was pressed */
+                       if (ctrlc()) {
+                               puts("\nAbort\n");
+                               return 0;
+                       }
+
+                       ptr++;
+               }
+       }
+
+       return 0;
+}
+U_BOOT_CMD(
+       cantest,        3,      1,      do_cantest,
+       "cantest - Test CAN controller",
+       NULL
+       );