diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 4e333b6..7c0976c 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -557,8 +557,15 @@ static struct s3c2410_hcd_info gta02_usb_info = { /* Smedia Glamo 3362 */ static struct glamofb_platform_data gta02_glamo_pdata = { - .width = 480, - .height = 640, + .width = 43, + .height = 58, + .pixclock = 50 * 1000, /* 50 ns */ + .left_margin = 8, + .right_margin = 104, + .upper_margin = 2, + .lower_margin = 16, + .hsync_len = 8, + .vsync_len = 2, .xres = { .min = 240, .max = 480, diff --git a/drivers/video/glamo/glamo-core.c b/drivers/video/glamo/glamo-core.c index 3a53e00..e2c2b95 100644 --- a/drivers/video/glamo/glamo-core.c +++ b/drivers/video/glamo/glamo-core.c @@ -488,9 +488,85 @@ void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine) spin_lock(&glamo->lock); __reg_clear_bit(glamo, rst->reg, rst->val); spin_unlock(&glamo->lock); + + msleep(1); } EXPORT_SYMBOL_GPL(glamo_engine_reset); +enum glamo_pll { + GLAMO_PLL1, + GLAMO_PLL2, +}; + +static int glamo_pll_rate(struct glamo_core *glamo, + enum glamo_pll pll) +{ + u_int16_t reg; + unsigned int div = 512; + /* FIXME: move osci into platform_data */ + unsigned int osci = 32768; + + if (osci == 32768) + div = 1; + + switch (pll) { + case GLAMO_PLL1: + reg = __reg_read(glamo, GLAMO_REG_PLL_GEN1); + break; + case GLAMO_PLL2: + reg = __reg_read(glamo, GLAMO_REG_PLL_GEN3); + break; + default: + return -EINVAL; + } + return (osci/div)*reg; +} + +int glamo_engine_reclock(struct glamo_core *glamo, + enum glamo_engine engine, + int ps) +{ + int pll, khz; + u_int16_t reg, mask, val = 0; + + if (!ps) + return 0; + + switch (engine) { + case GLAMO_ENGINE_LCD: + pll = GLAMO_PLL1; + reg = GLAMO_REG_CLOCK_GEN7; + mask = 0xff; + break; + default: + dev_warn(&glamo->pdev->dev, + "reclock of engine 0x%x not supported\n", engine); + return -EINVAL; + break; + } + + pll = glamo_pll_rate(glamo, pll); + khz = 1000000000UL / ps; + + if (khz) + val = (pll / khz) / 1000; + + dev_dbg(&glamo->pdev->dev, + "PLL %d, kHZ %d, div %d\n", pll, khz, val); + + if (val) { + val--; + + reg_set_bit_mask(glamo, reg, mask, val); + msleep(5); /* wait some time to stabilize */ + + return 0; + } else { + return -EINVAL; + } +} +EXPORT_SYMBOL_GPL(glamo_engine_reclock); + /*********************************************************************** * script support ***********************************************************************/ @@ -643,35 +719,6 @@ static const struct glamo_script regs_vram_8mb = { }; #endif -enum glamo_pll { - GLAMO_PLL1, - GLAMO_PLL2, -}; - -static int glamo_pll_rate(struct glamo_core *glamo, - enum glamo_pll pll) -{ - u_int16_t reg; - unsigned int div = 512; - /* FIXME: move osci into platform_data */ - unsigned int osci = 32768; - - if (osci == 32768) - div = 1; - - switch (pll) { - case GLAMO_PLL1: - reg = __reg_read(glamo, GLAMO_REG_PLL_GEN1); - break; - case GLAMO_PLL2: - reg = __reg_read(glamo, GLAMO_REG_PLL_GEN3); - break; - default: - return -EINVAL; - } - return (osci/div)*reg; -} - enum glamo_power { GLAMO_POWER_ON, GLAMO_POWER_STANDBY, diff --git a/drivers/video/glamo/glamo-core.h b/drivers/video/glamo/glamo-core.h index a66e847..215bd9e 100644 --- a/drivers/video/glamo/glamo-core.h +++ b/drivers/video/glamo/glamo-core.h @@ -47,5 +47,7 @@ enum glamo_engine { int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine); int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine); void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine); +int glamo_engine_reclock(struct glamo_core *glamo, + enum glamo_engine engine, int ps); #endif /* __GLAMO_CORE_H */ diff --git a/drivers/video/glamo/glamo-fb.c b/drivers/video/glamo/glamo-fb.c index 160a5b1..17e78df 100644 --- a/drivers/video/glamo/glamo-fb.c +++ b/drivers/video/glamo/glamo-fb.c @@ -97,25 +97,12 @@ static struct glamo_script glamo_regs[] = { { GLAMO_REG_LCD_MODE3, 0x0b40 }, /* src data rgb565, res, 18bit rgb666 * 000 01 011 0100 0000 */ - { GLAMO_REG_LCD_WIDTH, 480 }, - { GLAMO_REG_LCD_HEIGHT, 640 }, { GLAMO_REG_LCD_POLARITY, 0x440c }, /* DE high active, no cpu/lcd if, cs0 force low, a0 low active, * np cpu if, 9bit serial data, sclk rising edge latch data * 01 00 0 100 0 000 01 0 0 */ { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */ { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */ - { GLAMO_REG_LCD_PITCH, 480*2 }, - { GLAMO_REG_LCD_HORIZ_TOTAL, 480 + 8 + 8 + 104 }, /* 600 */ - { GLAMO_REG_LCD_HORIZ_RETR_START, 0 }, - { GLAMO_REG_LCD_HORIZ_RETR_END, 8 }, - { GLAMO_REG_LCD_HORIZ_DISP_START, 8 + 104 }, - { GLAMO_REG_LCD_HORIZ_DISP_END, 8 + 104 + 480 }, - { GLAMO_REG_LCD_VERT_TOTAL, 640 + 2 + 2 + 16 }, /* 660 */ - { GLAMO_REG_LCD_VERT_RETR_START, 0 }, - { GLAMO_REG_LCD_VERT_RETR_END, 2 }, - { GLAMO_REG_LCD_VERT_DISP_START, 2 + 2 }, - { GLAMO_REG_LCD_VERT_DISP_END, 2 + 2 + 640 }, }; static int glamofb_run_script(struct glamofb_handle *glamo, @@ -205,23 +192,68 @@ static int glamofb_check_var(struct fb_var_screeninfo *var, return 0; } +static void glamofb_activate_var(struct glamofb_handle *glamo, + struct fb_var_screeninfo *var) +{ + int sync, bp, disp, fp, total; + + glamofb_cmd_mode(glamo, 1); + + if (var->pixclock) + glamo_engine_reclock(glamo->mach_info->glamo, + GLAMO_ENGINE_LCD, + var->pixclock); + + /* XXX highest bits of the following two regs have other meanings */ + reg_write(glamo, GLAMO_REG_LCD_WIDTH, var->xres); + reg_write(glamo, GLAMO_REG_LCD_HEIGHT, var->yres); + reg_write(glamo, GLAMO_REG_LCD_PITCH, + (var->xres * var->bits_per_pixel) / 8); + + sync = 0; + bp = sync + var->hsync_len; + disp = bp + var->left_margin; + fp = disp + var->xres; + total = fp + var->right_margin; + + reg_write(glamo, GLAMO_REG_LCD_HORIZ_TOTAL, total); + reg_write(glamo, GLAMO_REG_LCD_HORIZ_RETR_START, sync); + reg_write(glamo, GLAMO_REG_LCD_HORIZ_RETR_END, bp); + reg_write(glamo, GLAMO_REG_LCD_HORIZ_DISP_START, disp); + reg_write(glamo, GLAMO_REG_LCD_HORIZ_DISP_END, fp); + + sync = 0; + bp = sync + var->vsync_len; + disp = bp + var->upper_margin; + fp = disp + var->yres; + total = fp + var->lower_margin; + + reg_write(glamo, GLAMO_REG_LCD_VERT_TOTAL, total); + reg_write(glamo, GLAMO_REG_LCD_VERT_RETR_START, sync); + reg_write(glamo, GLAMO_REG_LCD_VERT_RETR_END, bp); + reg_write(glamo, GLAMO_REG_LCD_VERT_DISP_START, disp); + reg_write(glamo, GLAMO_REG_LCD_VERT_DISP_END, fp); + + glamofb_cmd_mode(glamo, 0); +} + static int glamofb_set_par(struct fb_info *info) { struct glamofb_handle *glamo = info->par; struct fb_var_screeninfo *var = &info->var; - /* FIXME */ - switch (var->bits_per_pixel) { case 16: - glamo->fb->fix.visual = FB_VISUAL_TRUECOLOR; + info->fix.visual = FB_VISUAL_TRUECOLOR; break; default: printk("Smedia driver doens't support != 16bpp\n"); return -EINVAL; } - glamo->fb->fix.line_length = (var->width * var->bits_per_pixel) / 8; + info->fix.line_length = (var->xres * var->bits_per_pixel) / 8; + + glamofb_activate_var(glamo, var); return 0; } @@ -365,6 +397,8 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on) while (!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) yield(); dev_dbg(gfb->dev, "idle!\n"); + + msleep(90); } else { /* RGB interface needs vsync/hsync */ if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB) @@ -381,7 +415,6 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode); int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val) { - dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n", __FUNCTION__); while (!glamofb_cmdq_empty(gfb)) @@ -406,6 +439,18 @@ static struct fb_ops glamofb_ops = { .fb_imageblit = cfb_imageblit, }; +static int glamofb_init_regs(struct glamofb_handle *glamo) +{ + struct fb_info *info = glamo->fb; + struct fb_var_screeninfo *var = &info->var; + + glamofb_check_var(&info->var, info); + glamofb_run_script(glamo, glamo_regs, ARRAY_SIZE(glamo_regs)); + glamofb_set_par(info); + + return 0; +} + static int __init glamofb_probe(struct platform_device *pdev) { int rc = -EIO; @@ -502,24 +547,13 @@ static int __init glamofb_probe(struct platform_device *pdev) fbinfo->var.yres_virtual = mach_info->yres.defval; fbinfo->var.bits_per_pixel = mach_info->bpp.defval; -#if 0 - fbinfo->var.upper_margin = - fbinfo->var.lower_margin = - fbinfo->var.vsync_len = 2; - - fbinfo->var.left_margin = - fbinfo->var.right_margin = - fbinfo->var.hsync_len = 8; -#endif - - fbinfo->var.red.offset = 11; - fbinfo->var.green.offset = 5; - fbinfo->var.blue.offset = 0; - fbinfo->var.transp.offset = 0; - fbinfo->var.red.length = 5; - fbinfo->var.green.length = 6; - fbinfo->var.blue.length = 5; - fbinfo->var.transp.length = 0; + fbinfo->var.pixclock = mach_info->pixclock; + fbinfo->var.left_margin = mach_info->left_margin; + fbinfo->var.right_margin = mach_info->right_margin; + fbinfo->var.upper_margin = mach_info->upper_margin; + fbinfo->var.lower_margin = mach_info->lower_margin; + fbinfo->var.hsync_len = mach_info->hsync_len; + fbinfo->var.vsync_len = mach_info->vsync_len; memset(fbinfo->screen_base, 0, mach_info->xres.max * mach_info->yres.max * @@ -527,8 +561,7 @@ static int __init glamofb_probe(struct platform_device *pdev) glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD); glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD); - glamofb_run_script(glamofb, glamo_regs, ARRAY_SIZE(glamo_regs)); - glamofb_cmd_mode(glamofb, 0); + glamofb_init_regs(glamofb); rc = register_framebuffer(fbinfo); if (rc < 0) { diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h index 3da52ff..c54dd80 100644 --- a/include/linux/glamofb.h +++ b/include/linux/glamofb.h @@ -13,6 +13,10 @@ struct glamo_core; struct glamofb_platform_data { int width, height; + int pixclock; + int left_margin, right_margin; + int upper_margin, lower_margin; + int hsync_len, vsync_len; struct glamofb_val xres; struct glamofb_val yres;