Commit f024d9a0 authored Aug 10, 2011 by Axel Lin Committed by Mark Brown Aug 11, 2011

ASoC: soc-io: Add CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI guards for regmap_init_i2c/regmap_init_spi



In the case of "make da8xx_omapl_defconfig;make", the SPI support is disabled.
Thus calling regmap_init_spi in soc-io.c has below build error.

ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

This patch fixes the build error by adding CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI
guards for regmap_init_i2c/regmap_init_spi.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 53b2bb3a

sound/soc/soc-io.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -122,15 +122,19 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
		config.val_bits = data_bits;

		switch (control) {
		#ifdef CONFIG_REGMAP_I2C
		case SND_SOC_I2C:
		codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
		&config);
		break;
		#endif

		#ifdef CONFIG_REGMAP_SPI
		case SND_SOC_SPI:
		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
		&config);
		break;
		#endif

		case SND_SOC_REGMAP:
		/* Device has made its own regmap arrangements */

Admin message