diff options
Diffstat (limited to 'arch/arm/mach-pxa/spitz_pm.c')
-rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 724ffb030317..fc5a70c40358 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -103,7 +103,7 @@ static void spitz_presuspend(void) | |||
103 | PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); | 103 | PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); |
104 | PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC; | 104 | PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC; |
105 | PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); | 105 | PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); |
106 | PKSR = 0xffffffff; // clear | 106 | PKSR = 0xffffffff; /* clear */ |
107 | 107 | ||
108 | /* nRESET_OUT Disable */ | 108 | /* nRESET_OUT Disable */ |
109 | PSLR |= PSLR_SL_ROD; | 109 | PSLR |= PSLR_SL_ROD; |
@@ -149,7 +149,7 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm) | |||
149 | if (resume_on_alarm && (PEDR & PWER_RTC)) | 149 | if (resume_on_alarm && (PEDR & PWER_RTC)) |
150 | is_resume |= PWER_RTC; | 150 | is_resume |= PWER_RTC; |
151 | 151 | ||
152 | dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume); | 152 | dev_dbg(sharpsl_pm.dev, "is_resume: %x\n", is_resume); |
153 | return is_resume; | 153 | return is_resume; |
154 | } | 154 | } |
155 | 155 | ||
@@ -160,7 +160,7 @@ static unsigned long spitz_charger_wakeup(void) | |||
160 | 160 | ||
161 | unsigned long spitzpm_read_devdata(int type) | 161 | unsigned long spitzpm_read_devdata(int type) |
162 | { | 162 | { |
163 | switch(type) { | 163 | switch (type) { |
164 | case SHARPSL_STATUS_ACIN: | 164 | case SHARPSL_STATUS_ACIN: |
165 | return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0); | 165 | return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0); |
166 | case SHARPSL_STATUS_LOCK: | 166 | case SHARPSL_STATUS_LOCK: |
@@ -199,7 +199,7 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { | |||
199 | #if defined(CONFIG_LCD_CORGI) | 199 | #if defined(CONFIG_LCD_CORGI) |
200 | .backlight_limit = corgi_lcd_limit_intensity, | 200 | .backlight_limit = corgi_lcd_limit_intensity, |
201 | #elif defined(CONFIG_BACKLIGHT_CORGI) | 201 | #elif defined(CONFIG_BACKLIGHT_CORGI) |
202 | .backlight_limit = corgibl_limit_intensity, | 202 | .backlight_limit = corgibl_limit_intensity, |
203 | #endif | 203 | #endif |
204 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 204 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
205 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 205 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
@@ -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, |
@@ -241,7 +241,7 @@ static int __devinit spitzpm_init(void) | |||
241 | 241 | ||
242 | static void spitzpm_exit(void) | 242 | static void spitzpm_exit(void) |
243 | { | 243 | { |
244 | platform_device_unregister(spitzpm_device); | 244 | platform_device_unregister(spitzpm_device); |
245 | } | 245 | } |
246 | 246 | ||
247 | module_init(spitzpm_init); | 247 | module_init(spitzpm_init); |