au1100fb compiling fix and PM support
PATCH 1/1 au1100fb compiling fix and PM support
Hello,
here two patches to fix some compiling issues and to add power management support.
Please, apply first au1100fb_clean_compile.patch and then au1100fb_pm_support.patch.
Ciao,
Rodolfo
Signature · 4 lines
GNU/Linux Solutions e-mail: [email protected] Linux Device Driver [email protected] Embedded Systems [email protected] UNIX programming phone: +39 349 2432127
drivers/video/au1100fb.c +14 -7
@@ -215,10 +244,13 @@ int au1100fb_setmode(struct au1100fb_dev*/ int au1100fb_fb_setcolreg (unsigned regno,unsigned red,unsigned green,unsigned blue,unsigned transp,struct fb_info *fbi) { -struct au1100fb_device *fbdev =to_au1100fb_device (fbi); -u32 *palette = fbdev->regs->lcd_pallettebase; +struct au1100fb_device *fbdev; +u32 *palette;u32 value; + fbdev =to_au1100fb_device (fbi); + palette = fbdev->regs->lcd_pallettebase; +if (regno > (AU1100_LCD_NBR_PALETTE_ENTRIES -1 ))return -EINVAL ;
@@ -317,9 +363,11 @@ int au1100fb_fb_blank(int blank_mode, st*/ int au1100fb_fb_pan_display (struct fb_var_screeninfo *var,struct fb_info *fbi) { -struct au1100fb_device *fbdev =to_au1100fb_device (fbi); +struct au1100fb_device *fbdev;int dy; + fbdev =to_au1100fb_device (fbi); +print_dbg ("fb_pan_display %p %p" , var, fbi);if (!var || !fbdev) {
@@ -383,10 +431,12 @@ void au1100fb_fb_rotate(struct fb_info **/ int au1100fb_fb_mmap (struct fb_info *fbi,struct vm_area_struct *vma) { -struct au1100fb_device *fbdev =to_au1100fb_device (fbi); +struct au1100fb_device *fbdev;unsigned int len;unsigned long start=0 , off; + fbdev =to_au1100fb_device (fbi); +if (vma->vm_pgoff > (~0UL >>PAGE_SHIFT )) {return -EINVAL ; }
@@ -468,7 +518,7 @@ int au1100fb_drv_probe(struct device *deif (!request_mem_region (au1100fb_fix.mmio_start, au1100fb_fix.mmio_len,DRIVER_NAME )) { -print_err ("fail to lock memory region at 0x%08x" , +print_err ("fail to lock memory region at 0x%08lx" , au1100fb_fix.mmio_start);return -EBUSY ; }
@@ -596,13 +657,13 @@ int au1100fb_drv_remove(struct device *dreturn 0 ; } -int au1100fb_drv_suspend (struct device *dev,u32 state,u32 level) +int au1100fb_drv_suspend (struct device *dev,pm_message_t state) {/* TODO */ return 0 ; } -int au1100fb_drv_resume (struct device *dev,u32 level) +int au1100fb_drv_resume (struct device *dev) {/* TODO */ return 0 ;
drivers/video/au1100fb.c +38 -2
@@ -7,6 +7,8 @@* Karl Lessard <[email protected]> * <[email protected]> * +* PM support added by Rodolfo Giometti <[email protected]> +* * Copyright 2002 MontaVista Software * Author: MontaVista Software, Inc. * [email protected] or [email protected]
@@ -657,17 +659,49 @@ int au1100fb_drv_remove(struct device *dreturn 0 ; } +#ifdef CONFIG_PM +static u32 sys_clksrc; +static struct au1100fb_regs fbregs; +int au1100fb_drv_suspend (struct device *dev,pm_message_t state) { -/* TODO */ +struct au1100fb_device *fbdev = (struct au1100fb_device *)dev_get_drvdata (dev); + +if (!fbdev) +return 0 ; + +/* Save the clock source state */ + sys_clksrc =au_readl (SYS_CLKSRC ); + +/* Blank the LCD */ +au1100fb_fb_blank (VESA_POWERDOWN , &fbdev->info); + +/* Stop LCD clocking */ +au_writel (sys_clksrc & ~SYS_CS_ML_MASK ,SYS_CLKSRC ); + +memcpy (&fbregs, fbdev->regs,sizeof (struct au1100fb_regs )); +return 0 ; }int au1100fb_drv_resume (struct device *dev) { -/* TODO */ +struct au1100fb_device *fbdev = (struct au1100fb_device *)dev_get_drvdata (dev); + +if (!fbdev) +return 0 ; + +memcpy (fbdev->regs, &fbregs,sizeof (struct au1100fb_regs )); + +/* Restart LCD clocking */ +au_writel (sys_clksrc,SYS_CLKSRC ); + +/* Unblank the LCD */ +au1100fb_fb_blank (VESA_NO_BLANKING , &fbdev->info); +return 0 ; } +#endif static struct device_driver au1100fb_driver = { .name ="au1100-lcd" ,
@@ -675,8 +709,10 @@ static struct device_driver au1100fb_dri .probe = au1100fb_drv_probe, .remove = au1100fb_drv_remove, +#ifdef CONFIG_PM .suspend = au1100fb_drv_suspend, .resume = au1100fb_drv_resume, +#endif };/*-------------------------------------------------------------------------*/