diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 01:11:53 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 01:11:53 +0200 |
| commit | 204bc44c67cc921481c99f895fe0c2772e4d58ef (patch) | |
| tree | d486622765ecb326d18de4ab20d33874a7725d4d | |
| parent | 3e7f9c14f9880ee2b865648e678c6eeb557d17c0 (diff) | |
| download | kernel_goldelico_gta04-204bc44c67cc921481c99f895fe0c2772e4d58ef.zip kernel_goldelico_gta04-204bc44c67cc921481c99f895fe0c2772e4d58ef.tar.gz kernel_goldelico_gta04-204bc44c67cc921481c99f895fe0c2772e4d58ef.tar.bz2 | |
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | drivers/power/twl4030_charger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index b3a3f3a..2df77dd 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -217,20 +217,20 @@ static int twl4030_charger_set_max_current(int cur) if (cur > 0x3ff) return -EINVAL; /* disable write protection for one write access for BCIIREF */ - status = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, 0xE7, + status = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0xE7, TWL4030_BCIMFKEY); if (status < 0) return status; - status = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, + status = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, (cur & 0x100) ? 3 : 2, TWL4030_BCIIREF2); if (status < 0) return status; /* disable write protection for one write access for BCIIREF */ - status = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, 0xE7, + status = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0xE7, TWL4030_BCIMFKEY); if (status < 0) return status; - status = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, cur & 0xff, + status = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, cur & 0xff, TWL4030_BCIIREF1); return status; } |