diff options
author | Kim, Milo <Milo.Kim@ti.com> | 2012-03-23 18:02:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:35 -0400 |
commit | 8544d0e3f6cd2d12af6d68992b15a6b3f5d35c2e (patch) | |
tree | ae3e76f1dd68ab058d50a3176cce259dbb9b84f7 /drivers/leds/leds-lm3530.c | |
parent | bb982009d3850759d3f4a4c853f9c456c48b6c2d (diff) |
leds-lm3530: remove LM3530_ALS_ZONE_REG code
LM3530_ALS_ZONE_REG is read-only register.
Writing this register is not necessary.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/leds/leds-lm3530.c')
-rw-r--r-- | drivers/leds/leds-lm3530.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index a889311eead1..d70c87901661 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #define LM3530_GEN_CONFIG 0x10 | 26 | #define LM3530_GEN_CONFIG 0x10 |
27 | #define LM3530_ALS_CONFIG 0x20 | 27 | #define LM3530_ALS_CONFIG 0x20 |
28 | #define LM3530_BRT_RAMP_RATE 0x30 | 28 | #define LM3530_BRT_RAMP_RATE 0x30 |
29 | #define LM3530_ALS_ZONE_REG 0x40 | ||
30 | #define LM3530_ALS_IMP_SELECT 0x41 | 29 | #define LM3530_ALS_IMP_SELECT 0x41 |
31 | #define LM3530_BRT_CTRL_REG 0xA0 | 30 | #define LM3530_BRT_CTRL_REG 0xA0 |
32 | #define LM3530_ALS_ZB0_REG 0x60 | 31 | #define LM3530_ALS_ZB0_REG 0x60 |
@@ -38,7 +37,7 @@ | |||
38 | #define LM3530_ALS_Z2T_REG 0x72 | 37 | #define LM3530_ALS_Z2T_REG 0x72 |
39 | #define LM3530_ALS_Z3T_REG 0x73 | 38 | #define LM3530_ALS_Z3T_REG 0x73 |
40 | #define LM3530_ALS_Z4T_REG 0x74 | 39 | #define LM3530_ALS_Z4T_REG 0x74 |
41 | #define LM3530_REG_MAX 15 | 40 | #define LM3530_REG_MAX 14 |
42 | 41 | ||
43 | /* General Control Register */ | 42 | /* General Control Register */ |
44 | #define LM3530_EN_I2C_SHIFT (0) | 43 | #define LM3530_EN_I2C_SHIFT (0) |
@@ -118,7 +117,6 @@ static const u8 lm3530_reg[LM3530_REG_MAX] = { | |||
118 | LM3530_GEN_CONFIG, | 117 | LM3530_GEN_CONFIG, |
119 | LM3530_ALS_CONFIG, | 118 | LM3530_ALS_CONFIG, |
120 | LM3530_BRT_RAMP_RATE, | 119 | LM3530_BRT_RAMP_RATE, |
121 | LM3530_ALS_ZONE_REG, | ||
122 | LM3530_ALS_IMP_SELECT, | 120 | LM3530_ALS_IMP_SELECT, |
123 | LM3530_BRT_CTRL_REG, | 121 | LM3530_BRT_CTRL_REG, |
124 | LM3530_ALS_ZB0_REG, | 122 | LM3530_ALS_ZB0_REG, |
@@ -217,18 +215,17 @@ static int lm3530_init_registers(struct lm3530_data *drvdata) | |||
217 | reg_val[0] = gen_config; /* LM3530_GEN_CONFIG */ | 215 | reg_val[0] = gen_config; /* LM3530_GEN_CONFIG */ |
218 | reg_val[1] = als_config; /* LM3530_ALS_CONFIG */ | 216 | reg_val[1] = als_config; /* LM3530_ALS_CONFIG */ |
219 | reg_val[2] = brt_ramp; /* LM3530_BRT_RAMP_RATE */ | 217 | reg_val[2] = brt_ramp; /* LM3530_BRT_RAMP_RATE */ |
220 | reg_val[3] = 0x00; /* LM3530_ALS_ZONE_REG */ | 218 | reg_val[3] = als_imp_sel; /* LM3530_ALS_IMP_SELECT */ |
221 | reg_val[4] = als_imp_sel; /* LM3530_ALS_IMP_SELECT */ | 219 | reg_val[4] = brightness; /* LM3530_BRT_CTRL_REG */ |
222 | reg_val[5] = brightness; /* LM3530_BRT_CTRL_REG */ | 220 | reg_val[5] = zones[0]; /* LM3530_ALS_ZB0_REG */ |
223 | reg_val[6] = zones[0]; /* LM3530_ALS_ZB0_REG */ | 221 | reg_val[6] = zones[1]; /* LM3530_ALS_ZB1_REG */ |
224 | reg_val[7] = zones[1]; /* LM3530_ALS_ZB1_REG */ | 222 | reg_val[7] = zones[2]; /* LM3530_ALS_ZB2_REG */ |
225 | reg_val[8] = zones[2]; /* LM3530_ALS_ZB2_REG */ | 223 | reg_val[8] = zones[3]; /* LM3530_ALS_ZB3_REG */ |
226 | reg_val[9] = zones[3]; /* LM3530_ALS_ZB3_REG */ | 224 | reg_val[9] = LM3530_DEF_ZT_0; /* LM3530_ALS_Z0T_REG */ |
227 | reg_val[10] = LM3530_DEF_ZT_0; /* LM3530_ALS_Z0T_REG */ | 225 | reg_val[10] = LM3530_DEF_ZT_1; /* LM3530_ALS_Z1T_REG */ |
228 | reg_val[11] = LM3530_DEF_ZT_1; /* LM3530_ALS_Z1T_REG */ | 226 | reg_val[11] = LM3530_DEF_ZT_2; /* LM3530_ALS_Z2T_REG */ |
229 | reg_val[12] = LM3530_DEF_ZT_2; /* LM3530_ALS_Z2T_REG */ | 227 | reg_val[12] = LM3530_DEF_ZT_3; /* LM3530_ALS_Z3T_REG */ |
230 | reg_val[13] = LM3530_DEF_ZT_3; /* LM3530_ALS_Z3T_REG */ | 228 | reg_val[13] = LM3530_DEF_ZT_4; /* LM3530_ALS_Z4T_REG */ |
231 | reg_val[14] = LM3530_DEF_ZT_4; /* LM3530_ALS_Z4T_REG */ | ||
232 | 229 | ||
233 | if (!drvdata->enable) { | 230 | if (!drvdata->enable) { |
234 | ret = regulator_enable(drvdata->regulator); | 231 | ret = regulator_enable(drvdata->regulator); |