diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-22 08:02:33 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-22 14:26:30 -0400 |
commit | 333802e90d3f0366c4a1cb767e2783d2e1df73a8 (patch) | |
tree | 19733471f0ed0779c57470d6867496129f67337b | |
parent | b1a56b331aec59be04f25ac99694d855d591c539 (diff) |
ASoC: Support !REGULATOR build for sgtl5000
The regulator is optional depending on board design.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | sound/soc/codecs/sgtl5000.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 1f7217f703ee..ff29380c9ed3 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c | |||
@@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, | |||
772 | return 0; | 772 | return 0; |
773 | } | 773 | } |
774 | 774 | ||
775 | #ifdef CONFIG_REGULATOR | ||
775 | static int ldo_regulator_is_enabled(struct regulator_dev *dev) | 776 | static int ldo_regulator_is_enabled(struct regulator_dev *dev) |
776 | { | 777 | { |
777 | struct ldo_regulator *ldo = rdev_get_drvdata(dev); | 778 | struct ldo_regulator *ldo = rdev_get_drvdata(dev); |
@@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec) | |||
901 | 902 | ||
902 | return 0; | 903 | return 0; |
903 | } | 904 | } |
905 | #else | ||
906 | static int ldo_regulator_register(struct snd_soc_codec *codec, | ||
907 | struct regulator_init_data *init_data, | ||
908 | int voltage) | ||
909 | { | ||
910 | return -EINVAL; | ||
911 | } | ||
912 | |||
913 | static int ldo_regulator_remove(struct snd_soc_codec *codec) | ||
914 | { | ||
915 | return 0; | ||
916 | } | ||
917 | #endif | ||
904 | 918 | ||
905 | /* | 919 | /* |
906 | * set dac bias | 920 | * set dac bias |