diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/video/fbdev/atmel_lcdfb.c | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/video/fbdev/atmel_lcdfb.c')
| -rw-r--r-- | kernel/drivers/video/fbdev/atmel_lcdfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/drivers/video/fbdev/atmel_lcdfb.c b/kernel/drivers/video/fbdev/atmel_lcdfb.c index 94a8d04e6..19eb42b57 100644 --- a/kernel/drivers/video/fbdev/atmel_lcdfb.c +++ b/kernel/drivers/video/fbdev/atmel_lcdfb.c @@ -19,7 +19,6 @@ #include <linux/backlight.h> #include <linux/gfp.h> #include <linux/module.h> -#include <linux/platform_data/atmel.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_gpio.h> @@ -999,7 +998,7 @@ static const char *atmel_lcdfb_wiring_modes[] = { [ATMEL_LCDC_WIRING_RGB] = "RGB", }; -const int atmel_lcdfb_get_of_wiring_modes(struct device_node *np) +static int atmel_lcdfb_get_of_wiring_modes(struct device_node *np) { const char *mode; int err, i; @@ -1266,7 +1265,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) goto stop_clk; } - info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len); + info->screen_base = ioremap_wc(info->fix.smem_start, + info->fix.smem_len); if (!info->screen_base) { ret = -ENOMEM; goto release_intmem; |