ASoC: tlv320aic3x: Fix remaining output pin switch names

[~andy/linux] / sound / soc / codecs / tlv320aic3x.c

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index c07465720cdb2d8c134f6fc84dad96841c64b081..6e4ed79d5eb9fb23d00ff103f3bff90a9ac0e5b1 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -314,7 +314,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
        SOC_DOUBLE_R_TLV("Mono DAC Playback Volume",
                         DACL1_2_MONOLOPM_VOL, DACR1_2_MONOLOPM_VOL,
                         0, 118, 1, output_stage_tlv),
-       SOC_SINGLE("Mono DAC Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),
+       SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),
        SOC_DOUBLE_R_TLV("Mono PGA Bypass Playback Volume",
                         PGAL_2_MONOLOPM_VOL, PGAR_2_MONOLOPM_VOL,
                         0, 118, 1, output_stage_tlv),
@@ -325,7 +325,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
        SOC_DOUBLE_R_TLV("HP DAC Playback Volume",
                         DACL1_2_HPLOUT_VOL, DACR1_2_HPROUT_VOL,
                         0, 118, 1, output_stage_tlv),
-       SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
+       SOC_DOUBLE_R("HP Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
                     0x01, 0),
        SOC_DOUBLE_R_TLV("HP Right PGA Bypass Playback Volume",
                         PGAR_2_HPLOUT_VOL, PGAR_2_HPROUT_VOL,
@@ -341,7 +341,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
        SOC_DOUBLE_R_TLV("HPCOM DAC Playback Volume",
                         DACL1_2_HPLCOM_VOL, DACR1_2_HPRCOM_VOL,
                         0, 118, 1, output_stage_tlv),
-       SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
+       SOC_DOUBLE_R("HPCOM Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
                     0x01, 0),
        SOC_SINGLE_TLV("HPLCOM PGA Bypass Playback Volume",
                       PGAL_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),
@@ -1281,6 +1281,8 @@ static int aic3x_probe(struct snd_soc_codec *codec)
        codec->hw_write = (hw_write_t) i2c_master_send;
        codec->control_data = aic3x->control_data;
 
+       aic3x_init(codec);
+
        if (aic3x->setup) {
                /* setup GPIO functions */
                aic3x_write(codec, AIC3X_GPIO1_REG,
@@ -1289,8 +1291,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
                            (aic3x->setup->gpio_func[1] & 0xf) << 4);
        }
 
-       aic3x_init(codec);
-
        snd_soc_add_controls(codec, aic3x_snd_controls,
                             ARRAY_SIZE(aic3x_snd_controls));
        if (aic3x->model == AIC3X_MODEL_3007)