diff options
Diffstat (limited to 'sound/soc/omap/sdp4430.c')
| -rw-r--r-- | sound/soc/omap/sdp4430.c | 52 |
1 files changed, 45 insertions, 7 deletions
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index b80efb02bfc..189e0390063 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -21,8 +21,6 @@ #include <linux/clk.h> #include <linux/platform_device.h> -#include <linux/mfd/twl6040.h> - #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> @@ -36,6 +34,8 @@ #include "omap-pcm.h" #include "../codecs/twl6040.h" +static int twl6040_power_mode; + static int sdp4430_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -44,13 +44,13 @@ static int sdp4430_hw_params(struct snd_pcm_substream *substream, int clk_id, freq; int ret; - clk_id = twl6040_get_clk_id(rtd->codec); - if (clk_id == TWL6040_SYSCLK_SEL_HPPLL) + if (twl6040_power_mode) { + clk_id = TWL6040_SYSCLK_SEL_HPPLL; freq = 38400000; - else if (clk_id == TWL6040_SYSCLK_SEL_LPPLL) + } else { + clk_id = TWL6040_SYSCLK_SEL_LPPLL; freq = 32768; - else - return -EINVAL; + } /* set the codec mclk */ ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, freq, @@ -81,6 +81,35 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { }, }; +static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0] = twl6040_power_mode; + return 0; +} + +static int sdp4430_set_power_mode(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + if (twl6040_power_mode == ucontrol->value.integer.value[0]) + return 0; + + twl6040_power_mode = ucontrol->value.integer.value[0]; + + return 1; +} + +static const char *power_texts[] = {"Low-Power", "High-Performance"}; + +static const struct soc_enum sdp4430_enum[] = { + SOC_ENUM_SINGLE_EXT(2, power_texts), +}; + +static const struct snd_kcontrol_new sdp4430_controls[] = { + SOC_ENUM_EXT("TWL6040 Power Mode", sdp4430_enum[0], + sdp4430_get_power_mode, sdp4430_set_power_mode), +}; + /* SDP4430 machine DAPM */ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = { SND_SOC_DAPM_MIC("Ext Mic", NULL), @@ -123,6 +152,12 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; int ret; + /* Add SDP4430 specific controls */ + ret = snd_soc_add_controls(codec, sdp4430_controls, + ARRAY_SIZE(sdp4430_controls)); + if (ret) + return ret; + /* Add SDP4430 specific widgets */ ret = snd_soc_dapm_new_controls(dapm, sdp4430_twl6040_dapm_widgets, ARRAY_SIZE(sdp4430_twl6040_dapm_widgets)); @@ -202,6 +237,9 @@ static int __init sdp4430_soc_init(void) if (ret) goto err; + /* Codec starts in HP mode */ + twl6040_power_mode = 1; + return 0; err: |