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

Commit 0ba01ebc authored by Pavel Machek's avatar Pavel Machek Committed by Eric Miao
Browse files

[ARM] pxa/zaurus: rename spitz_battery_levels_* to sharpsl_* 



Battery power levels are shared between spitz and corgi, rename
variable to reflect it.

Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent b64b0b76

arch/arm/mach-pxa/corgi_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -214,8 +214,8 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { 
	.fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,

	.fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,

	.bat_levels       = 40,

	.bat_levels_noac  = spitz_battery_levels_noac,

	.bat_levels_acin  = spitz_battery_levels_acin,

	.bat_levels_noac  = sharpsl_battery_levels_noac,

	.bat_levels_acin  = sharpsl_battery_levels_acin,

	.status_high_acin = 188,

	.status_low_acin  = 178,

	.status_high_noac = 185,

arch/arm/mach-pxa/sharpsl.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ void corgi_lcdtg_hw_init(int mode); 
#define MAX1111_BATT_TEMP   2u

#define MAX1111_ACIN_VOLT   6u



extern struct battery_thresh spitz_battery_levels_acin[];

extern struct battery_thresh spitz_battery_levels_noac[];

extern struct battery_thresh sharpsl_battery_levels_acin[];

extern struct battery_thresh sharpsl_battery_levels_noac[];

int sharpsl_pm_pxa_read_max1111(int channel);

arch/arm/mach-pxa/sharpsl_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger); 






struct battery_thresh spitz_battery_levels_acin[] = {

struct battery_thresh sharpsl_battery_levels_acin[] = {

	{ 213, 100},

	{ 212,  98},

	{ 211,  95},
@@ -121,7 +121,7 @@ struct battery_thresh spitz_battery_levels_acin[] = { 
	{   0,   0},

};



struct battery_thresh  spitz_battery_levels_noac[] = {

struct battery_thresh sharpsl_battery_levels_noac[] = {

	{ 213, 100},

	{ 212,  98},

	{ 211,  95},

arch/arm/mach-pxa/spitz_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -208,8 +208,8 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { 
	.fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,

	.fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,

	.bat_levels       = 40,

	.bat_levels_noac  = spitz_battery_levels_noac,

	.bat_levels_acin  = spitz_battery_levels_acin,

	.bat_levels_noac  = sharpsl_battery_levels_noac,

	.bat_levels_acin  = sharpsl_battery_levels_acin,

	.status_high_acin = 188,

	.status_low_acin  = 178,

	.status_high_noac = 185,