UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

blackfin video driver: update the BF52x EZKIT video framebuffer driver according to LKML review 

- Allocate pseudo_palette together with fbinfo
- Code cleanup

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bryan Wu 2008-03-28 14:16:05 -07:00 committed by Linus Torvalds
parent a99acc832d
commit 7ef9861c74
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/video/bfin-t350mcqb-fb.c
View File

@ -91,6 +91,7 @@ struct bfin_t350mcqbfb_info {
int lq043_open_cnt; int lq043_open_cnt;
int irq; int irq;
spinlock_t lock; /* lock */ spinlock_t lock; /* lock */
u32 pseudo_pal[16];
}; };
static int nocursor; static int nocursor;
@ -182,13 +183,13 @@ static void bfin_t350mcqb_config_dma(struct bfin_t350mcqbfb_info *fbi)
} }
static int bfin_t350mcqb_request_ports(int action) static u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
{
u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
P_PPI0_D3, P_PPI0_D4, P_PPI0_D5, P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
P_PPI0_D6, P_PPI0_D7, 0}; P_PPI0_D6, P_PPI0_D7, 0};
static int bfin_t350mcqb_request_ports(int action)
{
if (action) { if (action) {
if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) {
printk(KERN_ERR "Requesting Peripherals faild\n"); printk(KERN_ERR "Requesting Peripherals faild\n");
@ -520,16 +521,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
fbinfo->fbops = &bfin_t350mcqb_fb_ops; fbinfo->fbops = &bfin_t350mcqb_fb_ops;
fbinfo->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL); fbinfo->pseudo_palette = &info->pseudo_pal;
if (!fbinfo->pseudo_palette) {
printk(KERN_ERR DRIVER_NAME
"Fail to allocate pseudo_palette\n");
ret = -ENOMEM;
goto out4;
}
memset(fbinfo->pseudo_palette, 0, sizeof(u32) * 16);
if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0) if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0)
< 0) { < 0) {
@ -537,7 +529,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
"Fail to allocate colormap (%d entries)\n", "Fail to allocate colormap (%d entries)\n",
BFIN_LCD_NBR_PALETTE_ENTRIES); BFIN_LCD_NBR_PALETTE_ENTRIES);
ret = -EFAULT; ret = -EFAULT;
goto out5; goto out4;
} }
if (bfin_t350mcqb_request_ports(1)) { if (bfin_t350mcqb_request_ports(1)) {
@ -552,11 +544,11 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
goto out7; goto out7;
} }
if (request_irq(info->irq, (void *)bfin_t350mcqb_irq_error, IRQF_DISABLED, ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED,
"PPI ERROR", info) < 0) { "PPI ERROR", info);
if (ret < 0) {
printk(KERN_ERR DRIVER_NAME printk(KERN_ERR DRIVER_NAME
": unable to request PPI ERROR IRQ\n"); ": unable to request PPI ERROR IRQ\n");
ret = -EFAULT;
goto out7; goto out7;
} }
@ -584,8 +576,6 @@ out7:
bfin_t350mcqb_request_ports(0); bfin_t350mcqb_request_ports(0);
out6: out6:
fb_dealloc_cmap(&fbinfo->cmap); fb_dealloc_cmap(&fbinfo->cmap);
out5:
kfree(fbinfo->pseudo_palette);
out4: out4:
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle); info->dma_handle);
@ -605,6 +595,8 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
struct bfin_t350mcqbfb_info *info = fbinfo->par; struct bfin_t350mcqbfb_info *info = fbinfo->par;
unregister_framebuffer(fbinfo);
free_dma(CH_PPI); free_dma(CH_PPI);
free_irq(info->irq, info); free_irq(info->irq, info);
@ -612,7 +604,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle); info->dma_handle);
kfree(fbinfo->pseudo_palette);
fb_dealloc_cmap(&fbinfo->cmap); fb_dealloc_cmap(&fbinfo->cmap);
#ifndef NO_BL_SUPPORT #ifndef NO_BL_SUPPORT
@ -620,10 +611,11 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
backlight_device_unregister(bl_dev); backlight_device_unregister(bl_dev);
#endif #endif
unregister_framebuffer(fbinfo);
bfin_t350mcqb_request_ports(0); bfin_t350mcqb_request_ports(0);
platform_set_drvdata(pdev, NULL);
framebuffer_release(fbinfo);
printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n"); printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n");
return 0; return 0;