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

Commit 99ad98d2 authored by Kim, Milo's avatar Kim, Milo Committed by Linus Torvalds
Browse files

leds-lm3530: replace pltfm with pdata 



Use 'pdata' rather than 'pltfm' in lm3530_init_registers().

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Axel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8544d0e3

drivers/leds/leds-lm3530.c

+18 −18
Original line number Diff line number Diff line
@@ -153,28 +153,28 @@ 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);



	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 */
@@ -186,28 +186,28 @@ 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) |

				(pdata->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;