aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-15 21:04:43 -0500
committerMark Brown <broonie@linaro.org>2014-02-15 21:05:33 -0500
commit7b80300e749c2865fbfc23870d3b8f3186956fc0 (patch)
tree893e9b253982b189abec36190a50d357910ae776
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
ASoC: io: Remove SPI support
All ASoC CODEC drivers that use SPI have now been converted to use regmap so we can delete SND_SOC_SPI, preventing any new users being added. Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--include/sound/soc.h1
-rw-r--r--sound/soc/soc-io.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9a001472b96a..6197ba0642cc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -342,7 +342,6 @@ extern struct snd_ac97_bus_ops *soc_ac97_ops;
342 342
343enum snd_soc_control_type { 343enum snd_soc_control_type {
344 SND_SOC_I2C = 1, 344 SND_SOC_I2C = 1,
345 SND_SOC_SPI,
346 SND_SOC_REGMAP, 345 SND_SOC_REGMAP,
347}; 346};
348 347
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index aa886cca3ecf..3a0d99edf030 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -106,13 +106,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
106 break; 106 break;
107#endif 107#endif
108 108
109#if IS_ENABLED(CONFIG_REGMAP_SPI)
110 case SND_SOC_SPI:
111 codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
112 &config);
113 break;
114#endif
115
116 case SND_SOC_REGMAP: 109 case SND_SOC_REGMAP:
117 /* Device has made its own regmap arrangements */ 110 /* Device has made its own regmap arrangements */
118 codec->using_regmap = true; 111 codec->using_regmap = true;