diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2018-10-09 15:51:35 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-13 14:52:45 +0200 |
| commit | e04e39507c3c3da9cba31ee2e52f51b10b6350d0 (patch) | |
| tree | e7c5be2f8aec258a77758250ded7373ee1dc19db /drivers/video/fbdev/controlfb.c | |
| parent | powerpc/32: Add ioremap_wt() and ioremap_coherent() (diff) | |
| download | linux-e04e39507c3c3da9cba31ee2e52f51b10b6350d0.tar.xz linux-e04e39507c3c3da9cba31ee2e52f51b10b6350d0.zip | |
drivers/video/fbdev: use ioremap_wc/wt() instead of __ioremap()
_PAGE_NO_CACHE is a platform specific flag. In addition, this flag
is misleading because one would think it requests a noncached page
whereas a noncached page is _PAGE_NO_CACHE | _PAGE_GUARDED
_PAGE_NO_CACHE alone means write combined noncached page, so lets
use ioremap_wc() instead.
_PAGE_WRITETHRU is also platform specific flag. Use ioremap_wt()
instead.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/video/fbdev/controlfb.c')
| -rw-r--r-- | drivers/video/fbdev/controlfb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 8d14b29aafea..9cb0ef7ac29e 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -48,9 +48,7 @@ #include <linux/nvram.h> #include <linux/adb.h> #include <linux/cuda.h> -#include <asm/io.h> #include <asm/prom.h> -#include <asm/pgtable.h> #include <asm/btext.h> #include "macmodes.h" @@ -715,8 +713,7 @@ static int __init control_of_init(struct device_node *dp) goto error_out; } /* map at most 8MB for the frame buffer */ - p->frame_buffer = __ioremap(p->frame_buffer_phys, 0x800000, - _PAGE_WRITETHRU); + p->frame_buffer = ioremap_wt(p->frame_buffer_phys, 0x800000); if (!p->control_regs_phys || !request_mem_region(p->control_regs_phys, p->control_regs_size, |