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

Commit 0fac96ed authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files

staging: iio: isl29028: only set ALS scale when ALS/IR sensing is enabled 



isl29028_chip_init_and_power_on() calls isl29028_set_als_scale() and
this is not needed until the user actually needs to take a reading from
the ALS/IR sensor. This patch moves the isl29028_set_als_scale() call
from isl29028_chip_init_and_power_on() to isl29028_set_als_ir_mode().
This sets the stage for faster resume times from runtime power
management if the user is only querying the proximity sensor.

Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 84a76694

drivers/staging/iio/light/isl29028.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -146,11 +146,15 @@ static int isl29028_set_als_scale(struct isl29028_chip *chip, int lux_scale) 
static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,

static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,

				    enum isl29028_als_ir_mode mode)

				    enum isl29028_als_ir_mode mode)

{

{

	int ret = 0;

	int ret;





	if (chip->als_ir_mode == mode)

	if (chip->als_ir_mode == mode)

		return 0;

		return 0;





	ret = isl29028_set_als_scale(chip, chip->lux_scale);

	if (ret < 0)

		return ret;



	switch (mode) {

	switch (mode) {

	case ISL29028_MODE_ALS:

	case ISL29028_MODE_ALS:

		ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,

		ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
@@ -453,7 +457,7 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip) 
		return ret;

		return ret;

	}

	}





	return isl29028_set_als_scale(chip, chip->lux_scale);

	return ret;

}

}





static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg)

static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg)