Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b7a72a authored by Russell King's avatar Russell King
Browse files

FB: sa1100: move platform data to platform files 



Move platform data out of the sa1100fb driver into the various
platform files themselves.

Acked-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9e6720fb

arch/arm/mach-sa1100/assabet.c

+40 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <linux/delay.h>

#include <linux/mm.h>



#include <video/sa1100fb.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>
@@ -204,6 +206,39 @@ static struct mcp_plat_data assabet_mcp_data = { 
	.sclk_rate	= 11981000,

};



#ifndef ASSABET_PAL_VIDEO

/*

 * The assabet uses a sharp LQ039Q2DS54 LCD module.  It is actually

 * takes an RGB666 signal, but we provide it with an RGB565 signal

 * instead (def_rgb_16).

 */

static struct sa1100fb_mach_info lq039q2ds54_info = {

	.pixclock	= 171521,	.bpp		= 16,

	.xres		= 320,		.yres		= 240,



	.hsync_len	= 5,		.vsync_len	= 1,

	.left_margin	= 61,		.upper_margin	= 3,

	.right_margin	= 9,		.lower_margin	= 0,



	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,



	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),

};

#else

static struct sa1100fb_mach_info pal_info = {

	.pixclock	= 67797,	.bpp		= 16,

	.xres		= 640,		.yres		= 512,



	.hsync_len	= 64,		.vsync_len	= 6,

	.left_margin	= 125,		.upper_margin	= 70,

	.right_margin	= 115,		.lower_margin	= 36,



	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(512),

};

#endif



static void __init assabet_init(void)

{

	/*
@@ -249,6 +284,11 @@ static void __init assabet_init(void) 
#endif

	}



#ifndef ASSABET_PAL_VIDEO

	sa11x0_register_lcd(&lq039q2ds54_info);

#else

	sa11x0_register_lcd(&pal_video);

#endif

	sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources,

			    ARRAY_SIZE(assabet_flash_resources));

	sa11x0_register_irda(&assabet_irda_data);

arch/arm/mach-sa1100/collie.c

+17 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/gpio.h>

#include <linux/pda_power.h>



#include <video/sa1100fb.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>
@@ -310,6 +312,20 @@ static struct resource collie_flash_resources[] = { 
	}

};



static struct sa1100fb_mach_info collie_lcd_info = {

	.pixclock	= 171521,	.bpp		= 16,

	.xres		= 320,		.yres		= 240,



	.hsync_len	= 5,		.vsync_len	= 1,

	.left_margin	= 11,		.upper_margin	= 2,

	.right_margin	= 30,		.lower_margin	= 0,



	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,



	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),

};



static void __init collie_init(void)

{

	int ret = 0;
@@ -348,6 +364,7 @@ static void __init collie_init(void) 
		printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");

	}



	sa11x0_register_lcd(&collie_lcd_info);

	sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,

			    ARRAY_SIZE(collie_flash_resources));

	sa11x0_register_mcp(&collie_mcp_data);

arch/arm/mach-sa1100/generic.c

+7 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/ioport.h>

#include <linux/platform_device.h>



#include <video/sa1100fb.h>



#include <asm/div64.h>

#include <mach/hardware.h>

#include <asm/system.h>
@@ -294,6 +296,11 @@ static struct platform_device sa11x0fb_device = { 
	.resource	= sa11x0fb_resources,

};



void sa11x0_register_lcd(struct sa1100fb_mach_info *inf)

{

	sa11x0_register_device(&sa11x0fb_device, inf);

}



static struct platform_device sa11x0pcmcia_device = {

	.name		= "sa11x0-pcmcia",

	.id		= -1,
@@ -356,7 +363,6 @@ static struct platform_device *sa11x0_devices[] __initdata = { 
	&sa11x0uart3_device,

	&sa11x0ssp_device,

	&sa11x0pcmcia_device,

	&sa11x0fb_device,

	&sa11x0rtc_device,

};

arch/arm/mach-sa1100/generic.h

+3 −0
Original line number Diff line number Diff line
@@ -40,3 +40,6 @@ void sa11x0_register_irda(struct irda_platform_data *irda); 


struct mcp_plat_data;

void sa11x0_register_mcp(struct mcp_plat_data *data);



struct sa1100fb_mach_info;

void sa11x0_register_lcd(struct sa1100fb_mach_info *inf);

arch/arm/mach-sa1100/h3100.c

+20 −2
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/kernel.h>

#include <linux/gpio.h>



#include <video/sa1100fb.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/irda.h>
@@ -36,13 +38,26 @@ static void h3100_lcd_power(int enable) 
	}

}



static struct sa1100fb_mach_info h3100_lcd_info = {

	.pixclock	= 406977, 	.bpp		= 4,

	.xres		= 320,		.yres		= 240,



	.hsync_len	= 26,		.vsync_len	= 41,

	.left_margin	= 4,		.upper_margin	= 0,

	.right_margin	= 4,		.lower_margin	= 0,



	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,

	.cmap_greyscale	= 1,

	.cmap_inverse	= 1,



	.lccr0		= LCCR0_Mono | LCCR0_4PixMono | LCCR0_Sngl | LCCR0_Pas,

	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),

};



static void __init h3100_map_io(void)

{

	h3xxx_map_io();



	sa1100fb_lcd_power = h3100_lcd_power;



	/* Older bootldrs put GPIO2-9 in alternate mode on the

	   assumption that they are used for video */

	GAFR &= ~0x000001fb;
@@ -80,6 +95,9 @@ static void __init h3100_mach_init(void) 
{

	h3xxx_init_gpio(h3100_default_gpio, ARRAY_SIZE(h3100_default_gpio));

	h3xxx_mach_init();



	sa1100fb_lcd_power = h3100_lcd_power;

	sa11x0_register_lcd(&h3100_lcd_info);

	sa11x0_register_irda(&h3100_irda_data);

}