qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-29 07:39:55 +02:00
Code

Merge commit 'nbd/master' into xburst

Browse Source
This commit is contained in:
Lars-Peter Clausen 2010-02-09 00:41:28 +01:00
commit b1b90fdd4d
1 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
target/linux/xburst/files-2.6.32/drivers/video/jz4740_fb.c
View File

@ -167,12 +167,11 @@ int jzfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
static int jzfb_get_controller_bpp(struct jzfb *jzfb) static int jzfb_get_controller_bpp(struct jzfb *jzfb)
{ {
switch(jzfb->pdata->bpp) { switch(jzfb->pdata->bpp) {
case 18: case 18:
case 24: case 24:
return 32; return 32;
break; default:
default: return jzfb->pdata->bpp;
return jzfb->pdata->bpp;
} }
} }
@ -305,7 +304,7 @@ static int jzfb_set_par(struct fb_info *info)
static int jzfb_blank(int blank_mode, struct fb_info *info) static int jzfb_blank(int blank_mode, struct fb_info *info)
{ {
struct jzfb* jzfb = info->par; struct jzfb* jzfb = info->par;
uint32_t ctrl = readl(jzfb->base + JZ_REG_LCD_CTRL); uint32_t ctrl;
switch (blank_mode) { switch (blank_mode) {
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
@ -313,13 +312,13 @@ static int jzfb_blank(int blank_mode, struct fb_info *info)
return 0; return 0;
jz_gpio_bulk_resume(jz_lcd_pins, ARRAY_SIZE(jz_lcd_pins)); jz_gpio_bulk_resume(jz_lcd_pins, ARRAY_SIZE(jz_lcd_pins));
clk_enable(jzfb->ldclk);
clk_enable(jzfb->lpclk); clk_enable(jzfb->lpclk);
writel(0, jzfb->base + JZ_REG_LCD_STATE); writel(0, jzfb->base + JZ_REG_LCD_STATE);
writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0); writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0);
ctrl = readl(jzfb->base + JZ_REG_LCD_CTRL);
ctrl |= JZ_LCD_CTRL_ENABLE; ctrl |= JZ_LCD_CTRL_ENABLE;
ctrl &= ~JZ_LCD_CTRL_DISABLE; ctrl &= ~JZ_LCD_CTRL_DISABLE;
writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL); writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL);
@ -330,6 +329,7 @@ static int jzfb_blank(int blank_mode, struct fb_info *info)
if (!jzfb->is_enabled) if (!jzfb->is_enabled)
return 0; return 0;
ctrl = readl(jzfb->base + JZ_REG_LCD_CTRL);
ctrl |= JZ_LCD_CTRL_DISABLE; ctrl |= JZ_LCD_CTRL_DISABLE;
writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL); writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL);
do { do {
@ -337,7 +337,6 @@ static int jzfb_blank(int blank_mode, struct fb_info *info)
} while (!(ctrl & JZ_LCD_STATE_DISABLED)); } while (!(ctrl & JZ_LCD_STATE_DISABLED));
clk_disable(jzfb->lpclk); clk_disable(jzfb->lpclk);
clk_disable(jzfb->ldclk);
jz_gpio_bulk_suspend(jz_lcd_pins, ARRAY_SIZE(jz_lcd_pins)); jz_gpio_bulk_suspend(jz_lcd_pins, ARRAY_SIZE(jz_lcd_pins));
jzfb->is_enabled = 0; jzfb->is_enabled = 0;
break; break;
@ -511,6 +510,8 @@ static int __devinit jzfb_probe(struct platform_device *pdev)
fb_alloc_cmap(&fb->cmap, 256, 0); fb_alloc_cmap(&fb->cmap, 256, 0);
clk_enable(jzfb->ldclk);
jzfb_set_par(fb); jzfb_set_par(fb);
writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0); writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0);
@ -547,12 +548,44 @@ static int __devexit jzfb_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
static int jzfb_suspend(struct device *dev)
{
struct jzfb *jzfb = dev_get_drvdata(dev);
clk_disable(jzfb->ldclk);
return 0;
}
static int jzfb_resume(struct device *dev)
{
struct jzfb *jzfb = dev_get_drvdata(dev);
clk_enable(jzfb->ldclk);
return 0;
}
static const struct dev_pm_ops jzfb_pm_ops = {
.suspend = jzfb_suspend,
.resume = jzfb_resume,
.poweroff = jzfb_suspend,
.restore = jzfb_resume,
};
#define JZFB_PM_OPS (&jzfb_pm_ops)
#else
#define JZFB_PM_OPS NULL
#endif
static struct platform_driver jzfb_driver = { static struct platform_driver jzfb_driver = {
.probe = jzfb_probe, .probe = jzfb_probe,
.remove = __devexit_p(jzfb_remove), .remove = __devexit_p(jzfb_remove),
.driver = { .driver = {
.name = "jz4740-fb", .name = "jz4740-fb",
.pm = JZFB_PM_OPS,
}, },
}; };