snowball: Add support for ux500 based snowball board

[u-boot] / board / freescale / mpc8610hpcd / mpc8610hpcd_diu.c

diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 4449376789c89ed89796c418ff9b804b75d88b88..358a4324b94a67f01521a9fe4b93aad41a8e6426 100644 (file)
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -1,6 +1,7 @@
 /*
- * Copyright 2007 Freescale Semiconductor, Inc.
- * York Sun <yorksun@freescale.com>
+ * Copyright 2007-2011 Freescale Semiconductor, Inc.
+ * Authors: York Sun <yorksun@freescale.com>
+ *          Timur Tabi <timur@freescale.com>
  *
  * FSL DIU Framebuffer driver
  *
@@ -26,80 +27,61 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
-
-#ifdef CONFIG_FSL_DIU_FB
-
+#include <fsl_diu_fb.h>
 #include "../common/pixis.h"
-#include "../common/fsl_diu_fb.h"
-
-
-extern unsigned int FSL_Logo_BMP[];
 
+#define PX_BRDCFG0_DLINK       0x10
+#define PX_BRDCFG0_DVISEL      0x08
 
-void mpc8610hpcd_diu_init(void)
+void diu_set_pixel_clock(unsigned int pixclock)
 {
-       char *monitor_port;
-       int xres, gamma_fix;
-       unsigned int pixel_format;
-       unsigned char tmp_val;
-
-       tmp_val = in8(PIXIS_BASE + PIXIS_BRDCFG0);
-       monitor_port = getenv ("monitor");
-
-       if (!strncmp(monitor_port, "0", 1)) {   /* 0 - DVI */
-               xres = 1280;
-               pixel_format = 0x88882317;
-               gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val | 0x08);
-
-       } else if (!strncmp(monitor_port, "1", 1)) { /* 1 - Single link LVDS */
-               xres = 1024;
-               pixel_format = 0x88883316;
-               gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, (tmp_val & 0xf7) | 0x10);
-
-       } else if (!strncmp(monitor_port, "2", 1)) { /* 2 - Double link LVDS */
-               xres = 1280;
-               pixel_format = 0x88883316;
-               gamma_fix = 1;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val & 0xe7);
-
-       } else {        /* DVI */
-               xres = 1280;
-               pixel_format = 0x88882317;
-               gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val | 0x08);
-       }
-
-       fsl_diu_init(xres, pixel_format, gamma_fix,
-                    (unsigned char *)FSL_Logo_BMP);
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
+       volatile ccsr_gur_t *gur = &immap->im_gur;
+       volatile unsigned int *guts_clkdvdr = &gur->clkdvdr;
+       unsigned long speed_ccb, temp, pixval;
+
+       speed_ccb = get_bus_freq(0);
+       temp = 1000000000/pixclock;
+       temp *= 1000;
+       pixval = speed_ccb / temp;
+       debug("DIU pixval = %lu\n", pixval);
+
+       /* Modify PXCLK in GUTS CLKDVDR */
+       debug("DIU: Current value of CLKDVDR = 0x%08x\n", *guts_clkdvdr);
+       temp = *guts_clkdvdr & 0x2000FFFF;
+       *guts_clkdvdr = temp;                           /* turn off clock */
+       *guts_clkdvdr = temp | 0x80000000 | ((pixval & 0x1F) << 16);
+       debug("DIU: Modified value of CLKDVDR = 0x%08x\n", *guts_clkdvdr);
 }
 
-int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp,
-                            int flag, int argc, char *argv[])
+int platform_diu_init(unsigned int xres, unsigned int yres, const char *port)
 {
-       unsigned int addr;
+       const char *name;
+       int gamma_fix = 0;
+       u32 pixel_format = 0x88883316;
+       u8 temp;
 
-       if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       temp = in_8(&pixis->brdcfg0);
 
-       if (!strncmp(argv[1],"init",4)) {
-               mpc8610hpcd_diu_init();
+       if (strncmp(port, "dlvds", 5) == 0) {
+               /* Dual link LVDS */
+               gamma_fix = 1;
+               temp &= ~(PX_BRDCFG0_DLINK | PX_BRDCFG0_DVISEL);
+               name = "Dual-Link LVDS";
+       } else if (strncmp(port, "lvds", 4) == 0) {
+               /* Single link LVDS */
+               temp = (temp & ~PX_BRDCFG0_DVISEL) | PX_BRDCFG0_DLINK;
+               name = "Single-Link LVDS";
        } else {
-               addr = simple_strtoul(argv[1], NULL, 16);
-               fsl_diu_clear_screen();
-               fsl_diu_display_bmp((unsigned char *)addr, 0, 0, 0);
+               /* DVI */
+               if (in_8(&pixis->ver) == 1)     /* Board version */
+                       pixel_format = 0x88882317;
+               temp |= PX_BRDCFG0_DVISEL;
+               name = "DVI";
        }
 
-       return 0;
-}
+       printf("DIU:   Switching to %s monitor @ %ux%u\n", name, xres, yres);
+       out_8(&pixis->brdcfg0, temp);
 
-U_BOOT_CMD(
-       diufb, CFG_MAXARGS, 1, mpc8610diu_init_show_bmp,
-       "diufb init | addr - Init or Display BMP file\n",
-       "init\n    - initialize DIU\n"
-       "addr\n    - display bmp at address 'addr'\n"
-       );
-#endif /* CONFIG_FSL_DIU_FB */
+       return fsl_diu_init(xres, yres, pixel_format, gamma_fix);
+}