diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2017-07-19 23:21:04 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2017-07-20 12:16:47 +0200 |
| commit | 5bc7bbfb3494338281541ed5c9b2e8297043f8bd (patch) | |
| tree | 465ba73deb57731fdc69a0e572b6819735dc8e04 /drivers | |
| parent | 937a9d05a41218cfbf0d6c75f7c676b13884d93d (diff) | |
| download | barebox-5bc7bbfb3494338281541ed5c9b2e8297043f8bd.tar.gz barebox-5bc7bbfb3494338281541ed5c9b2e8297043f8bd.tar.xz | |
atmel_lcdfb: fix so the correct guard_time is used
guard_time is set in platform data but was never copied
to atmel_lcdfb_info thus a guard_time of 0 have always been used.
This issue was found during code inspection and no know
bugs is fixed by this.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 2 | ||||
| -rw-r--r-- | drivers/video/atmel_lcdfb_core.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 20204c1dd4..a0e41d10c2 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -85,7 +85,7 @@ static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo) lcdc_writel(sinfo, ATMEL_LCDC_DMACON, pdata->default_dmacon); lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, - (pdata->guard_time << ATMEL_LCDC_GUARDT_OFFSET) + (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); } diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c index 555799ea4b..f6c5d7c051 100644 --- a/drivers/video/atmel_lcdfb_core.c +++ b/drivers/video/atmel_lcdfb_core.c @@ -258,6 +258,7 @@ int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data) sinfo = xzalloc(sizeof(*sinfo)); sinfo->pdata = pdata; + sinfo->guard_time = pdata->guard_time; iores = dev_request_mem_resource(dev, 0); if (IS_ERR(iores)) return PTR_ERR(iores); |