Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fbdev: au1100fb: Make driver compilable on non-mips platforms
The header asm/mach-au1x00/au1000.h is unused apart from pulling in
<linux/delay.h> (for mdelay()) and <linux/io.h> (for KSEG1ADDR()). Then
the only platform specific part in the driver is the usage of the KSEG1ADDR
macro, which for the non-mips case can be stubbed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Helge Deller <deller@gmx.de>
authored by
Uwe Kleine-König
and committed by
Helge Deller
6f366e86
13c89a37
+12
-5
+2
-1
drivers/video/fbdev/Kconfig
+2
-1
drivers/video/fbdev/Kconfig
···
1345
1345
1346
1346
config FB_AU1100
1347
1347
bool "Au1100 LCD Driver"
1348
-
depends on (FB = y) && MIPS_ALCHEMY
1348
+
depends on FB = y
1349
+
depends on MIPS_ALCHEMY || COMPILE_TEST
1349
1350
select FB_IOMEM_HELPERS
1350
1351
help
1351
1352
This is the framebuffer driver for the AMD Au1100 SOC. It can drive
+10
-2
drivers/video/fbdev/au1100fb.c
+10
-2
drivers/video/fbdev/au1100fb.c
···
42
42
* 675 Mass Ave, Cambridge, MA 02139, USA.
43
43
*/
44
44
#include <linux/clk.h>
45
+
#include <linux/delay.h>
46
+
#include <linux/io.h>
45
47
#include <linux/module.h>
46
48
#include <linux/kernel.h>
47
49
#include <linux/errno.h>
···
57
55
#include <linux/platform_device.h>
58
56
#include <linux/slab.h>
59
57
60
-
#include <asm/mach-au1x00/au1000.h>
61
-
62
58
#define DEBUG 0
63
59
64
60
#include "au1100fb.h"
61
+
62
+
#if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_MIPS)
63
+
/* This is only defined to be able to compile this driver on non-mips platforms */
64
+
#define KSEG1ADDR(x) (x)
65
+
#endif
65
66
66
67
#define DRIVER_NAME "au1100fb"
67
68
#define DRIVER_DESC "LCD controller driver for AU1100 processors"
···
337
332
338
333
vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
339
334
335
+
#ifndef CONFIG_S390
336
+
/* On s390 pgprot_val() is a function and thus not a lvalue */
340
337
pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
338
+
#endif
341
339
342
340
return dma_mmap_coherent(fbdev->dev, vma, fbdev->fb_mem, fbdev->fb_phys,
343
341
fbdev->fb_len);
-2
drivers/video/fbdev/au1100fb.h
-2
drivers/video/fbdev/au1100fb.h
···
30
30
#ifndef _AU1100LCD_H
31
31
#define _AU1100LCD_H
32
32
33
-
#include <asm/mach-au1x00/au1000.h>
34
-
35
33
#define print_err(f, arg...) printk(KERN_ERR DRIVER_NAME ": " f "\n", ## arg)
36
34
#define print_warn(f, arg...) printk(KERN_WARNING DRIVER_NAME ": " f "\n", ## arg)
37
35
#define print_info(f, arg...) printk(KERN_INFO DRIVER_NAME ": " f "\n", ## arg)