aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/power/lp8727_charger.c3
-rw-r--r--include/linux/platform_data/lp8727.h8
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index 717a97690dd4..c628224b7f58 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -149,7 +149,6 @@ static int lp8727_init_device(struct lp8727_chg *pchg)
149 if (ret) 149 if (ret)
150 return ret; 150 return ret;
151 151
152
153 val = LP8727_ID200_EN | LP8727_ADC_EN | LP8727_CP_EN; 152 val = LP8727_ID200_EN | LP8727_ADC_EN | LP8727_CP_EN;
154 ret = lp8727_write_byte(pchg, LP8727_CTRL1, val); 153 ret = lp8727_write_byte(pchg, LP8727_CTRL1, val);
155 if (ret) 154 if (ret)
@@ -162,6 +161,7 @@ static int lp8727_init_device(struct lp8727_chg *pchg)
162static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg) 161static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg)
163{ 162{
164 u8 val; 163 u8 val;
164
165 lp8727_read_byte(pchg, LP8727_STATUS1, &val); 165 lp8727_read_byte(pchg, LP8727_STATUS1, &val);
166 return val & LP8727_DCPORT; 166 return val & LP8727_DCPORT;
167} 167}
@@ -169,6 +169,7 @@ static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg)
169static int lp8727_is_usb_charger(struct lp8727_chg *pchg) 169static int lp8727_is_usb_charger(struct lp8727_chg *pchg)
170{ 170{
171 u8 val; 171 u8 val;
172
172 lp8727_read_byte(pchg, LP8727_STATUS1, &val); 173 lp8727_read_byte(pchg, LP8727_STATUS1, &val);
173 return val & LP8727_CHPORT; 174 return val & LP8727_CHPORT;
174} 175}
diff --git a/include/linux/platform_data/lp8727.h b/include/linux/platform_data/lp8727.h
index a8b8dbc418cc..47128a50e04e 100644
--- a/include/linux/platform_data/lp8727.h
+++ b/include/linux/platform_data/lp8727.h
@@ -38,7 +38,7 @@ enum lp8727_ichg {
38/** 38/**
39 * struct lp8727_chg_param 39 * struct lp8727_chg_param
40 * @eoc_level : end of charge level setting 40 * @eoc_level : end of charge level setting
41 * @ichg : charging current 41 * @ichg : charging current
42 */ 42 */
43struct lp8727_chg_param { 43struct lp8727_chg_param {
44 enum lp8727_eoc_level eoc_level; 44 enum lp8727_eoc_level eoc_level;
@@ -47,10 +47,10 @@ struct lp8727_chg_param {
47 47
48/** 48/**
49 * struct lp8727_platform_data 49 * struct lp8727_platform_data
50 * @get_batt_present : check battery status - exists or not 50 * @get_batt_present : check battery status - exists or not
51 * @get_batt_level : get battery voltage (mV) 51 * @get_batt_level : get battery voltage (mV)
52 * @get_batt_capacity : get battery capacity (%) 52 * @get_batt_capacity : get battery capacity (%)
53 * @get_batt_temp : get battery temperature 53 * @get_batt_temp : get battery temperature
54 * @ac : charging parameters for AC type charger 54 * @ac : charging parameters for AC type charger
55 * @usb : charging parameters for USB type charger 55 * @usb : charging parameters for USB type charger
56 * @debounce_msec : interrupt debounce time 56 * @debounce_msec : interrupt debounce time