From: Adam Thomson Date: Fri, 21 Aug 2020 14:22:59 +0000 (+0100) Subject: ASoC: da7219: Fix I/O voltage range configuration during probe X-Git-Tag: v5.10-rc1~122^2~1^2^2~151 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcea8b023a5f06ea0180ae65b01520b0414ee325;p=thirdparty%2Fkernel%2Flinux.git ASoC: da7219: Fix I/O voltage range configuration during probe Previous improvements around handling device and codec level probe functionality added the possibility of the voltage level being undefined for the scenario where the IO voltage retrieved from the regulator supply was below 1.2V, whereas previously the code defaulted to the 2.5V to 3.6V range in that case. This commit restores the default value to avoid this happening. Fixes: aa5b18d1c290 ("ASoC: da7219: Move soft reset handling to codec level probe") Reported-by: Pierre-Louis Bossart Signed-off-by: Adam Thomson Link: https://lore.kernel.org/r/20200821142259.C2ECE3FB96@swsrvapps-01.diasemi.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 301d8be2c5f75..0b3b7909efc92 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1864,6 +1864,9 @@ static int da7219_handle_supplies(struct snd_soc_component *component, return ret; } + /* Default to upper range */ + *io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_2_5V_3_6V; + /* Determine VDDIO voltage provided */ vddio = da7219->supplies[DA7219_SUPPLY_VDDIO].consumer; ret = regulator_get_voltage(vddio); @@ -1871,8 +1874,6 @@ static int da7219_handle_supplies(struct snd_soc_component *component, dev_warn(component->dev, "Invalid VDDIO voltage\n"); else if (ret < 2800000) *io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_1_2V_2_8V; - else - *io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_2_5V_3_6V; /* Enable main supplies */ ret = regulator_bulk_enable(DA7219_NUM_SUPPLIES, da7219->supplies);