Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / video / sm501.c

diff --git a/drivers/video/sm501.c b/drivers/video/sm501.c
index 8c963162db8d93545ab16eded13efe4270d4a32b..42ac6805670771c02a66605cd3cd575b854cee4f 100644 (file)
--- a/drivers/video/sm501.c
+++ b/drivers/video/sm501.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Stäubli Faverges - <www.staubli.com>
+ * Stäubli Faverges - <www.staubli.com>
  * Pierre AUBERT  p.aubert@staubli.com
  *
  * (C) Copyright 2005
@@ -31,6 +31,7 @@
 
 #include <common.h>
 
+#include <asm/io.h>
 #include <video_fb.h>
 #include <sm501.h>
 
@@ -54,6 +55,18 @@
 
 GraphicDevice sm501;
 
+void write_be32(int off, unsigned int val)
+{
+       out_be32((unsigned __iomem *)(sm501.isaBase + off), val);
+}
+
+void write_le32(int off, unsigned int val)
+{
+       out_le32((unsigned __iomem *)(sm501.isaBase + off), val);
+}
+
+void (*write_reg32)(int off, unsigned int val) = write_be32;
+
 /*-----------------------------------------------------------------------------
  * SmiSetRegs --
  *-----------------------------------------------------------------------------
@@ -66,7 +79,7 @@ static void SmiSetRegs (void)
         */
        const SMI_REGS *preg = board_get_regs ();
        while (preg->Index) {
-               write32 (preg->Index, preg->Value);
+               write_reg32 (preg->Index, preg->Value);
                /*
                 * Insert a delay between
                 */
@@ -75,26 +88,120 @@ static void SmiSetRegs (void)
        }
 }
 
+#ifdef CONFIG_VIDEO_SM501_PCI
+static struct pci_device_id sm501_pci_tbl[] = {
+       { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_501 },
+       {}
+};
+#endif
+
+/*
+ * We do not enforce board code to provide empty/unused
+ * functions for this driver and define weak default
+ * functions here.
+ */
+unsigned int __board_video_init (void)
+{
+       return 0;
+}
+
+unsigned int board_video_init (void)
+                       __attribute__((weak, alias("__board_video_init")));
+
+unsigned int __board_video_get_fb (void)
+{
+       return 0;
+}
+
+unsigned int board_video_get_fb (void)
+                       __attribute__((weak, alias("__board_video_get_fb")));
+
+void __board_validate_screen (unsigned int base)
+{
+}
+
+void board_validate_screen (unsigned int base)
+                       __attribute__((weak, alias("__board_validate_screen")));
+
 /*-----------------------------------------------------------------------------
  * video_hw_init --
  *-----------------------------------------------------------------------------
  */
 void *video_hw_init (void)
 {
+#ifdef CONFIG_VIDEO_SM501_PCI
+       unsigned int pci_mem_base, pci_mmio_base;
+       unsigned int id;
+       unsigned short device_id;
+       pci_dev_t devbusfn;
+       int mem;
+#endif
        unsigned int *vm, i;
 
        memset (&sm501, 0, sizeof (GraphicDevice));
 
+#ifdef CONFIG_VIDEO_SM501_PCI
+       printf("Video: ");
+
+       /* Look for SM501/SM502 chips */
+       devbusfn = pci_find_devices(sm501_pci_tbl, 0);
+       if (devbusfn < 0) {
+               printf ("PCI Controller not found.\n");
+               goto not_pci;
+       }
+
+       /* Setup */
+       pci_write_config_dword (devbusfn, PCI_COMMAND,
+                               (PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
+       pci_read_config_word (devbusfn, PCI_DEVICE_ID, &device_id);
+       pci_read_config_dword (devbusfn, PCI_REVISION_ID, &id);
+       pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pci_mem_base);
+       pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_1, &pci_mmio_base);
+       sm501.frameAdrs = pci_mem_to_phys (devbusfn, pci_mem_base);
+       sm501.isaBase = pci_mem_to_phys (devbusfn, pci_mmio_base);
+
+       if (sm501.isaBase)
+               write_reg32 = write_le32;
+
+       mem = in_le32 ((unsigned __iomem *)(sm501.isaBase + 0x10));
+       mem = (mem & 0x0000e000) >> 13;
+       switch (mem) {
+       case 1:
+               mem = 8;
+               break;
+       case 2:
+               mem = 16;
+               break;
+       case 3:
+               mem = 32;
+               break;
+       case 4:
+               mem = 64;
+               break;
+       case 5:
+               mem = 2;
+               break;
+       case 0:
+       default:
+               mem = 4;
+       }
+       printf ("PCI SM50%d %d MB\n", ((id & 0xff) == 0xC0) ? 2 : 1, mem);
+not_pci:
+#endif
        /*
         * Initialization of the access to the graphic chipset Retreive base
         * address of the chipset (see board/RPXClassic/eccx.c)
         */
-       if ((sm501.isaBase = board_video_init ()) == 0) {
-               return (NULL);
+       if (!sm501.isaBase) {
+               sm501.isaBase = board_video_init ();
+               if (!sm501.isaBase)
+                       return NULL;
        }
 
-       if ((sm501.frameAdrs = board_video_get_fb ()) == 0) {
-               return (NULL);
+       if (!sm501.frameAdrs) {
+               sm501.frameAdrs = board_video_get_fb ();
+               if (!sm501.frameAdrs)
+                       return NULL;
        }
 
        sm501.winSizeX = board_get_width ();