Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6335f8fa authored by Kim, Milo's avatar Kim, Milo Committed by Linus Torvalds
Browse files

drivers/leds/leds-lm3530.c: simplify als configuration on initialization 



For better code readability, ALS code is moved to new a function -
lm3530_als_configure()

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Bryan Wu <bryan.wu@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8035a502

drivers/leds/leds-lm3530.c

+58 −42
Original line number Diff line number Diff line
@@ -113,6 +113,18 @@ struct lm3530_data { 
	bool enable;

};



/*

 * struct lm3530_als_data

 * @config  : value of ALS configuration register

 * @imp_sel : value of ALS resistor select register

 * @zone    : values of ALS ZB(Zone Boundary) registers

 */

struct lm3530_als_data {

	u8 config;

	u8 imp_sel;

	u8 zones[LM3530_ALS_ZB_MAX];

};



static const u8 lm3530_reg[LM3530_REG_MAX] = {

	LM3530_GEN_CONFIG,

	LM3530_ALS_CONFIG,
@@ -141,37 +153,12 @@ static int lm3530_get_mode_from_str(const char *str) 
	return -1;

}



static int lm3530_init_registers(struct lm3530_data *drvdata)

static void lm3530_als_configure(struct lm3530_platform_data *pdata,

				struct lm3530_als_data *als)

{

	int ret = 0;

	int i;

	u8 gen_config;

	u8 als_config = 0;

	u8 brt_ramp;

	u8 als_imp_sel = 0;

	u8 brightness;

	u8 reg_val[LM3530_REG_MAX];

	u8 zones[LM3530_ALS_ZB_MAX];

	u32 als_vmin, als_vmax, als_vstep;

	struct lm3530_platform_data *pdata = drvdata->pdata;

	struct i2c_client *client = drvdata->client;

	struct lm3530_pwm_data *pwm = &pdata->pwm_data;



	gen_config = (pdata->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |

			((pdata->max_current & 7) << LM3530_MAX_CURR_SHIFT);



	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 (pdata->als_vmax == 0) {

		pdata->als_vmin = 0;

		pdata->als_vmax = LM3530_ALS_WINDOW_mV;
@@ -181,26 +168,55 @@ static int lm3530_init_registers(struct lm3530_data *drvdata) 
	als_vmax = pdata->als_vmax;



	if ((als_vmax - als_vmin) > LM3530_ALS_WINDOW_mV)

			pdata->als_vmax = als_vmax =

				als_vmin + LM3530_ALS_WINDOW_mV;

		pdata->als_vmax = als_vmax = als_vmin + LM3530_ALS_WINDOW_mV;



	/* n zone boundary makes n+1 zones */

	als_vstep = (als_vmax - als_vmin) / (LM3530_ALS_ZB_MAX + 1);



	for (i = 0; i < LM3530_ALS_ZB_MAX; i++)

			zones[i] = (((als_vmin + LM3530_ALS_OFFSET_mV) +

					als_vstep + (i * als_vstep)) * LED_FULL)

					/ 1000;

		als->zones[i] = (((als_vmin + LM3530_ALS_OFFSET_mV) +

			als_vstep + (i * als_vstep)) * LED_FULL) / 1000;



		als_config =

	als->config =

		(pdata->als_avrg_time << LM3530_ALS_AVG_TIME_SHIFT) |

		(LM3530_ENABLE_ALS) |

		(pdata->als_input_mode << LM3530_ALS_SEL_SHIFT);



		als_imp_sel =

	als->imp_sel =

		(pdata->als1_resistor_sel << LM3530_ALS1_IMP_SHIFT) |

		(pdata->als2_resistor_sel << LM3530_ALS2_IMP_SHIFT);

}



static int lm3530_init_registers(struct lm3530_data *drvdata)

{

	int ret = 0;

	int i;

	u8 gen_config;

	u8 brt_ramp;

	u8 brightness;

	u8 reg_val[LM3530_REG_MAX];

	struct lm3530_platform_data *pdata = drvdata->pdata;

	struct i2c_client *client = drvdata->client;

	struct lm3530_pwm_data *pwm = &pdata->pwm_data;

	struct lm3530_als_data als;



	memset(&als, 0, sizeof(struct lm3530_als_data));



	gen_config = (pdata->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |

			((pdata->max_current & 7) << LM3530_MAX_CURR_SHIFT);



	switch (drvdata->mode) {

	case LM3530_BL_MODE_MANUAL:

		gen_config |= LM3530_ENABLE_I2C;

		break;

	case LM3530_BL_MODE_ALS:

		gen_config |= LM3530_ENABLE_I2C;

		lm3530_als_configure(pdata, &als);

		break;

	case LM3530_BL_MODE_PWM:

		gen_config |= LM3530_ENABLE_PWM | LM3530_ENABLE_PWM_SIMPLE |

			      (pdata->pwm_pol_hi << LM3530_PWM_POL_SHIFT);

		break;

	}



	brt_ramp = (pdata->brt_ramp_fall << LM3530_BRT_RAMP_FALL_SHIFT) |
@@ -215,14 +231,14 @@ static int lm3530_init_registers(struct lm3530_data *drvdata) 
		brightness = drvdata->led_dev.max_brightness;



	reg_val[0] = gen_config;	/* LM3530_GEN_CONFIG */

	reg_val[1] = als_config;	/* LM3530_ALS_CONFIG */

	reg_val[1] = als.config;	/* LM3530_ALS_CONFIG */

	reg_val[2] = brt_ramp;		/* LM3530_BRT_RAMP_RATE */

	reg_val[3] = als_imp_sel;	/* LM3530_ALS_IMP_SELECT */

	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[5] = als.zones[0];	/* LM3530_ALS_ZB0_REG */

	reg_val[6] = als.zones[1];	/* LM3530_ALS_ZB1_REG */

	reg_val[7] = als.zones[2];	/* LM3530_ALS_ZB2_REG */

	reg_val[8] = als.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 */