Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/ak4642', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm5102.c

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 289b64d89abd464b562d7dbd56756169ddebaba4..f602349625278fb7c9717990f07c739276109130 100644 (file)
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -612,6 +612,62 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
        return 0;
 }
 
+static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+       struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+       uint16_t data;
+
+       mutex_lock(&codec->mutex);
+       data = cpu_to_be16(arizona->dac_comp_coeff);
+       memcpy(ucontrol->value.bytes.data, &data, sizeof(data));
+       mutex_unlock(&codec->mutex);
+
+       return 0;
+}
+
+static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+       struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+
+       mutex_lock(&codec->mutex);
+       memcpy(&arizona->dac_comp_coeff, ucontrol->value.bytes.data,
+              sizeof(arizona->dac_comp_coeff));
+       arizona->dac_comp_coeff = be16_to_cpu(arizona->dac_comp_coeff);
+       mutex_unlock(&codec->mutex);
+
+       return 0;
+}
+
+static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+       struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+
+       mutex_lock(&codec->mutex);
+       ucontrol->value.integer.value[0] = arizona->dac_comp_enabled;
+       mutex_unlock(&codec->mutex);
+
+       return 0;
+}
+
+static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+       struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+
+       mutex_lock(&codec->mutex);
+       arizona->dac_comp_enabled = ucontrol->value.integer.value[0];
+       mutex_unlock(&codec->mutex);
+
+       return 0;
+}
+
 static const char *wm5102_osr_text[] = {
        "Low power", "Normal", "High performance",
 };
@@ -843,6 +899,12 @@ SOC_SINGLE_TLV("Noise Gate Threshold Volume", ARIZONA_NOISE_GATE_CONTROL,
               ARIZONA_NGATE_THR_SHIFT, 7, 1, ng_tlv),
 SOC_ENUM("Noise Gate Hold", arizona_ng_hold),
 
+SND_SOC_BYTES_EXT("Output Compensation Coefficient", 2,
+                 wm5102_out_comp_coeff_get, wm5102_out_comp_coeff_put),
+
+SOC_SINGLE_EXT("Output Compensation Switch", 0, 0, 1, 0,
+              wm5102_out_comp_switch_get, wm5102_out_comp_switch_put),
+
 WM5102_NG_SRC("HPOUT1L", ARIZONA_NOISE_GATE_SELECT_1L),
 WM5102_NG_SRC("HPOUT1R", ARIZONA_NOISE_GATE_SELECT_1R),
 WM5102_NG_SRC("HPOUT2L", ARIZONA_NOISE_GATE_SELECT_2L),
@@ -1653,6 +1715,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
                 },
                .ops = &arizona_dai_ops,
                .symmetric_rates = 1,
+               .symmetric_samplebits = 1,
        },
        {
                .name = "wm5102-aif2",
@@ -1674,6 +1737,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
                 },
                .ops = &arizona_dai_ops,
                .symmetric_rates = 1,
+               .symmetric_samplebits = 1,
        },
        {
                .name = "wm5102-aif3",
@@ -1695,6 +1759,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
                 },
                .ops = &arizona_dai_ops,
                .symmetric_rates = 1,
+               .symmetric_samplebits = 1,
        },
        {
                .name = "wm5102-slim1",