Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5645' and 'asoc...

diff --combined sound/soc/codecs/rt5645.c
index 068dfd5c76407e77194d5d80f4904afcb492f2b2,27141e2df878a65204fc31cc9486fb099319bd26,21b2d72b4ea8f28a2a5afd53da834a4f62d10411,27141e2df878a65204fc31cc9486fb099319bd26..3e16a889a8063f77e413aced7381574a9431ddad
--- 1/sound/soc/codecs/rt5645.c
--- 2/sound/soc/codecs/rt5645.c
--- 3/sound/soc/codecs/rt5645.c
--- 4/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@@@@ -31,6 -31,6 -31,7 -31,6 +31,7 @@@@@
    #include "rt5645.h"
    
    #define RT5645_DEVICE_ID 0x6308
++ +#define RT5650_DEVICE_ID 0x6419
    
    #define RT5645_PR_RANGE_BASE (0xff + 1)
    #define RT5645_PR_SPACING 0x100
@@@@@ -59,6 -59,6 -60,10 -59,6 +60,10 @@@@@ static const struct reg_default init_li
    };
    #define RT5645_INIT_REG_LEN ARRAY_SIZE(init_list)
    
++ +static const struct reg_default rt5650_init_list[] = {
++ +    {0xf6,  0x0100},
++ +};
++ +
    static const struct reg_default rt5645_reg[] = {
        { 0x00, 0x0000 },
        { 0x01, 0xc8c8 },
@@@@@ -86,6 -86,6 -91,7 -86,6 +91,7 @@@@@
        { 0x2a, 0x5656 },
        { 0x2b, 0x5454 },
        { 0x2c, 0xaaa0 },
++ +    { 0x2d, 0x0000 },
        { 0x2f, 0x1002 },
        { 0x31, 0x5000 },
        { 0x32, 0x0000 },
@@@@@ -193,6 -193,6 -199,8 -193,6 +199,8 @@@@@
        { 0xdb, 0x0003 },
        { 0xdc, 0x0049 },
        { 0xdd, 0x001b },
++ +    { 0xdf, 0x0008 },
++ +    { 0xe0, 0x4000 },
        { 0xe6, 0x8000 },
        { 0xe7, 0x0200 },
        { 0xec, 0xb300 },
@@@@@ -242,6 -242,6 -250,7 -242,6 +250,7 @@@@@ static bool rt5645_volatile_register(st
        case RT5645_IRQ_CTRL3:
        case RT5645_INT_IRQ_ST:
        case RT5645_IL_CMD:
++ +    case RT5650_4BTN_IL_CMD1:
        case RT5645_VENDOR_ID:
        case RT5645_VENDOR_ID1:
        case RT5645_VENDOR_ID2:
@@@@@ -287,6 -287,6 -296,7 -287,6 +296,7 @@@@@ static bool rt5645_readable_register(st
        case RT5645_STO_DAC_MIXER:
        case RT5645_MONO_DAC_MIXER:
        case RT5645_DIG_MIXER:
++ +    case RT5650_A_DAC_SOUR:
        case RT5645_DIG_INF1_DATA:
        case RT5645_PDM_OUT_CTRL:
        case RT5645_REC_L1_MIXER:
@@@@@ -378,6 -378,6 -388,8 -378,6 +388,8 @@@@@
        case RT5645_IL_CMD:
        case RT5645_IL_CMD2:
        case RT5645_IL_CMD3:
++ +    case RT5650_4BTN_IL_CMD1:
++ +    case RT5650_4BTN_IL_CMD2:
        case RT5645_DRC1_HL_CTRL1:
        case RT5645_DRC2_HL_CTRL1:
        case RT5645_ADC_MONO_HP_CTRL1:
@@@@@ -527,7 -527,7 -539,7 -527,7 +539,7 @@@@@ static const struct snd_kcontrol_new rt
    static int set_dmic_clk(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
        int idx = -EINVAL;
    
@@@@@ -544,10 -544,9 -556,9 -544,9 +556,10 @@@@@
    static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                         struct snd_soc_dapm_widget *sink)
    {
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
        unsigned int val;
    
 ---    val = snd_soc_read(source->codec, RT5645_GLB_CLK);
 +++    val = snd_soc_read(codec, RT5645_GLB_CLK);
        val &= RT5645_SCLK_SRC_MASK;
        if (val == RT5645_SCLK_SRC_PLL1)
                return 1;
@@@@@ -558,7 -557,6 -569,6 -557,6 +570,7 @@@@@
    static int is_using_asrc(struct snd_soc_dapm_widget *source,
                         struct snd_soc_dapm_widget *sink)
    {
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
        unsigned int reg, shift, val;
    
        switch (source->shift) {
@@@@@ -590,7 -588,7 -600,7 -588,7 +602,7 @@@@@
                return 0;
        }
    
 ---    val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;
 +++    val = (snd_soc_read(codec, reg) >> shift) & 0xf;
        switch (val) {
        case 1:
        case 2:
@@@@@ -1009,6 -1007,6 -1019,44 -1007,6 +1021,44 @@@@@ static SOC_ENUM_SINGLE_DECL
    static const struct snd_kcontrol_new rt5645_if1_adc_in_mux =
        SOC_DAPM_ENUM("IF1 ADC IN source", rt5645_if1_adc_in_enum);
    
++ +/* MX-2d [3] [2] */
++ +static const char * const rt5650_a_dac1_src[] = {
++ +    "DAC1", "Stereo DAC Mixer"
++ +};
++ +
++ +static SOC_ENUM_SINGLE_DECL(
++ +    rt5650_a_dac1_l_enum, RT5650_A_DAC_SOUR,
++ +    RT5650_A_DAC1_L_IN_SFT, rt5650_a_dac1_src);
++ +
++ +static const struct snd_kcontrol_new rt5650_a_dac1_l_mux =
++ +    SOC_DAPM_ENUM("A DAC1 L source", rt5650_a_dac1_l_enum);
++ +
++ +static SOC_ENUM_SINGLE_DECL(
++ +    rt5650_a_dac1_r_enum, RT5650_A_DAC_SOUR,
++ +    RT5650_A_DAC1_R_IN_SFT, rt5650_a_dac1_src);
++ +
++ +static const struct snd_kcontrol_new rt5650_a_dac1_r_mux =
++ +    SOC_DAPM_ENUM("A DAC1 R source", rt5650_a_dac1_r_enum);
++ +
++ +/* MX-2d [1] [0] */
++ +static const char * const rt5650_a_dac2_src[] = {
++ +    "Stereo DAC Mixer", "Mono DAC Mixer"
++ +};
++ +
++ +static SOC_ENUM_SINGLE_DECL(
++ +    rt5650_a_dac2_l_enum, RT5650_A_DAC_SOUR,
++ +    RT5650_A_DAC2_L_IN_SFT, rt5650_a_dac2_src);
++ +
++ +static const struct snd_kcontrol_new rt5650_a_dac2_l_mux =
++ +    SOC_DAPM_ENUM("A DAC2 L source", rt5650_a_dac2_l_enum);
++ +
++ +static SOC_ENUM_SINGLE_DECL(
++ +    rt5650_a_dac2_r_enum, RT5650_A_DAC_SOUR,
++ +    RT5650_A_DAC2_R_IN_SFT, rt5650_a_dac2_src);
++ +
++ +static const struct snd_kcontrol_new rt5650_a_dac2_r_mux =
++ +    SOC_DAPM_ENUM("A DAC2 R source", rt5650_a_dac2_r_enum);
++ +
    /* MX-2F [13:12] */
    static const char * const rt5645_if2_adc_in_src[] = {
        "IF_ADC1", "IF_ADC2", "VAD_ADC"
@@@@@ -1146,18 -1144,18 -1194,23 -1144,18 +1196,23 @@@@@ static void hp_amp_power(struct snd_soc
    static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                hp_amp_power(codec, 1);
                /* headphone unmute sequence */
-- -            snd_soc_update_bits(codec, RT5645_DEPOP_M3, RT5645_CP_FQ1_MASK |
-- -                    RT5645_CP_FQ2_MASK | RT5645_CP_FQ3_MASK,
-- -                    (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
-- -                    (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
-- -                    (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
++ +            if (rt5645->codec_type == CODEC_TYPE_RT5650) {
++ +                    snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737);
++ +            } else {
++ +                    snd_soc_update_bits(codec, RT5645_DEPOP_M3,
++ +                            RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
++ +                            RT5645_CP_FQ3_MASK,
++ +                            (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
++ +                            (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
++ +                            (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
++ +            }
                regmap_write(rt5645->regmap,
                        RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
@@@@@ -1177,12 -1175,12 -1230,16 -1175,12 +1232,16 @@@@@
    
        case SND_SOC_DAPM_PRE_PMD:
                /* headphone mute sequence */
-- -            snd_soc_update_bits(codec, RT5645_DEPOP_M3,
-- -                    RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
-- -                    RT5645_CP_FQ3_MASK,
-- -                    (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
-- -                    (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
-- -                    (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
++ +            if (rt5645->codec_type == CODEC_TYPE_RT5650) {
++ +                    snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737);
++ +            } else {
++ +                    snd_soc_update_bits(codec, RT5645_DEPOP_M3,
++ +                            RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
++ +                            RT5645_CP_FQ3_MASK,
++ +                            (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
++ +                            (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
++ +                            (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
++ +            }
                regmap_write(rt5645->regmap,
                        RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
@@@@@ -1207,7 -1205,7 -1264,7 -1205,7 +1266,7 @@@@@
    static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
    
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
@@@@@ -1234,7 -1232,7 -1291,7 -1232,7 +1293,7 @@@@@
    static int rt5645_lout_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
    
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
@@@@@ -1264,7 -1262,7 -1321,7 -1262,7 +1323,7 @@@@@
    static int rt5645_bst2_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
    
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
@@@@@ -1576,6 -1574,6 -1633,17 -1574,6 +1635,17 @@@@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_OUTPUT("SPOR"),
    };
    
++ +static const struct snd_soc_dapm_widget rt5650_specific_dapm_widgets[] = {
++ +    SND_SOC_DAPM_MUX("A DAC1 L Mux", SND_SOC_NOPM,
++ +            0, 0, &rt5650_a_dac1_l_mux),
++ +    SND_SOC_DAPM_MUX("A DAC1 R Mux", SND_SOC_NOPM,
++ +            0, 0, &rt5650_a_dac1_r_mux),
++ +    SND_SOC_DAPM_MUX("A DAC2 L Mux", SND_SOC_NOPM,
++ +            0, 0, &rt5650_a_dac2_l_mux),
++ +    SND_SOC_DAPM_MUX("A DAC2 R Mux", SND_SOC_NOPM,
++ +            0, 0, &rt5650_a_dac2_r_mux),
++ +};
++ +
    static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
        { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },
        { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },
@@@@@ -1781,13 -1779,13 -1849,9 -1779,13 +1851,9 @@@@@
        { "DAC MIXR", "DAC R2 Switch", "DAC R2 Volume" },
        { "DAC MIXR", "DAC L2 Switch", "DAC L2 Volume" },
    
-- -    { "DAC L1", NULL, "Stereo DAC MIXL" },
        { "DAC L1", NULL, "PLL1", is_sys_clk_from_pll },
-- -    { "DAC R1", NULL, "Stereo DAC MIXR" },
        { "DAC R1", NULL, "PLL1", is_sys_clk_from_pll },
-- -    { "DAC L2", NULL, "Mono DAC MIXL" },
        { "DAC L2", NULL, "PLL1", is_sys_clk_from_pll },
-- -    { "DAC R2", NULL, "Mono DAC MIXR" },
        { "DAC R2", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "SPK MIXL", "BST1 Switch", "BST1" },
@@@@@ -1876,6 -1874,6 -1940,30 -1874,6 +1942,30 @@@@@
        { "SPOR", NULL, "SPK amp" },
    };
    
++ +static const struct snd_soc_dapm_route rt5650_specific_dapm_routes[] = {
++ +    { "A DAC1 L Mux", "DAC1",  "DAC1 MIXL"},
++ +    { "A DAC1 L Mux", "Stereo DAC Mixer", "Stereo DAC MIXL"},
++ +    { "A DAC1 R Mux", "DAC1",  "DAC1 MIXR"},
++ +    { "A DAC1 R Mux", "Stereo DAC Mixer", "Stereo DAC MIXR"},
++ +
++ +    { "A DAC2 L Mux", "Stereo DAC Mixer", "Stereo DAC MIXL"},
++ +    { "A DAC2 L Mux", "Mono DAC Mixer", "Mono DAC MIXL"},
++ +    { "A DAC2 R Mux", "Stereo DAC Mixer", "Stereo DAC MIXR"},
++ +    { "A DAC2 R Mux", "Mono DAC Mixer", "Mono DAC MIXR"},
++ +
++ +    { "DAC L1", NULL, "A DAC1 L Mux" },
++ +    { "DAC R1", NULL, "A DAC1 R Mux" },
++ +    { "DAC L2", NULL, "A DAC2 L Mux" },
++ +    { "DAC R2", NULL, "A DAC2 R Mux" },
++ +};
++ +
++ +static const struct snd_soc_dapm_route rt5645_specific_dapm_routes[] = {
++ +    { "DAC L1", NULL, "Stereo DAC MIXL" },
++ +    { "DAC R1", NULL, "Stereo DAC MIXR" },
++ +    { "DAC L2", NULL, "Mono DAC MIXL" },
++ +    { "DAC R2", NULL, "Mono DAC MIXR" },
++ +};
++ +
    static int rt5645_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
    {
@@@@@ -2295,6 -2293,6 -2383,22 -2293,6 +2385,22 @@@@@ static int rt5645_probe(struct snd_soc_
    
        rt5645->codec = codec;
    
++ +    switch (rt5645->codec_type) {
++ +    case CODEC_TYPE_RT5645:
++ +            snd_soc_dapm_add_routes(&codec->dapm,
++ +                    rt5645_specific_dapm_routes,
++ +                    ARRAY_SIZE(rt5645_specific_dapm_routes));
++ +            break;
++ +    case CODEC_TYPE_RT5650:
++ +            snd_soc_dapm_new_controls(&codec->dapm,
++ +                    rt5650_specific_dapm_widgets,
++ +                    ARRAY_SIZE(rt5650_specific_dapm_widgets));
++ +            snd_soc_dapm_add_routes(&codec->dapm,
++ +                    rt5650_specific_dapm_routes,
++ +                    ARRAY_SIZE(rt5650_specific_dapm_routes));
++ +            break;
++ +    }
++ +
        rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF);
    
        snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
@@@@@ -2426,6 -2424,6 -2530,7 -2424,6 +2532,7 @@@@@ static const struct regmap_config rt564
    
    static const struct i2c_device_id rt5645_i2c_id[] = {
        { "rt5645", 0 },
++ +    { "rt5650", 0 },
        { }
    };
    MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
@@@@@ -2458,9 -2456,9 -2563,18 -2456,9 +2565,18 @@@@@ static int rt5645_i2c_probe(struct i2c_
        }
    
        regmap_read(rt5645->regmap, RT5645_VENDOR_ID2, &val);
-- -    if (val != RT5645_DEVICE_ID) {
++ +
++ +    switch (val) {
++ +    case RT5645_DEVICE_ID:
++ +            rt5645->codec_type = CODEC_TYPE_RT5645;
++ +            break;
++ +    case RT5650_DEVICE_ID:
++ +            rt5645->codec_type = CODEC_TYPE_RT5650;
++ +            break;
++ +    default:
                dev_err(&i2c->dev,
-- -                    "Device with ID register %x is not rt5645\n", val);
++ +                    "Device with ID register %x is not rt5645 or rt5650\n",
++ +                    val);
                return -ENODEV;
        }
    
@@@@@ -2471,6 -2469,6 -2585,14 -2469,6 +2587,14 @@@@@
        if (ret != 0)
                dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
    
++ +    if (rt5645->codec_type == CODEC_TYPE_RT5650) {
++ +            ret = regmap_register_patch(rt5645->regmap, rt5650_init_list,
++ +                                ARRAY_SIZE(rt5650_init_list));
++ +            if (ret != 0)
++ +                    dev_warn(&i2c->dev, "Apply rt5650 patch failed: %d\n",
++ +                                       ret);
++ +    }
++ +
        if (rt5645->pdata.in2_diff)
                regmap_update_bits(rt5645->regmap, RT5645_IN2_CTRL,
                                        RT5645_IN_DF2, RT5645_IN_DF2);

diff --combined sound/soc/codecs/rt5677.c
index 26fc538f03b19a9690a0c208b44fa13bb273f397,81fe1464d2686661047aad6f2b9334f5d6a65c22,81fe1464d2686661047aad6f2b9334f5d6a65c22,75d2d73be5451011000da305901e87056d3068cb..5d0bb8748dd1df5cd6a262d7e3a925fe4b4b5efd
--- 1/sound/soc/codecs/rt5677.c
--- 2/sound/soc/codecs/rt5677.c
--- 3/sound/soc/codecs/rt5677.c
--- 4/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@@@@ -702,6 -702,6 -702,6 -702,9 +702,9 @@@@@ static int rt5677_set_dsp_vad(struct sn
        static bool activity;
        int ret;
    
+++     if (!IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI))
+++             return -ENXIO;
+++ 
        if (on && !activity) {
                activity = true;
    
@@@@@ -784,8 -784,8 -784,8 -787,8 +787,8 @@@@@ static unsigned int bst_tlv[] = 
    static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
    {
 ---    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 ---    struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 +++    struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 +++    struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
    
        ucontrol->value.integer.value[0] = rt5677->dsp_vad_en;
    
@@@@@ -795,9 -795,8 -795,8 -798,8 +798,9 @@@@@
    static int rt5677_dsp_vad_put(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
    {
 ---    struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 ---    struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 +++    struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 +++    struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
 +++    struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
    
        rt5677->dsp_vad_en = !!ucontrol->value.integer.value[0];
    
@@@@@ -896,7 -895,7 -895,7 -898,7 +899,7 @@@@@ static const struct snd_kcontrol_new rt
    static int set_dmic_clk(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
        int idx = rl6231_calc_dmic_clk(rt5677->sysclk);
    
@@@@@ -911,8 -910,7 -910,7 -913,7 +914,8 @@@@@
    static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                         struct snd_soc_dapm_widget *sink)
    {
 ---    struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(source->codec);
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
 +++    struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
        unsigned int val;
    
        regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val);
@@@@@ -923,101 -921,6 -921,6 -924,101 +926,101 @@@@@
                return 0;
    }
    
   -    struct snd_soc_codec *codec = source->codec;
 ++ static int is_using_asrc(struct snd_soc_dapm_widget *source,
 ++                      struct snd_soc_dapm_widget *sink)
 ++ {
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
 ++     struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 ++     unsigned int reg, shift, val;
 ++ 
 ++     if (source->reg == RT5677_ASRC_1) {
 ++             switch (source->shift) {
 ++             case 12:
 ++                     reg = RT5677_ASRC_4;
 ++                     shift = 0;
 ++                     break;
 ++             case 13:
 ++                     reg = RT5677_ASRC_4;
 ++                     shift = 4;
 ++                     break;
 ++             case 14:
 ++                     reg = RT5677_ASRC_4;
 ++                     shift = 8;
 ++                     break;
 ++             case 15:
 ++                     reg = RT5677_ASRC_4;
 ++                     shift = 12;
 ++                     break;
 ++             default:
 ++                     return 0;
 ++             }
 ++     } else {
 ++             switch (source->shift) {
 ++             case 0:
 ++                     reg = RT5677_ASRC_6;
 ++                     shift = 8;
 ++                     break;
 ++             case 1:
 ++                     reg = RT5677_ASRC_6;
 ++                     shift = 12;
 ++                     break;
 ++             case 2:
 ++                     reg = RT5677_ASRC_5;
 ++                     shift = 0;
 ++                     break;
 ++             case 3:
 ++                     reg = RT5677_ASRC_5;
 ++                     shift = 4;
 ++                     break;
 ++             case 4:
 ++                     reg = RT5677_ASRC_5;
 ++                     shift = 8;
 ++                     break;
 ++             case 5:
 ++                     reg = RT5677_ASRC_5;
 ++                     shift = 12;
 ++                     break;
 ++             case 12:
 ++                     reg = RT5677_ASRC_3;
 ++                     shift = 0;
 ++                     break;
 ++             case 13:
 ++                     reg = RT5677_ASRC_3;
 ++                     shift = 4;
 ++                     break;
 ++             case 14:
 ++                     reg = RT5677_ASRC_3;
 ++                     shift = 12;
 ++                     break;
 ++             default:
 ++                     return 0;
 ++             }
 ++     }
 ++ 
 ++     regmap_read(rt5677->regmap, reg, &val);
 ++     val = (val >> shift) & 0xf;
 ++ 
 ++     switch (val) {
 ++     case 1 ... 6:
 ++             return 1;
 ++     default:
 ++             return 0;
 ++     }
 ++ 
 ++ }
 ++ 
 ++ static int can_use_asrc(struct snd_soc_dapm_widget *source,
 ++                      struct snd_soc_dapm_widget *sink)
 ++ {
 ++     struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
 ++     struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 ++ 
 ++     if (rt5677->sysclk > rt5677->lrck[RT5677_AIF1] * 384)
 ++             return 1;
 ++ 
 ++     return 0;
 ++ }
 ++ 
    /* Digital Mixer */
    static const struct snd_kcontrol_new rt5677_sto1_adc_l_mix[] = {
        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
@@@@@ -2127,7 -2030,7 -2030,7 -2128,7 +2130,7 @@@@@ static const struct snd_kcontrol_new rt
    static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
@@@@@ -2151,7 -2054,7 -2054,7 -2152,7 +2154,7 @@@@@
    static int rt5677_bst2_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
@@@@@ -2175,18 -2078,14 -2078,14 -2176,14 +2178,18 @@@@@
    static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
 ---    case SND_SOC_DAPM_POST_PMU:
 +++    case SND_SOC_DAPM_PRE_PMU:
                regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x2);
 +++            break;
 +++
 +++    case SND_SOC_DAPM_POST_PMU:
                regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x0);
                break;
 +++
        default:
                return 0;
        }
@@@@@ -2197,18 -2096,14 -2096,14 -2194,14 +2200,18 @@@@@
    static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
 ---    case SND_SOC_DAPM_POST_PMU:
 +++    case SND_SOC_DAPM_PRE_PMU:
                regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x2);
 +++            break;
 +++
 +++    case SND_SOC_DAPM_POST_PMU:
                regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x0);
                break;
 +++
        default:
                return 0;
        }
@@@@@ -2219,7 -2114,7 -2114,7 -2212,7 +2222,7 @@@@@
    static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
@@@@@ -2246,7 -2141,7 -2141,7 -2239,7 +2249,7 @@@@@
    static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
        unsigned int value;
    
@@@@@ -2269,7 -2164,7 -2164,7 -2262,7 +2272,7 @@@@@
    static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
        unsigned int value;
    
@@@@@ -2292,7 -2187,7 -2187,7 -2285,7 +2295,7 @@@@@
    static int rt5677_vref_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
    {
 ---    struct snd_soc_codec *codec = w->codec;
 +++    struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
    
        switch (event) {
@@@@@ -2316,50 -2211,9 -2211,9 -2309,48 +2319,50 @@@@@
    
    static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,
 ---            0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),
 +++            0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |
 +++            SND_SOC_DAPM_POST_PMU),
        SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,
 ---            0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),
 +++            0, rt5677_set_pll2_event, SND_SOC_DAPM_PRE_PMU |
 +++            SND_SOC_DAPM_POST_PMU),
 ++ 
 ++     /* ASRC */
 ++     SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5677_ASRC_1, 0, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5677_ASRC_1, 1, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("I2S3 ASRC", 1, RT5677_ASRC_1, 2, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("I2S4 ASRC", 1, RT5677_ASRC_1, 3, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC STO ASRC", 1, RT5677_ASRC_2, 14, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO2 L ASRC", 1, RT5677_ASRC_2, 13, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO2 R ASRC", 1, RT5677_ASRC_2, 12, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO3 L ASRC", 1, RT5677_ASRC_1, 15, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO3 R ASRC", 1, RT5677_ASRC_1, 14, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO4 L ASRC", 1, RT5677_ASRC_1, 13, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DAC MONO4 R ASRC", 1, RT5677_ASRC_1, 12, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC STO1 ASRC", 1, RT5677_ASRC_2, 11, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC STO2 ASRC", 1, RT5677_ASRC_2, 10, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC STO3 ASRC", 1, RT5677_ASRC_2, 9, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC STO4 ASRC", 1, RT5677_ASRC_2, 8, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC MONO L ASRC", 1, RT5677_ASRC_2, 7, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("DMIC MONO R ASRC", 1, RT5677_ASRC_2, 6, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC STO1 ASRC", 1, RT5677_ASRC_2, 5, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC STO2 ASRC", 1, RT5677_ASRC_2, 4, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC STO3 ASRC", 1, RT5677_ASRC_2, 3, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC STO4 ASRC", 1, RT5677_ASRC_2, 2, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC MONO L ASRC", 1, RT5677_ASRC_2, 1, 0, NULL,
 ++             0),
 ++     SND_SOC_DAPM_SUPPLY_S("ADC MONO R ASRC", 1, RT5677_ASRC_2, 0, 0, NULL,
 ++             0),
    
        /* Input Side */
        /* micbias */
@@@@@ -2791,18 -2645,10 -2645,10 -2782,18 +2794,18 @@@@@
        /* DAC Mixer */
        SND_SOC_DAPM_SUPPLY("dac stereo1 filter", RT5677_PWR_DIG2,
                RT5677_PWR_DAC_S1F_BIT, 0, NULL, 0),
 --     SND_SOC_DAPM_SUPPLY("dac mono left filter", RT5677_PWR_DIG2,
 ++     SND_SOC_DAPM_SUPPLY("dac mono2 left filter", RT5677_PWR_DIG2,
                RT5677_PWR_DAC_M2F_L_BIT, 0, NULL, 0),
 --     SND_SOC_DAPM_SUPPLY("dac mono right filter", RT5677_PWR_DIG2,
 ++     SND_SOC_DAPM_SUPPLY("dac mono2 right filter", RT5677_PWR_DIG2,
                RT5677_PWR_DAC_M2F_R_BIT, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY("dac mono3 left filter", RT5677_PWR_DIG2,
 ++             RT5677_PWR_DAC_M3F_L_BIT, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY("dac mono3 right filter", RT5677_PWR_DIG2,
 ++             RT5677_PWR_DAC_M3F_R_BIT, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY("dac mono4 left filter", RT5677_PWR_DIG2,
 ++             RT5677_PWR_DAC_M4F_L_BIT, 0, NULL, 0),
 ++     SND_SOC_DAPM_SUPPLY("dac mono4 right filter", RT5677_PWR_DIG2,
 ++             RT5677_PWR_DAC_M4F_R_BIT, 0, NULL, 0),
    
        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
                rt5677_sto1_dac_l_mix, ARRAY_SIZE(rt5677_sto1_dac_l_mix)),
@@@@@ -2875,31 -2721,6 -2721,6 -2866,31 +2878,31 @@@@@
    };
    
    static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 ++     { "Stereo1 DMIC Mux", NULL, "DMIC STO1 ASRC", can_use_asrc },
 ++     { "Stereo2 DMIC Mux", NULL, "DMIC STO2 ASRC", can_use_asrc },
 ++     { "Stereo3 DMIC Mux", NULL, "DMIC STO3 ASRC", can_use_asrc },
 ++     { "Stereo4 DMIC Mux", NULL, "DMIC STO4 ASRC", can_use_asrc },
 ++     { "Mono DMIC L Mux", NULL, "DMIC MONO L ASRC", can_use_asrc },
 ++     { "Mono DMIC R Mux", NULL, "DMIC MONO R ASRC", can_use_asrc },
 ++     { "I2S1", NULL, "I2S1 ASRC", can_use_asrc},
 ++     { "I2S2", NULL, "I2S2 ASRC", can_use_asrc},
 ++     { "I2S3", NULL, "I2S3 ASRC", can_use_asrc},
 ++     { "I2S4", NULL, "I2S4 ASRC", can_use_asrc},
 ++ 
 ++     { "dac stereo1 filter", NULL, "DAC STO ASRC", is_using_asrc },
 ++     { "dac mono2 left filter", NULL, "DAC MONO2 L ASRC", is_using_asrc },
 ++     { "dac mono2 right filter", NULL, "DAC MONO2 R ASRC", is_using_asrc },
 ++     { "dac mono3 left filter", NULL, "DAC MONO3 L ASRC", is_using_asrc },
 ++     { "dac mono3 right filter", NULL, "DAC MONO3 R ASRC", is_using_asrc },
 ++     { "dac mono4 left filter", NULL, "DAC MONO4 L ASRC", is_using_asrc },
 ++     { "dac mono4 right filter", NULL, "DAC MONO4 R ASRC", is_using_asrc },
 ++     { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },
 ++     { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },
 ++     { "adc stereo3 filter", NULL, "ADC STO3 ASRC", is_using_asrc },
 ++     { "adc stereo4 filter", NULL, "ADC STO4 ASRC", is_using_asrc },
 ++     { "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc },
 ++     { "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc },
 ++ 
        { "DMIC1", NULL, "DMIC L1" },
        { "DMIC1", NULL, "DMIC R1" },
        { "DMIC2", NULL, "DMIC L2" },
@@@@@ -3030,6 -2851,8 -2851,8 -3021,6 +3033,6 @@@@@
    
        { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" },
        { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" },
 --     { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
 -- 
        { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" },
        { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" },
        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@@@@ -3050,6 -2873,8 -2873,8 -3041,6 +3053,6 @@@@@
    
        { "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" },
        { "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" },
 --     { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
 -- 
        { "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" },
        { "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" },
        { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@@@@ -3064,6 -2889,8 -2889,8 -3055,6 +3067,6 @@@@@
    
        { "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" },
        { "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" },
 --     { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
 -- 
        { "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" },
        { "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" },
        { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@@@@ -3078,6 -2905,8 -2905,8 -3069,6 +3081,6 @@@@@
    
        { "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" },
        { "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" },
 --     { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
 -- 
        { "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" },
        { "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" },
        { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@@@@ -3626,8 -3455,10 -3455,10 -3617,8 +3629,8 @@@@@
    
        { "DAC1 MIXL", "Stereo ADC Switch", "ADDA1 Mux" },
        { "DAC1 MIXL", "DAC1 Switch", "DAC1 Mux" },
 --     { "DAC1 MIXL", NULL, "dac stereo1 filter" },
        { "DAC1 MIXR", "Stereo ADC Switch", "ADDA1 Mux" },
        { "DAC1 MIXR", "DAC1 Switch", "DAC1 Mux" },
 --     { "DAC1 MIXR", NULL, "dac stereo1 filter" },
    
        { "DAC1 FS", NULL, "DAC1 MIXL" },
        { "DAC1 FS", NULL, "DAC1 MIXR" },
@@@@@ -3694,46 -3525,35 -3525,35 -3685,46 +3697,46 @@@@@
        { "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
        { "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" },
        { "Stereo DAC MIXR", NULL, "dac stereo1 filter" },
 ++     { "dac stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" },
        { "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" },
        { "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" },
        { "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" },
 --     { "Mono DAC MIXL", NULL, "dac mono left filter" },
 ++     { "Mono DAC MIXL", NULL, "dac mono2 left filter" },
 ++     { "dac mono2 left filter", NULL, "PLL1", is_sys_clk_from_pll },
        { "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" },
        { "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" },
        { "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
        { "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" },
 --     { "Mono DAC MIXR", NULL, "dac mono right filter" },
 ++     { "Mono DAC MIXR", NULL, "dac mono2 right filter" },
 ++     { "dac mono2 right filter", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
        { "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
        { "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" },
        { "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" },
 ++     { "DD1 MIXL", NULL, "dac mono3 left filter" },
 ++     { "dac mono3 left filter", NULL, "PLL1", is_sys_clk_from_pll },
        { "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
        { "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
        { "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" },
        { "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" },
 ++     { "DD1 MIXR", NULL, "dac mono3 right filter" },
 ++     { "dac mono3 right filter", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
        { "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
        { "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" },
        { "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" },
 ++     { "DD2 MIXL", NULL, "dac mono4 left filter" },
 ++     { "dac mono4 left filter", NULL, "PLL1", is_sys_clk_from_pll },
        { "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
        { "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
        { "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" },
        { "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" },
 ++     { "DD2 MIXR", NULL, "dac mono4 right filter" },
 ++     { "dac mono4 right filter", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "Stereo DAC MIX", NULL, "Stereo DAC MIXL" },
        { "Stereo DAC MIX", NULL, "Stereo DAC MIXR" },
@@@@@ -3755,8 -3575,11 -3575,11 -3746,8 +3758,8 @@@@@
        { "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" },
    
        { "DAC 1", NULL, "DAC12 SRC Mux" },
 --     { "DAC 1", NULL, "PLL1", is_sys_clk_from_pll },
        { "DAC 2", NULL, "DAC12 SRC Mux" },
 --     { "DAC 2", NULL, "PLL1", is_sys_clk_from_pll },
        { "DAC 3", NULL, "DAC3 SRC Mux" },
 --     { "DAC 3", NULL, "PLL1", is_sys_clk_from_pll },
    
        { "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" },
        { "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" },
@@@@@ -4103,8 -3926,7 -3926,7 -4094,8 +4106,8 @@@@@ static int rt5677_set_tdm_slot(struct s
                        unsigned int rx_mask, int slots, int slot_width)
    {
        struct snd_soc_codec *codec = dai->codec;
 --     unsigned int val = 0;
 ++     struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 ++     unsigned int val = 0, slot_width_25 = 0;
    
        if (rx_mask || tx_mask)
                val |= (1 << 12);
@@@@@ -4128,8 -3950,6 -3950,6 -4119,8 +4131,8 @@@@@
        case 20:
                val |= (1 << 8);
                break;
 ++     case 25:
 ++             slot_width_25 = 0x8080;
        case 24:
                val |= (2 << 8);
                break;
@@@@@ -4143,16 -3963,10 -3963,10 -4134,16 +4146,16 @@@@@
    
        switch (dai->id) {
        case RT5677_AIF1:
 --             snd_soc_update_bits(codec, RT5677_TDM1_CTRL1, 0x1f00, val);
 ++             regmap_update_bits(rt5677->regmap, RT5677_TDM1_CTRL1, 0x1f00,
 ++                     val);
 ++             regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x8000,
 ++                     slot_width_25);
                break;
        case RT5677_AIF2:
 --             snd_soc_update_bits(codec, RT5677_TDM2_CTRL1, 0x1f00, val);
 ++             regmap_update_bits(rt5677->regmap, RT5677_TDM2_CTRL1, 0x1f00,
 ++                     val);
 ++             regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x80,
 ++                     slot_width_25);
                break;
        default:
                break;
@@@@@ -4937,11 -4751,6 -4751,6 -4928,11 +4940,11 @@@@@ static int rt5677_i2c_probe(struct i2c_
                                        RT5677_GPIO5_DIR_OUT);
        }
    
 ++     if (rt5677->pdata.micbias1_vdd_3v3)
 ++             regmap_update_bits(rt5677->regmap, RT5677_MICBIAS,
 ++                     RT5677_MICBIAS1_CTRL_VDD_MASK,
 ++                     RT5677_MICBIAS1_CTRL_VDD_3_3V);
 ++ 
        rt5677_init_gpio(i2c);
        rt5677_init_irq(i2c);
    

diff --combined sound/soc/rockchip/rockchip_i2s.c
index dcc26eda0539b470f37382dacdc78622a8da0a95,dac0002aad6a248489725d42e5046fc3398bc6a4,26ec5117b35c1ace8b5b089200dbd367b06bbbf0,26ec5117b35c1ace8b5b089200dbd367b06bbbf0..acb5be53bfb4ddbd6879437e58b7dcfe990bd201
--- 1/sound/soc/rockchip/rockchip_i2s.c
--- 2/sound/soc/rockchip/rockchip_i2s.c
--- 3/sound/soc/rockchip/rockchip_i2s.c
--- 4/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@@@@ -247,6 -247,10 -247,6 -247,6 +247,10 @@@@@ static int rockchip_i2s_hw_params(struc
    
        regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val);
        regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val);
+ ++    regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK,
+ ++                       I2S_DMACR_TDL(16));
+ ++    regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK,
+ ++                       I2S_DMACR_RDL(16));
    
        return 0;
    }
@@@@@ -335,7 -339,6 -335,6 -335,6 +339,7 @@@@@ static struct snd_soc_dai_driver rockch
                            SNDRV_PCM_FMTBIT_S24_LE),
        },
        .ops = &rockchip_i2s_dai_ops,
 +++    .symmetric_rates = 1,
    };
    
    static const struct snd_soc_component_driver rockchip_i2s_component = {
@@@@@ -455,11 -458,11 -454,11 -454,11 +459,11 @@@@@ static int rockchip_i2s_probe(struct pl
    
        i2s->playback_dma_data.addr = res->start + I2S_TXDR;
        i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 ---    i2s->playback_dma_data.maxburst = 16;
 +++    i2s->playback_dma_data.maxburst = 4;
    
        i2s->capture_dma_data.addr = res->start + I2S_RXDR;
        i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 ---    i2s->capture_dma_data.maxburst = 16;
 +++    i2s->capture_dma_data.maxburst = 4;
    
        i2s->dev = &pdev->dev;
        dev_set_drvdata(&pdev->dev, i2s);