diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 5bba5255b119..5736c987c80d 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -157,6 +157,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
157 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, | 157 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, |
158 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); | 158 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); |
159 | 159 | ||
160 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
160 | /* If battery is low. limit backlight intensity to save power. */ | 161 | /* If battery is low. limit backlight intensity to save power. */ |
161 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | 162 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) |
162 | && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) || | 163 | && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) || |
@@ -169,6 +170,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
169 | sharpsl_pm.machinfo->backlight_limit(0); | 170 | sharpsl_pm.machinfo->backlight_limit(0); |
170 | sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT; | 171 | sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT; |
171 | } | 172 | } |
173 | #endif | ||
172 | 174 | ||
173 | /* Suspend if critical battery level */ | 175 | /* Suspend if critical battery level */ |
174 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | 176 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) |
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 0a85f706e887..ae91c4b1135c 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -204,7 +204,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { | |||
204 | .read_devdata = corgipm_read_devdata, | 204 | .read_devdata = corgipm_read_devdata, |
205 | .charger_wakeup = corgi_charger_wakeup, | 205 | .charger_wakeup = corgi_charger_wakeup, |
206 | .should_wakeup = corgi_should_wakeup, | 206 | .should_wakeup = corgi_should_wakeup, |
207 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
207 | .backlight_limit = corgibl_limit_intensity, | 208 | .backlight_limit = corgibl_limit_intensity, |
209 | #endif | ||
208 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 210 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
209 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 211 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
210 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, | 212 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 23f050feb208..48396f4eb265 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -207,7 +207,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { | |||
207 | .read_devdata = spitzpm_read_devdata, | 207 | .read_devdata = spitzpm_read_devdata, |
208 | .charger_wakeup = spitz_charger_wakeup, | 208 | .charger_wakeup = spitz_charger_wakeup, |
209 | .should_wakeup = spitz_should_wakeup, | 209 | .should_wakeup = spitz_should_wakeup, |
210 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
210 | .backlight_limit = corgibl_limit_intensity, | 211 | .backlight_limit = corgibl_limit_intensity, |
212 | #endif | ||
211 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 213 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
212 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 214 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
213 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, | 215 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, |