Commit 6f366e86 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Helge Deller
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 13c89a37

drivers/video/fbdev/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,8 @@ endchoice 


config FB_AU1100

	bool "Au1100 LCD Driver"

	depends on (FB = y) && MIPS_ALCHEMY

	depends on FB = y

	depends on MIPS_ALCHEMY || COMPILE_TEST

	select FB_IOMEM_HELPERS

	help

	  This is the framebuffer driver for the AMD Au1100 SOC.  It can drive

drivers/video/fbdev/au1100fb.c

+10 −2
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/errno.h>
@@ -55,12 +57,15 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>



#include <asm/mach-au1x00/au1000.h>



#define DEBUG 0



#include "au1100fb.h"



#if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_MIPS)

/* This is only defined to be able to compile this driver on non-mips platforms */

#define KSEG1ADDR(x) (x)

#endif



#define DRIVER_NAME "au1100fb"

#define DRIVER_DESC "LCD controller driver for AU1100 processors"
@@ -332,7 +337,10 @@ static int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) 


	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);



#ifndef CONFIG_S390

	/* On s390 pgprot_val() is a function and thus not a lvalue */

	pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6

#endif



	return dma_mmap_coherent(fbdev->dev, vma, fbdev->fb_mem, fbdev->fb_phys,

			fbdev->fb_len);

drivers/video/fbdev/au1100fb.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#ifndef _AU1100LCD_H

#define _AU1100LCD_H



#include <asm/mach-au1x00/au1000.h>



#define print_err(f, arg...) printk(KERN_ERR DRIVER_NAME ": " f "\n", ## arg)

#define print_warn(f, arg...) printk(KERN_WARNING DRIVER_NAME ": " f "\n", ## arg)

#define print_info(f, arg...) printk(KERN_INFO DRIVER_NAME ": " f "\n", ## arg)