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

Commit 5cbff960 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao
Browse files

[ARM] corgi_lcd: fix simultaneous compilation with corgi_bl 



corgi_lcd has symbol conflict with corgi_bl driver.
Fix it by renaming common symbol in new corgi_lcd driver.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent b6e642e4

arch/arm/mach-pxa/corgi_pm.c

+3 −1
Original line number Diff line number Diff line
@@ -204,7 +204,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { 
	.read_devdata    = corgipm_read_devdata,

	.charger_wakeup  = corgi_charger_wakeup,

	.should_wakeup   = corgi_should_wakeup,

#ifdef CONFIG_BACKLIGHT_CORGI

#if defined(CONFIG_LCD_CORGI)

	.backlight_limit = corgi_lcd_limit_intensity,

#elif defined(CONFIG_BACKLIGHT_CORGI)

	.backlight_limit = corgibl_limit_intensity,

#endif

	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,

arch/arm/mach-pxa/include/mach/sharpsl.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ struct corgits_machinfo { 
 * SharpSL Backlight

 */

extern void corgibl_limit_intensity(int limit);

extern void corgi_lcd_limit_intensity(int limit);





/*

arch/arm/mach-pxa/spitz_pm.c

+3 −1
Original line number Diff line number Diff line
@@ -198,7 +198,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { 
	.read_devdata     = spitzpm_read_devdata,

	.charger_wakeup   = spitz_charger_wakeup,

	.should_wakeup    = spitz_should_wakeup,

#ifdef CONFIG_BACKLIGHT_CORGI

#if defined(CONFIG_LCD_CORGI)

	.backlight_limit = corgi_lcd_limit_intensity,

#elif defined(CONFIG_BACKLIGHT_CORGI)

        .backlight_limit  = corgibl_limit_intensity,

#endif

	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,

drivers/video/backlight/corgi_lcd.c

+2 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd) 
	return corgi_bl_set_intensity(lcd, intensity);

}



void corgibl_limit_intensity(int limit)

void corgi_lcd_limit_intensity(int limit)

{

	if (limit)

		corgibl_flags |= CORGIBL_BATTLOW;
@@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit) 


	backlight_update_status(the_corgi_lcd->bl_dev);

}

EXPORT_SYMBOL(corgibl_limit_intensity);

EXPORT_SYMBOL(corgi_lcd_limit_intensity);



static struct backlight_ops corgi_bl_ops = {

	.get_brightness	= corgi_bl_get_intensity,