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

Commit 81bca762 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 68d5a59e

sound/soc/soc-io.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);