imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / trab / vfd.c

diff --git a/board/trab/vfd.c b/board/trab/vfd.c
index b6798fdce771c5019da98df4dc61a1a527d5e564..e5ca4abe47445e8bcf11e001c724121620fd5f4d 100755 (executable)
--- a/board/trab/vfd.c
+++ b/board/trab/vfd.c
@@ -36,7 +36,7 @@
 #include <version.h>
 #include <stdarg.h>
 #include <linux/types.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <s3c2400.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -104,7 +104,7 @@ void init_grid_ctrl(void)
                        bit = grid_cycle * 256  * 4 +
                             (grid_cycle + 200) * 4 +
                             frame_buf_offs + display;
-                       /* wrap arround if offset (see manual S3C2400) */
+                       /* wrap arround if offset (see manual S3C2400) */
                        if (bit>=FRAME_BUF_SIZE*8)
                                bit = bit - (FRAME_BUF_SIZE * 8);
                        adr = gd->fb_base + (bit/32) * 4 + (3 - (bit%32) / 8);
@@ -117,7 +117,7 @@ void init_grid_ctrl(void)
                        if(grid_cycle<55)
                                bit = grid_cycle*256*4+(grid_cycle+201)*4+frame_buf_offs+display;
                        else
-                               bit = grid_cycle*256*4+200*4+frame_buf_offs+display-4;  /* grid nr. 0 */
+                               bit = grid_cycle*256*4+200*4+frame_buf_offs+display-4;  /* grid nr. 0 */
                        /* wrap arround if offset (see manual S3C2400) */
                        if (bit>=FRAME_BUF_SIZE*8)
                                bit = bit-(FRAME_BUF_SIZE*8);
@@ -190,7 +190,7 @@ void create_vfd_table(void)
                            /* Display 0 red pixels */
                            vfd_table[x][y][1][display][0] =
                                (x==0) ? y*16+512+display
-                                      : (x%4)*4+y*16+((x-1)/2)*1024+512+display;
+                                      : (x%4)*4+y*16+((x-1)/2)*1024+512+display;
                    }
                }
            }
@@ -369,7 +369,7 @@ int vfd_init_clocks (void)
        gpio->PCCON = (gpio->PCCON & 0xFFFFFF00);       /* configure GPC0...GPC3 as inputs */
        /* allow signals to settle */
        for (i=0; i<10000; i++) /* udelay isn't working yet at this point! */
-               __asm("NOP");
+               __asm__("NOP");
        vfd_board_id = (~gpio->PCDAT) & 0x000F; /* read GPC0...GPC3 port pins */
 
        VFD_DISABLE;                            /* activate blank for the vfd */
@@ -488,7 +488,7 @@ int drv_vfd_init(void)
        lcd->LCDCON1 = 0x00000000;
        /* frame buffer startadr */
        lcd->LCDSADDR1 = gd->fb_base >> 1;
-       /* frame buffer endadr */
+       /* frame buffer endadr */
        lcd->LCDSADDR2 = (gd->fb_base + FRAME_BUF_SIZE) >> 1;
        lcd->LCDSADDR3 = ((256/4));
        lcd->LCDCON2 = 0x000DC000;