Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

[~andy/linux] / drivers / leds / leds-lm3530.c

diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index a889311eead14791dc37cf75dea28c9a9f10b903..968fd5fef4fc5e2871dc7b5539f80b6b5328ea1b 100644 (file)
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -26,7 +26,6 @@
 #define LM3530_GEN_CONFIG              0x10
 #define LM3530_ALS_CONFIG              0x20
 #define LM3530_BRT_RAMP_RATE           0x30
-#define LM3530_ALS_ZONE_REG            0x40
 #define LM3530_ALS_IMP_SELECT          0x41
 #define LM3530_BRT_CTRL_REG            0xA0
 #define LM3530_ALS_ZB0_REG             0x60
@@ -38,7 +37,7 @@
 #define LM3530_ALS_Z2T_REG             0x72
 #define LM3530_ALS_Z3T_REG             0x73
 #define LM3530_ALS_Z4T_REG             0x74
-#define LM3530_REG_MAX                 15
+#define LM3530_REG_MAX                 14
 
 /* General Control Register */
 #define LM3530_EN_I2C_SHIFT            (0)
@@ -118,7 +117,6 @@ static const u8 lm3530_reg[LM3530_REG_MAX] = {
        LM3530_GEN_CONFIG,
        LM3530_ALS_CONFIG,
        LM3530_BRT_RAMP_RATE,
-       LM3530_ALS_ZONE_REG,
        LM3530_ALS_IMP_SELECT,
        LM3530_BRT_CTRL_REG,
        LM3530_ALS_ZB0_REG,
@@ -155,28 +153,35 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
        u8 reg_val[LM3530_REG_MAX];
        u8 zones[LM3530_ALS_ZB_MAX];
        u32 als_vmin, als_vmax, als_vstep;
-       struct lm3530_platform_data *pltfm = drvdata->pdata;
+       struct lm3530_platform_data *pdata = drvdata->pdata;
        struct i2c_client *client = drvdata->client;
-       struct lm3530_pwm_data *pwm = &pltfm->pwm_data;
+       struct lm3530_pwm_data *pwm = &pdata->pwm_data;
 
-       gen_config = (pltfm->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |
-                       ((pltfm->max_current & 7) << LM3530_MAX_CURR_SHIFT);
+       gen_config = (pdata->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |
+                       ((pdata->max_current & 7) << LM3530_MAX_CURR_SHIFT);
 
-       if (drvdata->mode == LM3530_BL_MODE_MANUAL ||
-           drvdata->mode == LM3530_BL_MODE_ALS)
-               gen_config |= (LM3530_ENABLE_I2C);
+       switch (drvdata->mode) {
+       case LM3530_BL_MODE_MANUAL:
+       case LM3530_BL_MODE_ALS:
+               gen_config |= LM3530_ENABLE_I2C;
+               break;
+       case LM3530_BL_MODE_PWM:
+               gen_config |= LM3530_ENABLE_PWM | LM3530_ENABLE_PWM_SIMPLE |
+                             (pdata->pwm_pol_hi << LM3530_PWM_POL_SHIFT);
+               break;
+       }
 
        if (drvdata->mode == LM3530_BL_MODE_ALS) {
-               if (pltfm->als_vmax == 0) {
-                       pltfm->als_vmin = 0;
-                       pltfm->als_vmax = LM3530_ALS_WINDOW_mV;
+               if (pdata->als_vmax == 0) {
+                       pdata->als_vmin = 0;
+                       pdata->als_vmax = LM3530_ALS_WINDOW_mV;
                }
 
-               als_vmin = pltfm->als_vmin;
-               als_vmax = pltfm->als_vmax;
+               als_vmin = pdata->als_vmin;
+               als_vmax = pdata->als_vmax;
 
                if ((als_vmax - als_vmin) > LM3530_ALS_WINDOW_mV)
-                       pltfm->als_vmax = als_vmax =
+                       pdata->als_vmax = als_vmax =
                                als_vmin + LM3530_ALS_WINDOW_mV;
 
                /* n zone boundary makes n+1 zones */
@@ -188,28 +193,23 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
                                        / 1000;
 
                als_config =
-                       (pltfm->als_avrg_time << LM3530_ALS_AVG_TIME_SHIFT) |
+                       (pdata->als_avrg_time << LM3530_ALS_AVG_TIME_SHIFT) |
                        (LM3530_ENABLE_ALS) |
-                       (pltfm->als_input_mode << LM3530_ALS_SEL_SHIFT);
+                       (pdata->als_input_mode << LM3530_ALS_SEL_SHIFT);
 
                als_imp_sel =
-                       (pltfm->als1_resistor_sel << LM3530_ALS1_IMP_SHIFT) |
-                       (pltfm->als2_resistor_sel << LM3530_ALS2_IMP_SHIFT);
+                       (pdata->als1_resistor_sel << LM3530_ALS1_IMP_SHIFT) |
+                       (pdata->als2_resistor_sel << LM3530_ALS2_IMP_SHIFT);
 
        }
 
-       if (drvdata->mode == LM3530_BL_MODE_PWM)
-               gen_config |= (LM3530_ENABLE_PWM) |
-                               (pltfm->pwm_pol_hi << LM3530_PWM_POL_SHIFT) |
-                               (LM3530_ENABLE_PWM_SIMPLE);
-
-       brt_ramp = (pltfm->brt_ramp_fall << LM3530_BRT_RAMP_FALL_SHIFT) |
-                       (pltfm->brt_ramp_rise << LM3530_BRT_RAMP_RISE_SHIFT);
+       brt_ramp = (pdata->brt_ramp_fall << LM3530_BRT_RAMP_FALL_SHIFT) |
+                       (pdata->brt_ramp_rise << LM3530_BRT_RAMP_RISE_SHIFT);
 
        if (drvdata->brightness)
                brightness = drvdata->brightness;
        else
-               brightness = drvdata->brightness = pltfm->brt_val;
+               brightness = drvdata->brightness = pdata->brt_val;
 
        if (brightness > drvdata->led_dev.max_brightness)
                brightness = drvdata->led_dev.max_brightness;
@@ -217,18 +217,17 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
        reg_val[0] = gen_config;        /* LM3530_GEN_CONFIG */
        reg_val[1] = als_config;        /* LM3530_ALS_CONFIG */
        reg_val[2] = brt_ramp;          /* LM3530_BRT_RAMP_RATE */
-       reg_val[3] = 0x00;              /* LM3530_ALS_ZONE_REG */
-       reg_val[4] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
-       reg_val[5] = brightness;        /* LM3530_BRT_CTRL_REG */
-       reg_val[6] = zones[0];          /* LM3530_ALS_ZB0_REG */
-       reg_val[7] = zones[1];          /* LM3530_ALS_ZB1_REG */
-       reg_val[8] = zones[2];          /* LM3530_ALS_ZB2_REG */
-       reg_val[9] = zones[3];          /* LM3530_ALS_ZB3_REG */
-       reg_val[10] = LM3530_DEF_ZT_0;  /* LM3530_ALS_Z0T_REG */
-       reg_val[11] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
-       reg_val[12] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
-       reg_val[13] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
-       reg_val[14] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
+       reg_val[3] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
+       reg_val[4] = brightness;        /* LM3530_BRT_CTRL_REG */
+       reg_val[5] = zones[0];          /* LM3530_ALS_ZB0_REG */
+       reg_val[6] = zones[1];          /* LM3530_ALS_ZB1_REG */
+       reg_val[7] = zones[2];          /* LM3530_ALS_ZB2_REG */
+       reg_val[8] = zones[3];          /* LM3530_ALS_ZB3_REG */
+       reg_val[9] = LM3530_DEF_ZT_0;   /* LM3530_ALS_Z0T_REG */
+       reg_val[10] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
+       reg_val[11] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
+       reg_val[12] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
+       reg_val[13] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
 
        if (!drvdata->enable) {
                ret = regulator_enable(drvdata->regulator);