aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorRupesh Kumar <rupesh.kumar@stericsson.com>2012-10-10 05:26:41 -0400
committerLee Jones <lee.jones@linaro.org>2013-03-06 23:35:53 -0500
commitf70dfdec99877fa716f71633a67d7ba3dfab1c5f (patch)
tree02c504667e5244613c98569accfdfb5cea2a5967 /drivers/power
parent261c5136fa988008387e31cf5381dc5b088e2a17 (diff)
pm2301-charger: Removed unused code from PM2301 driver
Some of the headers and defines accrued over time are no longer in use. Let's take the opportunity to remove a few of them. Signed-off-by: Rupesh Kumar <rupesh.kumar@stericsson.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/pm2301_charger.c5
-rw-r--r--drivers/power/pm2301_charger.h22
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index fde5805fdab0..87ddc658413f 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -16,16 +16,12 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <linux/platform_device.h> 17#include <linux/platform_device.h>
18#include <linux/power_supply.h> 18#include <linux/power_supply.h>
19#include <linux/completion.h>
20#include <linux/regulator/consumer.h> 19#include <linux/regulator/consumer.h>
21#include <linux/err.h> 20#include <linux/err.h>
22#include <linux/i2c.h> 21#include <linux/i2c.h>
23#include <linux/workqueue.h> 22#include <linux/workqueue.h>
24#include <linux/kobject.h>
25#include <linux/mfd/abx500.h>
26#include <linux/mfd/abx500/ab8500.h> 23#include <linux/mfd/abx500/ab8500.h>
27#include <linux/mfd/abx500/ab8500-bm.h> 24#include <linux/mfd/abx500/ab8500-bm.h>
28#include <linux/mfd/abx500/ab8500-gpadc.h>
29#include <linux/mfd/abx500/ux500_chargalg.h> 25#include <linux/mfd/abx500/ux500_chargalg.h>
30#include <linux/pm2301_charger.h> 26#include <linux/pm2301_charger.h>
31#include <linux/gpio.h> 27#include <linux/gpio.h>
@@ -1018,7 +1014,6 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
1018 1014
1019 /* get parent data */ 1015 /* get parent data */
1020 pm2->dev = &i2c_client->dev; 1016 pm2->dev = &i2c_client->dev;
1021 pm2->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
1022 1017
1023 pm2->pm2_int = &pm2xxx_int; 1018 pm2->pm2_int = &pm2xxx_int;
1024 1019
diff --git a/drivers/power/pm2301_charger.h b/drivers/power/pm2301_charger.h
index fad1f387f8f4..8ce3cc0195df 100644
--- a/drivers/power/pm2301_charger.h
+++ b/drivers/power/pm2301_charger.h
@@ -9,27 +9,6 @@
9#ifndef PM2301_CHARGER_H 9#ifndef PM2301_CHARGER_H
10#define PM2301_CHARGER_H 10#define PM2301_CHARGER_H
11 11
12#define MAIN_WDOG_ENA 0x01
13#define MAIN_WDOG_KICK 0x02
14#define MAIN_WDOG_DIS 0x00
15#define CHARG_WD_KICK 0x01
16#define MAIN_CH_ENA 0x01
17#define MAIN_CH_NO_OVERSHOOT_ENA_N 0x02
18#define MAIN_CH_DET 0x01
19#define MAIN_CH_CV_ON 0x04
20#define OTP_ENABLE_WD 0x01
21
22#define MAIN_CH_INPUT_CURR_SHIFT 4
23
24#define LED_INDICATOR_PWM_ENA 0x01
25#define LED_INDICATOR_PWM_DIS 0x00
26#define LED_IND_CUR_5MA 0x04
27#define LED_INDICATOR_PWM_DUTY_252_256 0xBF
28
29/* HW failure constants */
30#define MAIN_CH_TH_PROT 0x02
31#define MAIN_CH_NOK 0x01
32
33/* Watchdog timeout constant */ 12/* Watchdog timeout constant */
34#define WD_TIMER 0x30 /* 4min */ 13#define WD_TIMER 0x30 /* 4min */
35#define WD_KICK_INTERVAL (30 * HZ) 14#define WD_KICK_INTERVAL (30 * HZ)
@@ -495,7 +474,6 @@ struct pm2xxx_charger {
495 int failure_input_ovv; 474 int failure_input_ovv;
496 unsigned int lpn_pin; 475 unsigned int lpn_pin;
497 struct pm2xxx_interrupts *pm2_int; 476 struct pm2xxx_interrupts *pm2_int;
498 struct ab8500_gpadc *gpadc;
499 struct regulator *regu; 477 struct regulator *regu;
500 struct pm2xxx_bm_data *bat; 478 struct pm2xxx_bm_data *bat;
501 struct mutex lock; 479 struct mutex lock;