mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 07:59:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

mfd: adp5585: Enable oscillator during probe

Browse Source 
Make sure to enable the oscillator in the top device. This will allow to
not control this in the child PWM device as that would not work with
future support for keyboard matrix where the oscillator needs to be
always enabled (and so cannot be disabled by disabling PWM).

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Acked-by: Uwe Kleine-König <ukleinek@kernel.org>
Link: https://lore.kernel.org/r/20250701-dev-adp5589-fw-v7-3-b1fcfe9e9826@analog.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Nuno Sá
2025-07-01 15:31:58 +01:00
committed by Lee Jones
parent 175f199085
commit e551760164
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mfd/adp5585.c
View File

@@ -137,6 +137,13 @@ static int adp5585_add_devices(struct device *dev)
return 0;
}
static void adp5585_osc_disable(void *data)
{
const struct adp5585_dev *adp5585 = data;
regmap_write(adp5585->regmap, ADP5585_GENERAL_CFG, 0);
}
static int adp5585_i2c_probe(struct i2c_client *i2c)
{
const struct regmap_config *regmap_config;
@@ -165,6 +172,18 @@ static int adp5585_i2c_probe(struct i2c_client *i2c)
return dev_err_probe(&i2c->dev, -ENODEV,
"Invalid device ID 0x%02x\n", id);
/*
* Enable the internal oscillator, as it's shared between multiple
* functions.
*/
ret = regmap_set_bits(adp5585->regmap, ADP5585_GENERAL_CFG, ADP5585_OSC_EN);
if (ret)
return ret;
ret = devm_add_action_or_reset(&i2c->dev, adp5585_osc_disable, adp5585);
if (ret)
return ret;
return adp5585_add_devices(&i2c->dev);
}

5
drivers/pwm/pwm-adp5585.c
View File

@@ -63,7 +63,6 @@ static int pwm_adp5585_apply(struct pwm_chip *chip,
int ret;
if (!state->enabled) {
regmap_clear_bits(regmap, ADP5585_GENERAL_CFG, ADP5585_OSC_EN);
regmap_clear_bits(regmap, ADP5585_PWM_CFG, ADP5585_PWM_EN);
return 0;
}
@@ -101,10 +100,6 @@ static int pwm_adp5585_apply(struct pwm_chip *chip,
if (ret)
return ret;
ret = regmap_set_bits(regmap, ADP5585_GENERAL_CFG, ADP5585_OSC_EN);
if (ret)
return ret;
return regmap_set_bits(regmap, ADP5585_PWM_CFG, ADP5585_PWM_EN);
}