phonepad: rt3261 solve auto connect bug when incall.

diff --git a/sound/soc/codecs/rt3261.c b/sound/soc/codecs/rt3261.c
index 70402ecc3d7f9f0f8a1e7626de65177519e52318..b6c60d5b1086f60a87f2b4b9687e441f60d18893 100644 (file)
--- a/sound/soc/codecs/rt3261.c
+++ b/sound/soc/codecs/rt3261.c
@@ -90,10 +90,11 @@ static struct rt3261_init_reg init_list[] = {
        {RT3261_PRIV_DATA       , 0x6115},
        {RT3261_PRIV_INDEX      , 0x0023},//PR23 = 0804'h
        {RT3261_PRIV_DATA       , 0x0804},
-       {RT3261_SPK_VOL         , 0x8b8b},//SPKMIX -> SPKVOL
+       {RT3261_SPK_VOL         , 0x8888},//SPKMIX -> SPKVOL
        {RT3261_HP_VOL          , 0x8888},
        {RT3261_OUTPUT          , 0x8888},//unmute OUTVOLL/R
        {RT3261_SPO_CLSD_RATIO  , 0x0001},
+       {RT3261_I2S1_SDP        , 0xd000},
 };
 #define RT3261_INIT_REG_LEN ARRAY_SIZE(init_list)
 
@@ -954,7 +955,7 @@ static const struct snd_kcontrol_new rt3261_snd_controls[] = {
        SOC_DOUBLE("HP Playback Switch", RT3261_HP_VOL,
                RT3261_L_MUTE_SFT, RT3261_R_MUTE_SFT, 1, 1),
        SOC_DOUBLE_EXT_TLV("Headphone Playback Volume", RT3261_HP_VOL,
-               RT3261_L_VOL_SFT, RT3261_R_VOL_SFT, RT3261_VOL_RSCL_RANGE, 0,
+               RT3261_L_VOL_SFT, RT3261_R_VOL_SFT, RT3261_HP_VOL_RSCL_RANGE, 0,
                rt3261_vol_rescale_get, rt3261_vol_rescale_put, out_vol_tlv),
        /* OUTPUT Control */
        SOC_DOUBLE("OUT Playback Switch", RT3261_OUTPUT,
@@ -1890,8 +1891,13 @@ static const struct snd_soc_dapm_widget rt3261_dapm_widgets[] = {
        /* micbias */
        SND_SOC_DAPM_SUPPLY("LDO2", RT3261_PWR_ANLG1,
                        RT3261_PWR_LDO2_BIT, 0, NULL, 0),
+       #if 0
        SND_SOC_DAPM_MICBIAS("micbias1", RT3261_PWR_ANLG2,
                        RT3261_PWR_MB1_BIT, 0),
+       #else
+       SND_SOC_DAPM_MICBIAS("micbias1", SND_SOC_NOPM,
+                       0, 0),
+       #endif
        SND_SOC_DAPM_MICBIAS("micbias2", RT3261_PWR_ANLG2,
                        RT3261_PWR_MB2_BIT, 0),
        /* Input Lines */
@@ -2886,6 +2892,9 @@ static int rt3261_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        case SND_SOC_BIAS_PREPARE:
+               snd_soc_update_bits(codec, RT3261_PWR_ANLG2,
+                       RT3261_PWR_MB1 | RT3261_PWR_MB2,
+                       RT3261_PWR_MB1 | RT3261_PWR_MB2);
                break;
 
        case SND_SOC_BIAS_STANDBY:

diff --git a/sound/soc/codecs/rt3261.h b/sound/soc/codecs/rt3261.h
index d0c19dab07784caaa18fa9b4382a11ae1a7203ee..2b798302a43e35b915380fdcfc657bd9bcb05135 100644 (file)
--- a/sound/soc/codecs/rt3261.h
+++ b/sound/soc/codecs/rt3261.h
@@ -2063,6 +2063,7 @@ enum {
 /* Volume Rescale */
 #define RT3261_VOL_RSCL_MAX 0x27
 #define RT3261_VOL_RSCL_RANGE 0x1F
+#define RT3261_HP_VOL_RSCL_RANGE 0x19
 /* Debug String Length */
 #define RT3261_REG_DISP_LEN 10
 

diff --git a/sound/soc/rk29/rk29_rt3261.c b/sound/soc/rk29/rk29_rt3261.c
index d4c157bc7b83d45c02b0a6aa269c3a6d368323c6..947ff19097fb522d2ab018caf66a066d6e5249de 100644 (file)
--- a/sound/soc/rk29/rk29_rt3261.c
+++ b/sound/soc/rk29/rk29_rt3261.c
@@ -242,7 +242,6 @@ static struct snd_soc_dai_link rk29_dai[] = {
                .platform_name = "rockchip-audio",\r
                .cpu_dai_name = "rk29_i2s.0",\r
                .codec_dai_name = "rt3261-aif2",\r
-               .init = rk29_rt3261_init,\r
                .ops = &rt3261_voice_ops,\r
        },\r
 };\r