diff options
author | Mark Brown <broonie@kernel.org> | 2021-12-01 17:15:12 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-12-01 17:15:12 +0300 |
commit | 67140b64b68395b79177efcd16a7530ed5311e49 (patch) | |
tree | b1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /sound/soc/codecs/cs35l41-spi.c | |
parent | f316c9d9ba8ea08d6994bc5ba8fa276eab186208 (diff) | |
parent | 046aede2f847676f93a2ea4f48b77909c51dba40 (diff) | |
download | linux-67140b64b68395b79177efcd16a7530ed5311e49.tar.xz |
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'sound/soc/codecs/cs35l41-spi.c')
-rw-r--r-- | sound/soc/codecs/cs35l41-spi.c | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c index 5d6cf39abec4..c202d9df70ee 100644 --- a/sound/soc/codecs/cs35l41-spi.c +++ b/sound/soc/codecs/cs35l41-spi.c @@ -26,34 +26,6 @@ static const struct spi_device_id cs35l41_id_spi[] = { MODULE_DEVICE_TABLE(spi, cs35l41_id_spi); -static void cs35l41_spi_otp_setup(struct cs35l41_private *cs35l41, - bool is_pre_setup, unsigned int *freq) -{ - struct spi_device *spi; - u32 orig_spi_freq; - - spi = to_spi_device(cs35l41->dev); - - if (!spi) { - dev_err(cs35l41->dev, "%s: No SPI device\n", __func__); - return; - } - - if (is_pre_setup) { - orig_spi_freq = spi->max_speed_hz; - if (orig_spi_freq > CS35L41_SPI_MAX_FREQ_OTP) { - spi->max_speed_hz = CS35L41_SPI_MAX_FREQ_OTP; - spi_setup(spi); - } - *freq = orig_spi_freq; - } else { - if (spi->max_speed_hz != *freq) { - spi->max_speed_hz = *freq; - spi_setup(spi); - } - } -} - static int cs35l41_spi_probe(struct spi_device *spi) { const struct regmap_config *regmap_config = &cs35l41_regmap_spi; @@ -65,6 +37,9 @@ static int cs35l41_spi_probe(struct spi_device *spi) if (!cs35l41) return -ENOMEM; + spi->max_speed_hz = CS35L41_SPI_MAX_FREQ; + spi_setup(spi); + spi_set_drvdata(spi, cs35l41); cs35l41->regmap = devm_regmap_init_spi(spi, regmap_config); if (IS_ERR(cs35l41->regmap)) { @@ -75,7 +50,6 @@ static int cs35l41_spi_probe(struct spi_device *spi) cs35l41->dev = &spi->dev; cs35l41->irq = spi->irq; - cs35l41->otp_setup = cs35l41_spi_otp_setup; return cs35l41_probe(cs35l41, pdata); } |