aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/soc.h4
-rw-r--r--sound/soc/soc-core.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 80ca937a20da..b53234835936 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1286,6 +1286,8 @@ void snd_soc_component_async_complete(struct snd_soc_component *component);
1286int snd_soc_component_test_bits(struct snd_soc_component *component, 1286int snd_soc_component_test_bits(struct snd_soc_component *component,
1287 unsigned int reg, unsigned int mask, unsigned int value); 1287 unsigned int reg, unsigned int mask, unsigned int value);
1288 1288
1289#ifdef CONFIG_REGMAP
1290
1289void snd_soc_component_init_regmap(struct snd_soc_component *component, 1291void snd_soc_component_init_regmap(struct snd_soc_component *component,
1290 struct regmap *regmap); 1292 struct regmap *regmap);
1291void snd_soc_component_exit_regmap(struct snd_soc_component *component); 1293void snd_soc_component_exit_regmap(struct snd_soc_component *component);
@@ -1321,6 +1323,8 @@ static inline void snd_soc_codec_exit_regmap(struct snd_soc_codec *codec)
1321 snd_soc_component_exit_regmap(&codec->component); 1323 snd_soc_component_exit_regmap(&codec->component);
1322} 1324}
1323 1325
1326#endif
1327
1324/* device driver data */ 1328/* device driver data */
1325 1329
1326static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card, 1330static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index db74c061f520..1edc519d6286 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3661,6 +3661,8 @@ static void snd_soc_component_setup_regmap(struct snd_soc_component *component)
3661 component->val_bytes = val_bytes; 3661 component->val_bytes = val_bytes;
3662} 3662}
3663 3663
3664#ifdef CONFIG_REGMAP
3665
3664/** 3666/**
3665 * snd_soc_component_init_regmap() - Initialize regmap instance for the component 3667 * snd_soc_component_init_regmap() - Initialize regmap instance for the component
3666 * @component: The component for which to initialize the regmap instance 3668 * @component: The component for which to initialize the regmap instance
@@ -3696,6 +3698,8 @@ void snd_soc_component_exit_regmap(struct snd_soc_component *component)
3696} 3698}
3697EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap); 3699EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
3698 3700
3701#endif
3702
3699static void snd_soc_component_add_unlocked(struct snd_soc_component *component) 3703static void snd_soc_component_add_unlocked(struct snd_soc_component *component)
3700{ 3704{
3701 if (!component->write && !component->read) { 3705 if (!component->write && !component->read) {