diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:37 +0100 |
| commit | 3cdd30342bb31fae72adf52903cce2876cdead9d (patch) | |
| tree | 50eebd2d26b6ae0997b5d68d1e5d8fef10f8e6d5 /drivers/video | |
| parent | 5b476ef5e510c4305d81f82c9041eeedef2e8215 (diff) | |
| parent | 5a5838f5cc2d6d2b492432427dc07031da1b4c42 (diff) | |
| download | barebox-3cdd30342bb31fae72adf52903cce2876cdead9d.tar.gz barebox-3cdd30342bb31fae72adf52903cce2876cdead9d.tar.xz | |
Merge branch 'for-next/memtest'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/imx-ipu-fb.c | 5 | ||||
| -rw-r--r-- | drivers/video/omap.c | 5 | ||||
| -rw-r--r-- | drivers/video/stm.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index a87e720d96..03d191a331 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -27,7 +27,7 @@ #include <malloc.h> #include <errno.h> #include <asm-generic/div64.h> -#include <asm/mmu.h> +#include <mmu.h> #include <mach/imx-ipu-fb.h> #include <linux/clk.h> #include <linux/err.h> @@ -1030,8 +1030,7 @@ static int imxfb_probe(struct device_d *dev) fbi->info.screen_base = pdata->framebuffer; if (fbi->info.screen_base) { remap_range(fbi->info.screen_base, - fbi->info.screen_size, - mmu_get_pte_uncached_flags()); + fbi->info.screen_size, MAP_UNCACHED); } else { fbi->info.screen_base = dma_alloc_coherent(fbi->info.screen_size, DMA_ADDRESS_BROKEN); diff --git a/drivers/video/omap.c b/drivers/video/omap.c index 3603ad2ccb..884365f609 100644 --- a/drivers/video/omap.c +++ b/drivers/video/omap.c @@ -35,7 +35,7 @@ #include <mach/omap4-silicon.h> #include <mach/omap-fb.h> -#include <asm/mmu.h> +#include <mmu.h> #include "omap.h" @@ -487,8 +487,7 @@ static int omapfb_probe(struct device_d *dev) (void __iomem *)pdata->screen->start; fbi->prealloc_screen.size = resource_size(pdata->screen); remap_range(fbi->prealloc_screen.addr, - fbi->prealloc_screen.size, - mmu_get_pte_uncached_flags()); + fbi->prealloc_screen.size, MAP_UNCACHED); } rc = omapfb_reset(fbi); diff --git a/drivers/video/stm.c b/drivers/video/stm.c index 1b42a18356..e5c1ef3974 100644 --- a/drivers/video/stm.c +++ b/drivers/video/stm.c @@ -25,7 +25,7 @@ #include <xfuncs.h> #include <io.h> #include <dma.h> -#include <asm/mmu.h> +#include <mmu.h> #include <stmp-device.h> #include <linux/clk.h> #include <linux/err.h> @@ -332,8 +332,7 @@ static int stmfb_activate_var(struct fb_info *fb_info) fb_info->screen_base = fbi->fixed_screen; fbi->memory_size = fbi->fixed_screen_size; remap_range(fbi->fixed_screen, - fbi->fixed_screen_size, - mmu_get_pte_uncached_flags()); + fbi->fixed_screen_size, MAP_UNCACHED); } else { fb_info->screen_base = dma_alloc_coherent(size, NULL); if (!fb_info->screen_base) |