diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/video/da8xx-fb.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r-- | drivers/video/da8xx-fb.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index a1d74dd..e030e17 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -129,6 +129,7 @@ #define LCD_NUM_BUFFERS 2 +#define WSI_TIMEOUT 50 #define PALETTE_SIZE 256 #define CLK_MIN_DIV 2 @@ -1313,7 +1314,7 @@ static struct fb_ops da8xx_fb_ops = { static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev) { - struct da8xx_lcdc_platform_data *fb_pdata = dev_get_platdata(&dev->dev); + struct da8xx_lcdc_platform_data *fb_pdata = dev->dev.platform_data; struct fb_videomode *lcdc_info; int i; @@ -1335,7 +1336,7 @@ static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev) static int fb_probe(struct platform_device *device) { struct da8xx_lcdc_platform_data *fb_pdata = - dev_get_platdata(&device->dev); + device->dev.platform_data; static struct resource *lcdc_regs; struct lcd_ctrl_config *lcd_cfg; struct fb_videomode *lcdc_info; @@ -1547,7 +1548,7 @@ err_pm_runtime_disable: } #ifdef CONFIG_PM -static struct lcdc_context { +struct lcdc_context { u32 clk_enable; u32 ctrl; u32 dma_ctrl; @@ -1662,7 +1663,19 @@ static struct platform_driver da8xx_fb_driver = { .owner = THIS_MODULE, }, }; -module_platform_driver(da8xx_fb_driver); + +static int __init da8xx_fb_init(void) +{ + return platform_driver_register(&da8xx_fb_driver); +} + +static void __exit da8xx_fb_cleanup(void) +{ + platform_driver_unregister(&da8xx_fb_driver); +} + +module_init(da8xx_fb_init); +module_exit(da8xx_fb_cleanup); MODULE_DESCRIPTION("Framebuffer driver for TI da8xx/omap-l1xx"); MODULE_AUTHOR("Texas Instruments"); |