summaryrefslogtreecommitdiffstats
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);
int snd_soc_component_test_bits(struct snd_soc_component *component,
unsigned int reg, unsigned int mask, unsigned int value);
+#ifdef CONFIG_REGMAP
+
void snd_soc_component_init_regmap(struct snd_soc_component *component,
struct regmap *regmap);
void 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)
snd_soc_component_exit_regmap(&codec->component);
}
+#endif
+
/* device driver data */
static 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)
component->val_bytes = val_bytes;
}
+#ifdef CONFIG_REGMAP
+
/**
* snd_soc_component_init_regmap() - Initialize regmap instance for the component
* @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)
}
EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
+#endif
+
static void snd_soc_component_add_unlocked(struct snd_soc_component *component)
{
if (!component->write && !component->read) {