diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2017-07-20 22:05:22 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-06 14:20:23 +0200 |
commit | dbc0edcd446c807d2e622630592a0455d328054e (patch) | |
tree | 541dbbf1d62e79d1d1bfc1fb787b8cc8f1161c67 /drivers/video/atmel_hlcdfb.c | |
parent | d79a81736f64eef5d19396ad04ee9391bc384a8e (diff) | |
download | barebox-dbc0edcd446c807d2e622630592a0455d328054e.tar.gz barebox-dbc0edcd446c807d2e622630592a0455d328054e.tar.xz |
atmel_lcdfb: move dmacon, lcdcon2 to local data
Copy dmacon + lcdcon2 to atmel_lcdfb_info to minimize
dependency on the atmel_lcdfb_platform_data.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video/atmel_hlcdfb.c')
-rw-r--r-- | drivers/video/atmel_hlcdfb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index f7aab7f454..5d130f598e 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -178,7 +178,6 @@ static u32 atmel_hlcdfb_get_rgbmode(struct fb_info *info) static void atmel_hlcdfb_setup_core_base(struct fb_info *info) { struct atmel_lcdfb_info *sinfo = info->priv; - struct atmel_lcdfb_platform_data *pdata = sinfo->pdata; struct fb_videomode *mode = info->mode; unsigned long value; unsigned long clk_value_khz; @@ -205,8 +204,8 @@ static void atmel_hlcdfb_setup_core_base(struct fb_info *info) lcdc_writel(sinfo, ATMEL_LCDC_LCDCFG0, value); /* Initialize control register 5 */ - /* In 9x5, the default_lcdcon2 will use for LCDCFG5 */ - value = pdata->default_lcdcon2; + /* In 9x5, the lcdcon2 will use for LCDCFG5 */ + value = sinfo->lcdcon2; value |= (sinfo->guard_time << LCDC_LCDCFG5_GUARDTIME_OFFSET) | LCDC_LCDCFG5_DISPDLY | LCDC_LCDCFG5_VSPDLYS; |