1.1 --- a/stage2/jzlcd.c Sun Jan 24 21:18:17 2016 +0100
1.2 +++ b/stage2/jzlcd.c Sun Jan 24 21:37:15 2016 +0100
1.3 @@ -53,14 +53,14 @@
1.4 return ALIGN(addr - PAGE_SIZE + 1, PAGE_SIZE) - lcd_get_total_size(&panel_info);
1.5 }
1.6
1.7 -static int jz_lcd_init_mem(void *lcdbase, vidinfo_t *vid);
1.8 +static int jz_lcd_init_mem(unsigned long lcdbase, vidinfo_t *vid);
1.9 static void jz_lcd_desc_init(vidinfo_t *vid);
1.10 static int jz_lcd_hw_init(vidinfo_t *vid);
1.11
1.12 -void lcd_ctrl_init(void **lcdbase)
1.13 +void lcd_ctrl_init(unsigned long *lcdbase)
1.14 {
1.15 /* Start from the top of memory and obtain a framebuffer region. */
1.16 - *lcdbase = (void *) lcd_setmem(get_memory_size());
1.17 + *lcdbase = lcd_setmem(get_memory_size());
1.18
1.19 jz_lcd_init_mem(*lcdbase, &panel_info);
1.20 jz_lcd_desc_init(&panel_info);
1.21 @@ -81,18 +81,18 @@
1.22 REG_LCD_CTRL |= (1<<4); /* LCDCTRL.DIS, regular disable */
1.23 }
1.24
1.25 -static int jz_lcd_init_mem(void *lcdbase, vidinfo_t *vid)
1.26 +static int jz_lcd_init_mem(unsigned long lcdbase, vidinfo_t *vid)
1.27 {
1.28 unsigned long palette_mem_size;
1.29 struct jz_fb_info *fbi = &vid->jz_fb;
1.30 - int fb_size = lcd_get_size(vid);
1.31 + unsigned long fb_size = lcd_get_size(vid);
1.32
1.33 - fbi->screen = (unsigned long)lcdbase;
1.34 + fbi->screen = lcdbase;
1.35 fbi->palette_size = 256;
1.36 palette_mem_size = fbi->palette_size * sizeof(u16);
1.37
1.38 /* locate palette and descs at end of page following fb */
1.39 - fbi->palette = (unsigned long)lcdbase + fb_size + PAGE_SIZE - palette_mem_size;
1.40 + fbi->palette = lcdbase + fb_size + PAGE_SIZE - palette_mem_size;
1.41
1.42 return 0;
1.43 }
1.44 @@ -101,6 +101,7 @@
1.45 {
1.46 struct jz_fb_dma_descriptor *descriptors;
1.47 struct jz_fb_info * fbi;
1.48 +
1.49 fbi = &vid->jz_fb;
1.50 descriptors = ((struct jz_fb_dma_descriptor *) fbi->palette) - 3;
1.51 fbi->dmadesc_fblow = (struct jz_fb_dma_descriptor *) &descriptors[0];
1.52 @@ -108,32 +109,32 @@
1.53 fbi->dmadesc_palette = (struct jz_fb_dma_descriptor *) &descriptors[2];
1.54
1.55 /* populate descriptors */
1.56 - fbi->dmadesc_fblow->fdadr = virt_to_phys(fbi->dmadesc_fblow);
1.57 - fbi->dmadesc_fblow->fsadr = virt_to_phys((void *)(fbi->screen + lcd_get_size(vid)));
1.58 + fbi->dmadesc_fblow->fdadr = fbi->dmadesc_fblow;
1.59 + fbi->dmadesc_fblow->fsadr = fbi->screen + lcd_get_size(vid);
1.60 fbi->dmadesc_fblow->fidr = 0;
1.61 fbi->dmadesc_fblow->ldcmd = lcd_get_size(vid) / 4 ;
1.62
1.63 - fbi->fdadr1 = virt_to_phys(fbi->dmadesc_fblow); /* only used in dual-panel mode */
1.64 + fbi->fdadr1 = fbi->dmadesc_fblow; /* only used in dual-panel mode */
1.65
1.66 - fbi->dmadesc_fbhigh->fsadr = virt_to_phys((void *)fbi->screen);
1.67 + fbi->dmadesc_fbhigh->fsadr = fbi->screen;
1.68 fbi->dmadesc_fbhigh->fidr = 0;
1.69 fbi->dmadesc_fbhigh->ldcmd = lcd_get_size(vid) / 4; /* length in word */
1.70
1.71 - fbi->dmadesc_palette->fsadr = virt_to_phys((void *)fbi->palette);
1.72 + fbi->dmadesc_palette->fsadr = fbi->palette;
1.73 fbi->dmadesc_palette->fidr = 0;
1.74 fbi->dmadesc_palette->ldcmd = (fbi->palette_size * 2)/4 | (1<<28);
1.75
1.76 if(NBITS(vid->vl_bpix) < 12)
1.77 {
1.78 /* assume any mode with <12 bpp is palette driven */
1.79 - fbi->dmadesc_palette->fdadr = virt_to_phys(fbi->dmadesc_fbhigh);
1.80 - fbi->dmadesc_fbhigh->fdadr = virt_to_phys(fbi->dmadesc_palette);
1.81 + fbi->dmadesc_palette->fdadr = fbi->dmadesc_fbhigh;
1.82 + fbi->dmadesc_fbhigh->fdadr = fbi->dmadesc_palette;
1.83 /* flips back and forth between pal and fbhigh */
1.84 - fbi->fdadr0 = virt_to_phys(fbi->dmadesc_palette);
1.85 + fbi->fdadr0 = fbi->dmadesc_palette;
1.86 } else {
1.87 /* palette shouldn't be loaded in true-color mode */
1.88 - fbi->dmadesc_fbhigh->fdadr = virt_to_phys((void *)fbi->dmadesc_fbhigh);
1.89 - fbi->fdadr0 = virt_to_phys(fbi->dmadesc_fbhigh); /* no pal just fbhigh */
1.90 + fbi->dmadesc_fbhigh->fdadr = fbi->dmadesc_fbhigh;
1.91 + fbi->fdadr0 = fbi->dmadesc_fbhigh; /* no pal just fbhigh */
1.92 }
1.93
1.94 flush_cache_all();
1.95 @@ -390,11 +391,11 @@
1.96 __cpm_start_lcd();
1.97 udelay(1000);
1.98
1.99 - REG_LCD_DA0 = fbi->fdadr0; /* frame descripter*/
1.100 + REG_LCD_DA0 = (unsigned long) fbi->fdadr0; /* frame descriptor */
1.101
1.102 if (((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL) ||
1.103 ((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_DUAL))
1.104 - REG_LCD_DA1 = fbi->fdadr1; /* frame descripter*/
1.105 + REG_LCD_DA1 = (unsigned long) fbi->fdadr1; /* frame descriptor */
1.106
1.107 return 0;
1.108 }