diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2017-07-20 22:05:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-06 14:20:27 +0200 |
| commit | f35f76ac5157b8f07a3f2330333c0e1ca54a48f5 (patch) | |
| tree | 773ced10d2d71dc186801473dbd0a2f3c5c040b1 /drivers/video | |
| parent | dbc0edcd446c807d2e622630592a0455d328054e (diff) | |
| download | barebox-f35f76ac5157b8f07a3f2330333c0e1ca54a48f5.tar.gz barebox-f35f76ac5157b8f07a3f2330333c0e1ca54a48f5.tar.xz | |
atmel_lcdfb: move lcd_wiring_mode, have_intensity_bit to local data
Copy lcd_wiring_mode and have_intensity_bit 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')
| -rw-r--r-- | drivers/video/atmel_lcdfb.h | 2 | ||||
| -rw-r--r-- | drivers/video/atmel_lcdfb_core.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/atmel_lcdfb.h b/drivers/video/atmel_lcdfb.h index 1be9cccd94..90992df029 100644 --- a/drivers/video/atmel_lcdfb.h +++ b/drivers/video/atmel_lcdfb.h @@ -23,6 +23,8 @@ struct atmel_lcdfb_info { unsigned int smem_len; unsigned int lcdcon2; unsigned int dmacon; + unsigned int lcd_wiring_mode; + bool have_intensity_bit; struct clk *bus_clk; struct clk *lcdc_clk; diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c index a79c31ae4c..cdeb927ad0 100644 --- a/drivers/video/atmel_lcdfb_core.c +++ b/drivers/video/atmel_lcdfb_core.c @@ -69,7 +69,6 @@ static int atmel_lcdfb_check_var(struct fb_info *info) { struct device_d *dev = &info->dev; struct atmel_lcdfb_info *sinfo = info->priv; - struct atmel_lcdfb_platform_data *pdata = sinfo->pdata; struct fb_videomode *mode = info->mode; unsigned long clk_value_khz; @@ -126,11 +125,11 @@ static int atmel_lcdfb_check_var(struct fb_info *info) break; case 16: /* Older SOCs use IBGR:555 rather than BGR:565. */ - if (pdata->have_intensity_bit) + if (sinfo->have_intensity_bit) info->green.length = 5; else info->green.length = 6; - if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { + if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { /* RGB:5X5 mode */ info->red.offset = info->green.length + 5; info->blue.offset = 0; @@ -147,7 +146,7 @@ static int atmel_lcdfb_check_var(struct fb_info *info) info->transp.length = 8; /* fall through */ case 24: - if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { + if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { /* RGB:888 mode */ info->red.offset = 16; info->blue.offset = 0; @@ -261,6 +260,8 @@ int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data) sinfo->guard_time = pdata->guard_time; sinfo->lcdcon2 = pdata->default_lcdcon2; sinfo->dmacon = pdata->default_dmacon; + sinfo->lcd_wiring_mode = pdata->lcd_wiring_mode; + sinfo->have_intensity_bit = pdata->have_intensity_bit; iores = dev_request_mem_resource(dev, 0); if (IS_ERR(iores)) return PTR_ERR(iores); |