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

Commit 086ada54 authored by Russell King's avatar Russell King
Browse files

FB: sa1100: remove global sa1100fb_.*_power function pointers 



Now that we have platform data contained within the individual board
code, we can get rid of the global function pointers, placing them
inside the platform data instead.

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

arch/arm/mach-sa1100/assabet.c

+60 −30
Original line number Original line Diff line number Diff line
@@ -71,33 +71,6 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val) 




EXPORT_SYMBOL(ASSABET_BCR_frob);

EXPORT_SYMBOL(ASSABET_BCR_frob);





static void assabet_backlight_power(int on)

{

#ifndef ASSABET_PAL_VIDEO

	if (on)

		ASSABET_BCR_set(ASSABET_BCR_LIGHT_ON);

	else

#endif

		ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);

}



/*

 * Turn on/off the backlight.  When turning the backlight on,

 * we wait 500us after turning it on so we don't cause the

 * supplies to droop when we enable the LCD controller (and

 * cause a hard reset.)

 */

static void assabet_lcd_power(int on)

{

#ifndef ASSABET_PAL_VIDEO

	if (on) {

		ASSABET_BCR_set(ASSABET_BCR_LCD_ON);

		udelay(500);

	} else

#endif

		ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);

}







/*

/*

 * Assabet flash support code.

 * Assabet flash support code.
@@ -206,7 +179,49 @@ static struct mcp_plat_data assabet_mcp_data = { 
	.sclk_rate	= 11981000,

	.sclk_rate	= 11981000,

};

};





static void assabet_lcd_set_visual(u32 visual)

{

	u_int is_true_color = visual == FB_VISUAL_TRUECOLOR;



	if (machine_is_assabet()) {

#if 1		// phase 4 or newer Assabet's

		if (is_true_color)

			ASSABET_BCR_set(ASSABET_BCR_LCD_12RGB);

		else

			ASSABET_BCR_clear(ASSABET_BCR_LCD_12RGB);

#else

		// older Assabet's

		if (is_true_color)

			ASSABET_BCR_clear(ASSABET_BCR_LCD_12RGB);

		else

			ASSABET_BCR_set(ASSABET_BCR_LCD_12RGB);

#endif

	}

}



#ifndef ASSABET_PAL_VIDEO

#ifndef ASSABET_PAL_VIDEO

static void assabet_lcd_backlight_power(int on)

{

	if (on)

		ASSABET_BCR_set(ASSABET_BCR_LIGHT_ON);

	else

		ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);

}



/*

 * Turn on/off the backlight.  When turning the backlight on, we wait

 * 500us after turning it on so we don't cause the supplies to droop

 * when we enable the LCD controller (and cause a hard reset.)

 */

static void assabet_lcd_power(int on)

{

	if (on) {

		ASSABET_BCR_set(ASSABET_BCR_LCD_ON);

		udelay(500);

	} else

		ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);

}



/*

/*

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

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

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

 * takes an RGB666 signal, but we provide it with an RGB565 signal
@@ -224,8 +239,22 @@ static struct sa1100fb_mach_info lq039q2ds54_info = { 




	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

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

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



	.backlight_power = assabet_lcd_backlight_power,

	.lcd_power = assabet_lcd_power,

	.set_visual = assabet_lcd_set_visual,

};

};

#else

#else

static void assabet_pal_backlight_power(int on)

{

	ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);

}



static void assabet_pal_power(int on)

{

	ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);

}



static struct sa1100fb_mach_info pal_info = {

static struct sa1100fb_mach_info pal_info = {

	.pixclock	= 67797,	.bpp		= 16,

	.pixclock	= 67797,	.bpp		= 16,

	.xres		= 640,		.yres		= 512,

	.xres		= 640,		.yres		= 512,
@@ -236,6 +265,10 @@ static struct sa1100fb_mach_info pal_info = { 




	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

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

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



	.backlight_power = assabet_pal_backlight_power,

	.lcd_power = assabet_pal_power,

	.set_visual = assabet_lcd_set_visual,

};

};

#endif

#endif
@@ -266,9 +299,6 @@ static void __init assabet_init(void) 
	PPDR |= PPC_TXD3 | PPC_TXD1;

	PPDR |= PPC_TXD3 | PPC_TXD1;

	PPSR |= PPC_TXD3 | PPC_TXD1;

	PPSR |= PPC_TXD3 | PPC_TXD1;





	sa1100fb_lcd_power = assabet_lcd_power;

	sa1100fb_backlight_power = assabet_backlight_power;



	if (machine_has_neponset()) {

	if (machine_has_neponset()) {

		/*

		/*

		 * Angel sets this, but other bootloaders may not.

		 * Angel sets this, but other bootloaders may not.

arch/arm/mach-sa1100/generic.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -374,12 +374,6 @@ static int __init sa1100_init(void) 




arch_initcall(sa1100_init);

arch_initcall(sa1100_init);





void (*sa1100fb_backlight_power)(int on);

void (*sa1100fb_lcd_power)(int on);



EXPORT_SYMBOL(sa1100fb_backlight_power);

EXPORT_SYMBOL(sa1100fb_lcd_power);







/*

/*

 * Common I/O mapping:

 * Common I/O mapping:

arch/arm/mach-sa1100/generic.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -16,9 +16,6 @@ extern void sa11x0_restart(char, const char *); 
	mi->bank[__nr].start = (__start), \

	mi->bank[__nr].start = (__start), \

	mi->bank[__nr].size = (__size)

	mi->bank[__nr].size = (__size)





extern void (*sa1100fb_backlight_power)(int on);

extern void (*sa1100fb_lcd_power)(int on);



extern void sa1110_mb_enable(void);

extern void sa1110_mb_enable(void);

extern void sa1110_mb_disable(void);

extern void sa1110_mb_disable(void);

arch/arm/mach-sa1100/h3100.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ static struct sa1100fb_mach_info h3100_lcd_info = { 




	.lccr0		= LCCR0_Mono | LCCR0_4PixMono | LCCR0_Sngl | LCCR0_Pas,

	.lccr0		= LCCR0_Mono | LCCR0_4PixMono | LCCR0_Sngl | LCCR0_Pas,

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

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



	.lcd_power = h3100_lcd_power,

};

};





static void __init h3100_map_io(void)

static void __init h3100_map_io(void)
@@ -96,7 +98,6 @@ static void __init h3100_mach_init(void) 
	h3xxx_init_gpio(h3100_default_gpio, ARRAY_SIZE(h3100_default_gpio));

	h3xxx_init_gpio(h3100_default_gpio, ARRAY_SIZE(h3100_default_gpio));

	h3xxx_mach_init();

	h3xxx_mach_init();





	sa1100fb_lcd_power = h3100_lcd_power;

	sa11x0_register_lcd(&h3100_lcd_info);

	sa11x0_register_lcd(&h3100_lcd_info);

	sa11x0_register_irda(&h3100_irda_data);

	sa11x0_register_irda(&h3100_irda_data);

}

}

arch/arm/mach-sa1100/h3600.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -79,6 +79,8 @@ static struct sa1100fb_mach_info h3600_lcd_info = { 
	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),

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





	.rgb[RGB_16] = &h3600_rgb_16,

	.rgb[RGB_16] = &h3600_rgb_16,



	.lcd_power = h3600_lcd_power,

};

};
@@ -146,7 +148,6 @@ static void __init h3600_mach_init(void) 
	h3xxx_init_gpio(h3600_default_gpio, ARRAY_SIZE(h3600_default_gpio));

	h3xxx_init_gpio(h3600_default_gpio, ARRAY_SIZE(h3600_default_gpio));

	h3xxx_mach_init();

	h3xxx_mach_init();





	sa1100fb_lcd_power = h3600_lcd_power;

	sa11x0_register_lcd(&h3600_lcd_info);

	sa11x0_register_lcd(&h3600_lcd_info);

	sa11x0_register_irda(&h3600_irda_data);

	sa11x0_register_irda(&h3600_irda_data);

}

}