diff options
author | Pavel Machek <pavel@ucw.cz> | 2009-10-22 16:16:34 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:03:01 -0500 |
commit | 0ba01ebcb39aeb27c5a861c80e0b38634d0cb457 (patch) | |
tree | 287f6c1cbc88b6b6a2580991ca4156e3417fa2b7 | |
parent | b64b0b76cd90406f5411dc29308b9bb83180bfd6 (diff) |
[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: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/sharpsl.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index a093282fe4db..d4a0733e905b 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -214,8 +214,8 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { | |||
214 | .fatal_acin_volt = SHARPSL_FATAL_ACIN_VOLT, | 214 | .fatal_acin_volt = SHARPSL_FATAL_ACIN_VOLT, |
215 | .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT, | 215 | .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT, |
216 | .bat_levels = 40, | 216 | .bat_levels = 40, |
217 | .bat_levels_noac = spitz_battery_levels_noac, | 217 | .bat_levels_noac = sharpsl_battery_levels_noac, |
218 | .bat_levels_acin = spitz_battery_levels_acin, | 218 | .bat_levels_acin = sharpsl_battery_levels_acin, |
219 | .status_high_acin = 188, | 219 | .status_high_acin = 188, |
220 | .status_low_acin = 178, | 220 | .status_low_acin = 178, |
221 | .status_high_noac = 185, | 221 | .status_high_noac = 185, |
diff --git a/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h index 55259f4756c8..1439785d3979 100644 --- a/arch/arm/mach-pxa/sharpsl.h +++ b/arch/arm/mach-pxa/sharpsl.h | |||
@@ -42,8 +42,8 @@ void corgi_lcdtg_hw_init(int mode); | |||
42 | #define MAX1111_BATT_TEMP 2u | 42 | #define MAX1111_BATT_TEMP 2u |
43 | #define MAX1111_ACIN_VOLT 6u | 43 | #define MAX1111_ACIN_VOLT 6u |
44 | 44 | ||
45 | extern struct battery_thresh spitz_battery_levels_acin[]; | 45 | extern struct battery_thresh sharpsl_battery_levels_acin[]; |
46 | extern struct battery_thresh spitz_battery_levels_noac[]; | 46 | extern struct battery_thresh sharpsl_battery_levels_noac[]; |
47 | int sharpsl_pm_pxa_read_max1111(int channel); | 47 | int sharpsl_pm_pxa_read_max1111(int channel); |
48 | 48 | ||
49 | 49 | ||
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index dc3907f7986c..67229a1ef55c 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -78,7 +78,7 @@ DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger); | |||
78 | 78 | ||
79 | 79 | ||
80 | 80 | ||
81 | struct battery_thresh spitz_battery_levels_acin[] = { | 81 | struct battery_thresh sharpsl_battery_levels_acin[] = { |
82 | { 213, 100}, | 82 | { 213, 100}, |
83 | { 212, 98}, | 83 | { 212, 98}, |
84 | { 211, 95}, | 84 | { 211, 95}, |
@@ -121,7 +121,7 @@ struct battery_thresh spitz_battery_levels_acin[] = { | |||
121 | { 0, 0}, | 121 | { 0, 0}, |
122 | }; | 122 | }; |
123 | 123 | ||
124 | struct battery_thresh spitz_battery_levels_noac[] = { | 124 | struct battery_thresh sharpsl_battery_levels_noac[] = { |
125 | { 213, 100}, | 125 | { 213, 100}, |
126 | { 212, 98}, | 126 | { 212, 98}, |
127 | { 211, 95}, | 127 | { 211, 95}, |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 60bfaff172c3..fc5a70c40358 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -208,8 +208,8 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { | |||
208 | .fatal_acin_volt = SHARPSL_FATAL_ACIN_VOLT, | 208 | .fatal_acin_volt = SHARPSL_FATAL_ACIN_VOLT, |
209 | .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT, | 209 | .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT, |
210 | .bat_levels = 40, | 210 | .bat_levels = 40, |
211 | .bat_levels_noac = spitz_battery_levels_noac, | 211 | .bat_levels_noac = sharpsl_battery_levels_noac, |
212 | .bat_levels_acin = spitz_battery_levels_acin, | 212 | .bat_levels_acin = sharpsl_battery_levels_acin, |
213 | .status_high_acin = 188, | 213 | .status_high_acin = 188, |
214 | .status_low_acin = 178, | 214 | .status_low_acin = 178, |
215 | .status_high_noac = 185, | 215 | .status_high_noac = 185, |