Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330520
b: refs/heads/master
c: b9633ef
h: refs/heads/master
v: v3
  • Loading branch information
Kim, Milo authored and Anton Vorontsov committed Sep 21, 2012
1 parent 8183aba commit 340e264
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 18259cac98884522a46c24a73ef8d4879d824607
refs/heads/master: b9633ef1a9cdf4317d8c4a8db977485e2a8e1cb8
3 changes: 2 additions & 1 deletion trunk/drivers/power/lp8727_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ static int lp8727_init_device(struct lp8727_chg *pchg)
if (ret)
return ret;


val = LP8727_ID200_EN | LP8727_ADC_EN | LP8727_CP_EN;
ret = lp8727_write_byte(pchg, LP8727_CTRL1, val);
if (ret)
Expand All @@ -162,13 +161,15 @@ static int lp8727_init_device(struct lp8727_chg *pchg)
static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg)
{
u8 val;

lp8727_read_byte(pchg, LP8727_STATUS1, &val);
return val & LP8727_DCPORT;
}

static int lp8727_is_usb_charger(struct lp8727_chg *pchg)
{
u8 val;

lp8727_read_byte(pchg, LP8727_STATUS1, &val);
return val & LP8727_CHPORT;
}
Expand Down
8 changes: 4 additions & 4 deletions trunk/include/linux/platform_data/lp8727.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ enum lp8727_ichg {
/**
* struct lp8727_chg_param
* @eoc_level : end of charge level setting
* @ichg : charging current
* @ichg : charging current
*/
struct lp8727_chg_param {
enum lp8727_eoc_level eoc_level;
Expand All @@ -47,10 +47,10 @@ struct lp8727_chg_param {

/**
* struct lp8727_platform_data
* @get_batt_present : check battery status - exists or not
* @get_batt_level : get battery voltage (mV)
* @get_batt_present : check battery status - exists or not
* @get_batt_level : get battery voltage (mV)
* @get_batt_capacity : get battery capacity (%)
* @get_batt_temp : get battery temperature
* @get_batt_temp : get battery temperature
* @ac : charging parameters for AC type charger
* @usb : charging parameters for USB type charger
* @debounce_msec : interrupt debounce time
Expand Down

0 comments on commit 340e264

Please sign in to comment.