mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules
When CONFIG_REGMAP_I2C/SPI are m, CONFIG_REGMAP_I2C_MODULE is set in the pre-processor instead of CONFIG_REGMAP_I2C. This removes SND_SOC_I2C as a valid option for snd_soc_codec_set_cache_io()'s control parameter, and causes any ASoC regmap-using codec built as a module to fail to initialize. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
68d5a59e0c
commit
81bca7624d
1 changed files with 2 additions and 2 deletions
|
@ -122,14 +122,14 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
|
||||||
config.val_bits = data_bits;
|
config.val_bits = data_bits;
|
||||||
|
|
||||||
switch (control) {
|
switch (control) {
|
||||||
#ifdef CONFIG_REGMAP_I2C
|
#if defined(CONFIG_REGMAP_I2C) || defined(CONFIG_REGMAP_I2C_MODULE)
|
||||||
case SND_SOC_I2C:
|
case SND_SOC_I2C:
|
||||||
codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
|
codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
|
||||||
&config);
|
&config);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_REGMAP_SPI
|
#if defined(CONFIG_REGMAP_SPI) || defined(CONFIG_REGMAP_SPI_MODULE)
|
||||||
case SND_SOC_SPI:
|
case SND_SOC_SPI:
|
||||||
codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
|
codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
|
||||||
&config);
|
&config);
|
||||||
|
|
Loading…
Reference in a new issue