Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git] / sound / soc / codecs / rt5677.c
index d17d079..81fe146 100644 (file)
@@ -55,12 +55,13 @@ static const struct regmap_range_cfg rt5677_ranges[] = {
 };
 
 static const struct reg_default init_list[] = {
+       {RT5677_ASRC_12,        0x0018},
        {RT5677_PR_BASE + 0x3d, 0x364d},
-       {RT5677_PR_BASE + 0x17, 0x4fc0},
-       {RT5677_PR_BASE + 0x13, 0x0312},
-       {RT5677_PR_BASE + 0x1e, 0x0000},
-       {RT5677_PR_BASE + 0x12, 0x0eaa},
-       {RT5677_PR_BASE + 0x14, 0x018a},
+       {RT5677_PR_BASE + 0x17, 0x4fc0},
+       {RT5677_PR_BASE + 0x13, 0x0312},
+       {RT5677_PR_BASE + 0x1e, 0x0000},
+       {RT5677_PR_BASE + 0x12, 0x0eaa},
+       {RT5677_PR_BASE + 0x14, 0x018a},
 };
 #define RT5677_INIT_REG_LEN ARRAY_SIZE(init_list)
 
@@ -173,7 +174,7 @@ static const struct reg_default rt5677_reg[] = {
        {RT5677_ASRC_9                  , 0x0000},
        {RT5677_ASRC_10                 , 0x0000},
        {RT5677_ASRC_11                 , 0x0000},
-       {RT5677_ASRC_12                 , 0x0008},
+       {RT5677_ASRC_12                 , 0x0018},
        {RT5677_ASRC_13                 , 0x0000},
        {RT5677_ASRC_14                 , 0x0000},
        {RT5677_ASRC_15                 , 0x0000},
@@ -541,49 +542,51 @@ static bool rt5677_readable_register(struct device *dev, unsigned int reg)
 
 /**
  * rt5677_dsp_mode_i2c_write_addr - Write value to address on DSP mode.
- * @codec: SoC audio codec device.
+ * @rt5677: Private Data.
  * @addr: Address index.
  * @value: Address data.
  *
  *
  * Returns 0 for success or negative error code.
  */
-static int rt5677_dsp_mode_i2c_write_addr(struct snd_soc_codec *codec,
+static int rt5677_dsp_mode_i2c_write_addr(struct rt5677_priv *rt5677,
                unsigned int addr, unsigned int value, unsigned int opcode)
 {
-       struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+       struct snd_soc_codec *codec = rt5677->codec;
        int ret;
 
        mutex_lock(&rt5677->dsp_cmd_lock);
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_ADDR_MSB, addr >> 16);
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
+               addr >> 16);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set addr msb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_ADDR_LSB,
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
                addr & 0xffff);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set addr lsb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_DATA_MSB,
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB,
                value >> 16);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set data msb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_DATA_LSB,
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB,
                value & 0xffff);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set data lsb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_OP_CODE, opcode);
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
+               opcode);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set op code value: %d\n", ret);
                goto err;
@@ -597,42 +600,45 @@ err:
 
 /**
  * rt5677_dsp_mode_i2c_read_addr - Read value from address on DSP mode.
- * @codec: SoC audio codec device.
+ * rt5677: Private Data.
  * @addr: Address index.
  * @value: Address data.
  *
+ *
  * Returns 0 for success or negative error code.
  */
 static int rt5677_dsp_mode_i2c_read_addr(
-       struct snd_soc_codec *codec, unsigned int addr, unsigned int *value)
+       struct rt5677_priv *rt5677, unsigned int addr, unsigned int *value)
 {
-       struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+       struct snd_soc_codec *codec = rt5677->codec;
        int ret;
        unsigned int msb, lsb;
 
        mutex_lock(&rt5677->dsp_cmd_lock);
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_ADDR_MSB, addr >> 16);
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_MSB,
+               addr >> 16);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set addr msb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_ADDR_LSB,
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_ADDR_LSB,
                addr & 0xffff);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set addr lsb value: %d\n", ret);
                goto err;
        }
 
-       ret = regmap_write(rt5677->regmap, RT5677_DSP_I2C_OP_CODE , 0x0002);
+       ret = regmap_write(rt5677->regmap_physical, RT5677_DSP_I2C_OP_CODE,
+               0x0002);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set op code value: %d\n", ret);
                goto err;
        }
 
-       regmap_read(rt5677->regmap, RT5677_DSP_I2C_DATA_MSB, &msb);
-       regmap_read(rt5677->regmap, RT5677_DSP_I2C_DATA_LSB, &lsb);
+       regmap_read(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_MSB, &msb);
+       regmap_read(rt5677->regmap_physical, RT5677_DSP_I2C_DATA_LSB, &lsb);
        *value = (msb << 16) | lsb;
 
 err:
@@ -643,17 +649,17 @@ err:
 
 /**
  * rt5677_dsp_mode_i2c_write - Write register on DSP mode.
- * @codec: SoC audio codec device.
+ * rt5677: Private Data.
  * @reg: Register index.
  * @value: Register data.
  *
  *
  * Returns 0 for success or negative error code.
  */
-static int rt5677_dsp_mode_i2c_write(struct snd_soc_codec *codec,
+static int rt5677_dsp_mode_i2c_write(struct rt5677_priv *rt5677,
                unsigned int reg, unsigned int value)
 {
-       return rt5677_dsp_mode_i2c_write_addr(codec, 0x18020000 + reg * 2,
+       return rt5677_dsp_mode_i2c_write_addr(rt5677, 0x18020000 + reg * 2,
                value, 0x0001);
 }
 
@@ -661,57 +667,33 @@ static int rt5677_dsp_mode_i2c_write(struct snd_soc_codec *codec,
  * rt5677_dsp_mode_i2c_read - Read register on DSP mode.
  * @codec: SoC audio codec device.
  * @reg: Register index.
+ * @value: Register data.
  *
  *
- * Returns Register value.
+ * Returns 0 for success or negative error code.
  */
-static unsigned int rt5677_dsp_mode_i2c_read(
-       struct snd_soc_codec *codec, unsigned int reg)
+static int rt5677_dsp_mode_i2c_read(
+       struct rt5677_priv *rt5677, unsigned int reg, unsigned int *value)
 {
-       unsigned int value = 0;
+       int ret = rt5677_dsp_mode_i2c_read_addr(rt5677, 0x18020000 + reg * 2,
+               value);
 
-       rt5677_dsp_mode_i2c_read_addr(codec, 0x18020000 + reg * 2, &value);
+       *value &= 0xffff;
 
-       return value;
+       return ret;
 }
 
-/**
- * rt5677_dsp_mode_i2c_update_bits - update register on DSP mode.
- * @codec: audio codec
- * @reg: register index.
- * @mask: register mask
- * @value: new value
- *
- *
- * Returns 1 for change, 0 for no change, or negative error code.
- */
-static int rt5677_dsp_mode_i2c_update_bits(struct snd_soc_codec *codec,
-       unsigned int reg, unsigned int mask, unsigned int value)
+static void rt5677_set_dsp_mode(struct snd_soc_codec *codec, bool on)
 {
-       unsigned int old, new;
-       int change, ret;
-
-       ret = rt5677_dsp_mode_i2c_read(codec, reg);
-       if (ret < 0) {
-               dev_err(codec->dev, "Failed to read reg: %d\n", ret);
-               goto err;
-       }
+       struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
-       old = ret;
-       new = (old & ~mask) | (value & mask);
-       change = old != new;
-       if (change) {
-               ret = rt5677_dsp_mode_i2c_write(codec, reg, new);
-               if (ret < 0) {
-                       dev_err(codec->dev,
-                               "Failed to write reg: %d\n", ret);
-                       goto err;
-               }
+       if (on) {
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x2);
+               rt5677->is_dsp_mode = true;
+       } else {
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x0);
+               rt5677->is_dsp_mode = false;
        }
-       return change;
-
-err:
-       return ret;
 }
 
 static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
@@ -733,9 +715,14 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
                        RT5677_LDO1_SEL_MASK, 0x0);
                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
                        RT5677_PWR_LDO1, RT5677_PWR_LDO1);
-               regmap_write(rt5677->regmap, RT5677_GLB_CLK2, 0x0080);
+               regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                       RT5677_MCLK_SRC_MASK, RT5677_MCLK2_SRC);
+               regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK2,
+                       RT5677_PLL2_PR_SRC_MASK | RT5677_DSP_CLK_SRC_MASK,
+                       RT5677_PLL2_PR_SRC_MCLK2 | RT5677_DSP_CLK_SRC_BYPASS);
                regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x07ff);
-               regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x07ff);
+               regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x07fd);
+               rt5677_set_dsp_mode(codec, true);
 
                ret = request_firmware(&rt5677->fw1, RT5677_FIRMWARE1,
                        codec->dev);
@@ -751,8 +738,7 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
                        release_firmware(rt5677->fw2);
                }
 
-               rt5677_dsp_mode_i2c_update_bits(codec, RT5677_PWR_DSP1, 0x1,
-                       0x0);
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x1, 0x0);
 
                regcache_cache_bypass(rt5677->regmap, false);
                regcache_cache_only(rt5677->regmap, true);
@@ -762,9 +748,9 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
                regcache_cache_only(rt5677->regmap, false);
                regcache_cache_bypass(rt5677->regmap, true);
 
-               rt5677_dsp_mode_i2c_update_bits(codec, RT5677_PWR_DSP1, 0x1,
-                       0x1);
-               rt5677_dsp_mode_i2c_write(codec, RT5677_PWR_DSP1, 0x0001);
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x1, 0x1);
+               rt5677_set_dsp_mode(codec, false);
+               regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x0001);
 
                regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
 
@@ -777,9 +763,9 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
 }
 
 static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
-static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);
 static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
-static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);
 static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
 static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0);
 
@@ -831,13 +817,13 @@ static const struct snd_kcontrol_new rt5677_snd_controls[] = {
 
        /* DAC Digital Volume */
        SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5677_DAC1_DIG_VOL,
-               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 87, 0, dac_vol_tlv),
        SOC_DOUBLE_TLV("DAC2 Playback Volume", RT5677_DAC2_DIG_VOL,
-               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 87, 0, dac_vol_tlv),
        SOC_DOUBLE_TLV("DAC3 Playback Volume", RT5677_DAC3_DIG_VOL,
-               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 87, 0, dac_vol_tlv),
        SOC_DOUBLE_TLV("DAC4 Playback Volume", RT5677_DAC4_DIG_VOL,
-               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+               RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 87, 0, dac_vol_tlv),
 
        /* IN1/IN2 Control */
        SOC_SINGLE_TLV("IN1 Boost", RT5677_IN1, RT5677_BST_SFT1, 8, 0, bst_tlv),
@@ -856,19 +842,19 @@ static const struct snd_kcontrol_new rt5677_snd_controls[] = {
                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
 
        SOC_DOUBLE_TLV("ADC1 Capture Volume", RT5677_STO1_ADC_DIG_VOL,
-               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 63, 0,
                adc_vol_tlv),
        SOC_DOUBLE_TLV("ADC2 Capture Volume", RT5677_STO2_ADC_DIG_VOL,
-               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 63, 0,
                adc_vol_tlv),
        SOC_DOUBLE_TLV("ADC3 Capture Volume", RT5677_STO3_ADC_DIG_VOL,
-               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 63, 0,
                adc_vol_tlv),
        SOC_DOUBLE_TLV("ADC4 Capture Volume", RT5677_STO4_ADC_DIG_VOL,
-               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+               RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 63, 0,
                adc_vol_tlv),
        SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5677_MONO_ADC_DIG_VOL,
-               RT5677_MONO_ADC_L_VOL_SFT, RT5677_MONO_ADC_R_VOL_SFT, 127, 0,
+               RT5677_MONO_ADC_L_VOL_SFT, RT5677_MONO_ADC_R_VOL_SFT, 63, 0,
                adc_vol_tlv),
 
        /* Sidetone Control */
@@ -1353,7 +1339,7 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_ib45_bypass_src_mux =
        SOC_DAPM_ENUM("IB45 Bypass Source", rt5677_ib45_bypass_src_enum);
 
-/* Stereo ADC Source 2 */ /* MX-27 MX26  MX25 [11:10] */
+/* Stereo ADC Source 2 */ /* MX-27 MX26 MX25 [11:10] */
 static const char * const rt5677_stereo_adc2_src[] = {
        "DD MIX1", "DMIC", "Stereo DAC MIX"
 };
@@ -1438,7 +1424,7 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_sto2_adc_lr_mux =
        SOC_DAPM_ENUM("Stereo2 ADC LR Source", rt5677_stereo2_adc_lr_enum);
 
-/* Stereo1 ADC Source 1 */ /* MX-27 MX26  MX25 [13:12] */
+/* Stereo1 ADC Source 1 */ /* MX-27 MX26 MX25 [13:12] */
 static const char * const rt5677_stereo_adc1_src[] = {
        "DD MIX1", "ADC1/2", "Stereo DAC MIX"
 };
@@ -1710,7 +1696,7 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_pdm2_r_mux =
        SOC_DAPM_ENUM("PDM2 Source", rt5677_pdm2_r_enum);
 
-/* TDM IF1/2 SLB ADC1 Data Selection */ /* MX-3C MX-41 [5:4] MX-08 [1:0]*/
+/* TDM IF1/2 SLB ADC1 Data Selection */ /* MX-3C MX-41 [5:4] MX-08 [1:0] */
 static const char * const rt5677_if12_adc1_src[] = {
        "STO1 ADC MIX", "OB01", "VAD ADC"
 };
@@ -1788,7 +1774,7 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_slb_adc3_mux =
        SOC_DAPM_ENUM("SLB ADC3 Source", rt5677_slb_adc3_enum);
 
-/* TDM IF1/2 SLB ADC4 Data Selection */ /* MX-3C MX-41 [11:10]  MX-08 [7:6] */
+/* TDM IF1/2 SLB ADC4 Data Selection */ /* MX-3C MX-41 [11:10] MX-08 [7:6] */
 static const char * const rt5677_if12_adc4_src[] = {
        "STO4 ADC MIX", "OB67", "OB01"
 };
@@ -1814,7 +1800,7 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_slb_adc4_mux =
        SOC_DAPM_ENUM("SLB ADC4 Source", rt5677_slb_adc4_enum);
 
-/* Interface3/4 ADC Data Input */ /* MX-2F [3:0] MX-30 [7:4]*/
+/* Interface3/4 ADC Data Input */ /* MX-2F [3:0] MX-30 [7:4] */
 static const char * const rt5677_if34_adc_src[] = {
        "STO1 ADC MIX", "STO2 ADC MIX", "STO3 ADC MIX", "STO4 ADC MIX",
        "MONO ADC MIX", "OB01", "OB23", "VAD ADC"
@@ -1834,6 +1820,213 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5677_if4_adc_mux =
        SOC_DAPM_ENUM("IF4 ADC Source", rt5677_if4_adc_enum);
 
+/* TDM IF1/2 ADC Data Selection */ /* MX-3B MX-40 [7:6][5:4][3:2][1:0] */
+static const char * const rt5677_if12_adc_swap_src[] = {
+       "L/R", "R/L", "L/L", "R/R"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_adc1_swap_enum, RT5677_TDM1_CTRL1,
+       RT5677_IF1_ADC1_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if1_adc1_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC1 Swap Source", rt5677_if1_adc1_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_adc2_swap_enum, RT5677_TDM1_CTRL1,
+       RT5677_IF1_ADC2_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if1_adc2_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC2 Swap Source", rt5677_if1_adc2_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_adc3_swap_enum, RT5677_TDM1_CTRL1,
+       RT5677_IF1_ADC3_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if1_adc3_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC3 Swap Source", rt5677_if1_adc3_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_adc4_swap_enum, RT5677_TDM1_CTRL1,
+       RT5677_IF1_ADC4_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if1_adc4_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC4 Swap Source", rt5677_if1_adc4_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_adc1_swap_enum, RT5677_TDM2_CTRL1,
+       RT5677_IF1_ADC2_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if2_adc1_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC2 Swap Source", rt5677_if2_adc1_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_adc2_swap_enum, RT5677_TDM2_CTRL1,
+       RT5677_IF2_ADC2_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if2_adc2_swap_mux =
+       SOC_DAPM_ENUM("IF2 ADC2 Swap Source", rt5677_if2_adc2_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_adc3_swap_enum, RT5677_TDM2_CTRL1,
+       RT5677_IF2_ADC3_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if2_adc3_swap_mux =
+       SOC_DAPM_ENUM("IF2 ADC3 Swap Source", rt5677_if2_adc3_swap_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_adc4_swap_enum, RT5677_TDM2_CTRL1,
+       RT5677_IF2_ADC4_SWAP_SFT, rt5677_if12_adc_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if2_adc4_swap_mux =
+       SOC_DAPM_ENUM("IF2 ADC4 Swap Source", rt5677_if2_adc4_swap_enum);
+
+/* TDM IF1 ADC Data Selection */ /* MX-3C [2:0] */
+static const char * const rt5677_if1_adc_tdm_swap_src[] = {
+       "1/2/3/4", "2/1/3/4", "2/3/1/4", "4/1/2/3", "1/3/2/4", "1/4/2/3",
+       "3/1/2/4", "3/4/1/2"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_adc_tdm_swap_enum, RT5677_TDM1_CTRL2,
+       RT5677_IF1_ADC_CTRL_SFT, rt5677_if1_adc_tdm_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if1_adc_tdm_swap_mux =
+       SOC_DAPM_ENUM("IF1 ADC TDM Swap Source", rt5677_if1_adc_tdm_swap_enum);
+
+/* TDM IF2 ADC Data Selection */ /* MX-41[2:0] */
+static const char * const rt5677_if2_adc_tdm_swap_src[] = {
+       "1/2/3/4", "2/1/3/4", "3/1/2/4", "4/1/2/3", "1/3/2/4", "1/4/2/3",
+       "2/3/1/4", "3/4/1/2"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_adc_tdm_swap_enum, RT5677_TDM2_CTRL2,
+       RT5677_IF2_ADC_CTRL_SFT, rt5677_if2_adc_tdm_swap_src);
+
+static const struct snd_kcontrol_new rt5677_if2_adc_tdm_swap_mux =
+       SOC_DAPM_ENUM("IF2 ADC TDM Swap Source", rt5677_if2_adc_tdm_swap_enum);
+
+/* TDM IF1/2 DAC Data Selection */ /* MX-3E[14:12][10:8][6:4][2:0]
+                                       MX-3F[14:12][10:8][6:4][2:0]
+                                       MX-43[14:12][10:8][6:4][2:0]
+                                       MX-44[14:12][10:8][6:4][2:0] */
+static const char * const rt5677_if12_dac_tdm_sel_src[] = {
+       "Slot0", "Slot1", "Slot2", "Slot3", "Slot4", "Slot5", "Slot6", "Slot7"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac0_tdm_sel_enum, RT5677_TDM1_CTRL4,
+       RT5677_IF1_DAC0_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac0_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC0 TDM Source", rt5677_if1_dac0_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac1_tdm_sel_enum, RT5677_TDM1_CTRL4,
+       RT5677_IF1_DAC1_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac1_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC1 TDM Source", rt5677_if1_dac1_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac2_tdm_sel_enum, RT5677_TDM1_CTRL4,
+       RT5677_IF1_DAC2_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac2_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC2 TDM Source", rt5677_if1_dac2_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac3_tdm_sel_enum, RT5677_TDM1_CTRL4,
+       RT5677_IF1_DAC3_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac3_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC3 TDM Source", rt5677_if1_dac3_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac4_tdm_sel_enum, RT5677_TDM1_CTRL5,
+       RT5677_IF1_DAC4_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac4_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC4 TDM Source", rt5677_if1_dac4_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac5_tdm_sel_enum, RT5677_TDM1_CTRL5,
+       RT5677_IF1_DAC5_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac5_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC5 TDM Source", rt5677_if1_dac5_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac6_tdm_sel_enum, RT5677_TDM1_CTRL5,
+       RT5677_IF1_DAC6_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac6_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC6 TDM Source", rt5677_if1_dac6_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if1_dac7_tdm_sel_enum, RT5677_TDM1_CTRL5,
+       RT5677_IF1_DAC7_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if1_dac7_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF1 DAC7 TDM Source", rt5677_if1_dac7_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac0_tdm_sel_enum, RT5677_TDM2_CTRL4,
+       RT5677_IF2_DAC0_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac0_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC0 TDM Source", rt5677_if2_dac0_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac1_tdm_sel_enum, RT5677_TDM2_CTRL4,
+       RT5677_IF2_DAC1_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac1_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC1 TDM Source", rt5677_if2_dac1_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac2_tdm_sel_enum, RT5677_TDM2_CTRL4,
+       RT5677_IF2_DAC2_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac2_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC2 TDM Source", rt5677_if2_dac2_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac3_tdm_sel_enum, RT5677_TDM2_CTRL4,
+       RT5677_IF2_DAC3_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac3_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC3 TDM Source", rt5677_if2_dac3_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac4_tdm_sel_enum, RT5677_TDM2_CTRL5,
+       RT5677_IF2_DAC4_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac4_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC4 TDM Source", rt5677_if2_dac4_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac5_tdm_sel_enum, RT5677_TDM2_CTRL5,
+       RT5677_IF2_DAC5_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac5_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC5 TDM Source", rt5677_if2_dac5_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac6_tdm_sel_enum, RT5677_TDM2_CTRL5,
+       RT5677_IF2_DAC6_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac6_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC6 TDM Source", rt5677_if2_dac6_tdm_sel_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+       rt5677_if2_dac7_tdm_sel_enum, RT5677_TDM2_CTRL5,
+       RT5677_IF2_DAC7_SFT, rt5677_if12_dac_tdm_sel_src);
+
+static const struct snd_kcontrol_new rt5677_if2_dac7_tdm_sel_mux =
+       SOC_DAPM_ENUM("IF2 DAC7 TDM Source", rt5677_if2_dac7_tdm_sel_enum);
+
 static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
@@ -1945,6 +2138,77 @@ static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
        return 0;
 }
 
+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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+       unsigned int value;
+
+       switch (event) {
+       case SND_SOC_DAPM_PRE_PMU:
+               regmap_read(rt5677->regmap, RT5677_TDM1_CTRL2, &value);
+               if (value & RT5677_IF1_ADC_CTRL_MASK)
+                       regmap_update_bits(rt5677->regmap, RT5677_TDM1_CTRL1,
+                               RT5677_IF1_ADC_MODE_MASK,
+                               RT5677_IF1_ADC_MODE_TDM);
+               break;
+
+       default:
+               return 0;
+       }
+
+       return 0;
+}
+
+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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+       unsigned int value;
+
+       switch (event) {
+       case SND_SOC_DAPM_PRE_PMU:
+               regmap_read(rt5677->regmap, RT5677_TDM2_CTRL2, &value);
+               if (value & RT5677_IF2_ADC_CTRL_MASK)
+                       regmap_update_bits(rt5677->regmap, RT5677_TDM2_CTRL1,
+                               RT5677_IF2_ADC_MODE_MASK,
+                               RT5677_IF2_ADC_MODE_TDM);
+               break;
+
+       default:
+               return 0;
+       }
+
+       return 0;
+}
+
+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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+
+       switch (event) {
+       case SND_SOC_DAPM_POST_PMU:
+               if (codec->dapm.bias_level != SND_SOC_BIAS_ON &&
+                       !rt5677->is_vref_slow) {
+                       mdelay(20);
+                       regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
+                               RT5677_PWR_FV1 | RT5677_PWR_FV2,
+                               RT5677_PWR_FV1 | RT5677_PWR_FV2);
+                       rt5677->is_vref_slow = true;
+               }
+               break;
+
+       default:
+               return 0;
+       }
+
+       return 0;
+}
+
 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),
@@ -2104,10 +2368,8 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
        SND_SOC_DAPM_PGA("Stereo4 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_PGA("Sto2 ADC LR MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_PGA("Mono ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("IF1_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("IF1_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("IF1_ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("IF1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("IF1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("IF2 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
 
        /* DSP */
        SND_SOC_DAPM_MUX("IB9 Mux", SND_SOC_NOPM, 0, 0,
@@ -2230,6 +2492,17 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
                        &rt5677_if1_adc3_mux),
        SND_SOC_DAPM_MUX("IF1 ADC4 Mux", SND_SOC_NOPM, 0, 0,
                        &rt5677_if1_adc4_mux),
+       SND_SOC_DAPM_MUX("IF1 ADC1 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_adc1_swap_mux),
+       SND_SOC_DAPM_MUX("IF1 ADC2 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_adc2_swap_mux),
+       SND_SOC_DAPM_MUX("IF1 ADC3 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_adc3_swap_mux),
+       SND_SOC_DAPM_MUX("IF1 ADC4 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_adc4_swap_mux),
+       SND_SOC_DAPM_MUX_E("IF1 ADC TDM Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_adc_tdm_swap_mux, rt5677_if1_adc_tdm_event,
+                       SND_SOC_DAPM_PRE_PMU),
        SND_SOC_DAPM_MUX("IF2 ADC1 Mux", SND_SOC_NOPM, 0, 0,
                        &rt5677_if2_adc1_mux),
        SND_SOC_DAPM_MUX("IF2 ADC2 Mux", SND_SOC_NOPM, 0, 0,
@@ -2238,6 +2511,17 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
                        &rt5677_if2_adc3_mux),
        SND_SOC_DAPM_MUX("IF2 ADC4 Mux", SND_SOC_NOPM, 0, 0,
                        &rt5677_if2_adc4_mux),
+       SND_SOC_DAPM_MUX("IF2 ADC1 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_adc1_swap_mux),
+       SND_SOC_DAPM_MUX("IF2 ADC2 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_adc2_swap_mux),
+       SND_SOC_DAPM_MUX("IF2 ADC3 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_adc3_swap_mux),
+       SND_SOC_DAPM_MUX("IF2 ADC4 Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_adc4_swap_mux),
+       SND_SOC_DAPM_MUX_E("IF2 ADC TDM Swap Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_adc_tdm_swap_mux, rt5677_if2_adc_tdm_event,
+                       SND_SOC_DAPM_PRE_PMU),
        SND_SOC_DAPM_MUX("IF3 ADC Mux", SND_SOC_NOPM, 0, 0,
                        &rt5677_if3_adc_mux),
        SND_SOC_DAPM_MUX("IF4 ADC Mux", SND_SOC_NOPM, 0, 0,
@@ -2251,6 +2535,40 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
        SND_SOC_DAPM_MUX("SLB ADC4 Mux", SND_SOC_NOPM, 0, 0,
                        &rt5677_slb_adc4_mux),
 
+       SND_SOC_DAPM_MUX("IF1 DAC0 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac0_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC1 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac1_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC2 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac2_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC3 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac3_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC4 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac4_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC5 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac5_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC6 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac6_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF1 DAC7 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if1_dac7_tdm_sel_mux),
+
+       SND_SOC_DAPM_MUX("IF2 DAC0 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac0_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC1 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac1_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC2 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac2_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC3 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac3_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC4 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac4_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC5 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac5_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC6 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac6_tdm_sel_mux),
+       SND_SOC_DAPM_MUX("IF2 DAC7 Mux", SND_SOC_NOPM, 0, 0,
+                       &rt5677_if2_dac7_tdm_sel_mux),
+
        /* Audio Interface */
        SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
@@ -2289,7 +2607,7 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
                rt5677_ob_7_mix, ARRAY_SIZE(rt5677_ob_7_mix)),
 
        /* Output Side */
-       /* DAC mixer before sound effect  */
+       /* DAC mixer before sound effect */
        SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0,
                rt5677_dac_l_mix, ARRAY_SIZE(rt5677_dac_l_mix)),
        SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0,
@@ -2376,13 +2694,20 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
        SND_SOC_DAPM_MUX("PDM2 R Mux", RT5677_PDM_OUT_CTRL, RT5677_M_PDM2_R_SFT,
                1, &rt5677_pdm2_r_mux),
 
-       SND_SOC_DAPM_PGA_S("LOUT1 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO1_BIT,
+       SND_SOC_DAPM_PGA_S("LOUT1 amp", 0, RT5677_PWR_ANLG1, RT5677_PWR_LO1_BIT,
                0, NULL, 0),
-       SND_SOC_DAPM_PGA_S("LOUT2 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO2_BIT,
+       SND_SOC_DAPM_PGA_S("LOUT2 amp", 0, RT5677_PWR_ANLG1, RT5677_PWR_LO2_BIT,
                0, NULL, 0),
-       SND_SOC_DAPM_PGA_S("LOUT3 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO3_BIT,
+       SND_SOC_DAPM_PGA_S("LOUT3 amp", 0, RT5677_PWR_ANLG1, RT5677_PWR_LO3_BIT,
                0, NULL, 0),
 
+       SND_SOC_DAPM_PGA_S("LOUT1 vref", 1, SND_SOC_NOPM, 0, 0,
+               rt5677_vref_event, SND_SOC_DAPM_POST_PMU),
+       SND_SOC_DAPM_PGA_S("LOUT2 vref", 1, SND_SOC_NOPM, 0, 0,
+               rt5677_vref_event, SND_SOC_DAPM_POST_PMU),
+       SND_SOC_DAPM_PGA_S("LOUT3 vref", 1, SND_SOC_NOPM, 0, 0,
+               rt5677_vref_event, SND_SOC_DAPM_POST_PMU),
+
        /* Output Lines */
        SND_SOC_DAPM_OUTPUT("LOUT1"),
        SND_SOC_DAPM_OUTPUT("LOUT2"),
@@ -2391,6 +2716,8 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
        SND_SOC_DAPM_OUTPUT("PDM1R"),
        SND_SOC_DAPM_OUTPUT("PDM2L"),
        SND_SOC_DAPM_OUTPUT("PDM2R"),
+
+       SND_SOC_DAPM_POST("vref", rt5677_vref_event),
 };
 
 static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
@@ -2621,11 +2948,42 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
        { "IF1 ADC4 Mux", "OB67", "OB67" },
        { "IF1 ADC4 Mux", "OB01", "OB01 Bypass Mux" },
 
+       { "IF1 ADC1 Swap Mux", "L/R", "IF1 ADC1 Mux" },
+       { "IF1 ADC1 Swap Mux", "R/L", "IF1 ADC1 Mux" },
+       { "IF1 ADC1 Swap Mux", "L/L", "IF1 ADC1 Mux" },
+       { "IF1 ADC1 Swap Mux", "R/R", "IF1 ADC1 Mux" },
+
+       { "IF1 ADC2 Swap Mux", "L/R", "IF1 ADC2 Mux" },
+       { "IF1 ADC2 Swap Mux", "R/L", "IF1 ADC2 Mux" },
+       { "IF1 ADC2 Swap Mux", "L/L", "IF1 ADC2 Mux" },
+       { "IF1 ADC2 Swap Mux", "R/R", "IF1 ADC2 Mux" },
+
+       { "IF1 ADC3 Swap Mux", "L/R", "IF1 ADC3 Mux" },
+       { "IF1 ADC3 Swap Mux", "R/L", "IF1 ADC3 Mux" },
+       { "IF1 ADC3 Swap Mux", "L/L", "IF1 ADC3 Mux" },
+       { "IF1 ADC3 Swap Mux", "R/R", "IF1 ADC3 Mux" },
+
+       { "IF1 ADC4 Swap Mux", "L/R", "IF1 ADC4 Mux" },
+       { "IF1 ADC4 Swap Mux", "R/L", "IF1 ADC4 Mux" },
+       { "IF1 ADC4 Swap Mux", "L/L", "IF1 ADC4 Mux" },
+       { "IF1 ADC4 Swap Mux", "R/R", "IF1 ADC4 Mux" },
+
+       { "IF1 ADC", NULL, "IF1 ADC1 Swap Mux" },
+       { "IF1 ADC", NULL, "IF1 ADC2 Swap Mux" },
+       { "IF1 ADC", NULL, "IF1 ADC3 Swap Mux" },
+       { "IF1 ADC", NULL, "IF1 ADC4 Swap Mux" },
+
+       { "IF1 ADC TDM Swap Mux", "1/2/3/4", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "2/1/3/4", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "2/3/1/4", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "4/1/2/3", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "1/3/2/4", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "1/4/2/3", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "3/1/2/4", "IF1 ADC" },
+       { "IF1 ADC TDM Swap Mux", "3/4/1/2", "IF1 ADC" },
+
        { "AIF1TX", NULL, "I2S1" },
-       { "AIF1TX", NULL, "IF1 ADC1 Mux" },
-       { "AIF1TX", NULL, "IF1 ADC2 Mux" },
-       { "AIF1TX", NULL, "IF1 ADC3 Mux" },
-       { "AIF1TX", NULL, "IF1 ADC4 Mux" },
+       { "AIF1TX", NULL, "IF1 ADC TDM Swap Mux" },
 
        { "IF2 ADC1 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
        { "IF2 ADC1 Mux", "OB01", "OB01 Bypass Mux" },
@@ -2642,11 +3000,42 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
        { "IF2 ADC4 Mux", "OB67", "OB67" },
        { "IF2 ADC4 Mux", "OB01", "OB01 Bypass Mux" },
 
+       { "IF2 ADC1 Swap Mux", "L/R", "IF2 ADC1 Mux" },
+       { "IF2 ADC1 Swap Mux", "R/L", "IF2 ADC1 Mux" },
+       { "IF2 ADC1 Swap Mux", "L/L", "IF2 ADC1 Mux" },
+       { "IF2 ADC1 Swap Mux", "R/R", "IF2 ADC1 Mux" },
+
+       { "IF2 ADC2 Swap Mux", "L/R", "IF2 ADC2 Mux" },
+       { "IF2 ADC2 Swap Mux", "R/L", "IF2 ADC2 Mux" },
+       { "IF2 ADC2 Swap Mux", "L/L", "IF2 ADC2 Mux" },
+       { "IF2 ADC2 Swap Mux", "R/R", "IF2 ADC2 Mux" },
+
+       { "IF2 ADC3 Swap Mux", "L/R", "IF2 ADC3 Mux" },
+       { "IF2 ADC3 Swap Mux", "R/L", "IF2 ADC3 Mux" },
+       { "IF2 ADC3 Swap Mux", "L/L", "IF2 ADC3 Mux" },
+       { "IF2 ADC3 Swap Mux", "R/R", "IF2 ADC3 Mux" },
+
+       { "IF2 ADC4 Swap Mux", "L/R", "IF2 ADC4 Mux" },
+       { "IF2 ADC4 Swap Mux", "R/L", "IF2 ADC4 Mux" },
+       { "IF2 ADC4 Swap Mux", "L/L", "IF2 ADC4 Mux" },
+       { "IF2 ADC4 Swap Mux", "R/R", "IF2 ADC4 Mux" },
+
+       { "IF2 ADC", NULL, "IF2 ADC1 Swap Mux" },
+       { "IF2 ADC", NULL, "IF2 ADC2 Swap Mux" },
+       { "IF2 ADC", NULL, "IF2 ADC3 Swap Mux" },
+       { "IF2 ADC", NULL, "IF2 ADC4 Swap Mux" },
+
+       { "IF2 ADC TDM Swap Mux", "1/2/3/4", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "2/1/3/4", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "3/1/2/4", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "4/1/2/3", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "1/3/2/4", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "1/4/2/3", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "2/3/1/4", "IF2 ADC" },
+       { "IF2 ADC TDM Swap Mux", "3/4/1/2", "IF2 ADC" },
+
        { "AIF2TX", NULL, "I2S2" },
-       { "AIF2TX", NULL, "IF2 ADC1 Mux" },
-       { "AIF2TX", NULL, "IF2 ADC2 Mux" },
-       { "AIF2TX", NULL, "IF2 ADC3 Mux" },
-       { "AIF2TX", NULL, "IF2 ADC4 Mux" },
+       { "AIF2TX", NULL, "IF2 ADC TDM Swap Mux" },
 
        { "IF3 ADC Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
        { "IF3 ADC Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
@@ -2836,14 +3225,86 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
        { "IF1 DAC6", NULL, "I2S1" },
        { "IF1 DAC7", NULL, "I2S1" },
 
-       { "IF1 DAC01", NULL, "IF1 DAC0" },
-       { "IF1 DAC01", NULL, "IF1 DAC1" },
-       { "IF1 DAC23", NULL, "IF1 DAC2" },
-       { "IF1 DAC23", NULL, "IF1 DAC3" },
-       { "IF1 DAC45", NULL, "IF1 DAC4" },
-       { "IF1 DAC45", NULL, "IF1 DAC5" },
-       { "IF1 DAC67", NULL, "IF1 DAC6" },
-       { "IF1 DAC67", NULL, "IF1 DAC7" },
+       { "IF1 DAC0 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC0 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC0 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC0 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC0 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC0 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC0 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC0 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC1 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC1 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC1 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC1 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC1 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC1 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC1 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC1 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC2 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC2 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC2 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC2 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC2 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC2 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC2 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC2 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC3 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC3 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC3 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC3 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC3 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC3 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC3 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC3 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC4 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC4 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC4 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC4 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC4 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC4 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC4 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC4 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC5 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC5 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC5 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC5 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC5 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC5 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC5 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC5 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC6 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC6 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC6 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC6 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC6 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC6 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC6 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC6 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC7 Mux", "Slot0", "IF1 DAC0" },
+       { "IF1 DAC7 Mux", "Slot1", "IF1 DAC1" },
+       { "IF1 DAC7 Mux", "Slot2", "IF1 DAC2" },
+       { "IF1 DAC7 Mux", "Slot3", "IF1 DAC3" },
+       { "IF1 DAC7 Mux", "Slot4", "IF1 DAC4" },
+       { "IF1 DAC7 Mux", "Slot5", "IF1 DAC5" },
+       { "IF1 DAC7 Mux", "Slot6", "IF1 DAC6" },
+       { "IF1 DAC7 Mux", "Slot7", "IF1 DAC7" },
+
+       { "IF1 DAC01", NULL, "IF1 DAC0 Mux" },
+       { "IF1 DAC01", NULL, "IF1 DAC1 Mux" },
+       { "IF1 DAC23", NULL, "IF1 DAC2 Mux" },
+       { "IF1 DAC23", NULL, "IF1 DAC3 Mux" },
+       { "IF1 DAC45", NULL, "IF1 DAC4 Mux" },
+       { "IF1 DAC45", NULL, "IF1 DAC5 Mux" },
+       { "IF1 DAC67", NULL, "IF1 DAC6 Mux" },
+       { "IF1 DAC67", NULL, "IF1 DAC7 Mux" },
 
        { "IF2 DAC0", NULL, "AIF2RX" },
        { "IF2 DAC1", NULL, "AIF2RX" },
@@ -2862,14 +3323,86 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
        { "IF2 DAC6", NULL, "I2S2" },
        { "IF2 DAC7", NULL, "I2S2" },
 
-       { "IF2 DAC01", NULL, "IF2 DAC0" },
-       { "IF2 DAC01", NULL, "IF2 DAC1" },
-       { "IF2 DAC23", NULL, "IF2 DAC2" },
-       { "IF2 DAC23", NULL, "IF2 DAC3" },
-       { "IF2 DAC45", NULL, "IF2 DAC4" },
-       { "IF2 DAC45", NULL, "IF2 DAC5" },
-       { "IF2 DAC67", NULL, "IF2 DAC6" },
-       { "IF2 DAC67", NULL, "IF2 DAC7" },
+       { "IF2 DAC0 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC0 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC0 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC0 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC0 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC0 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC0 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC0 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC1 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC1 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC1 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC1 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC1 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC1 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC1 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC1 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC2 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC2 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC2 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC2 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC2 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC2 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC2 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC2 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC3 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC3 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC3 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC3 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC3 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC3 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC3 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC3 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC4 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC4 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC4 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC4 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC4 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC4 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC4 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC4 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC5 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC5 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC5 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC5 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC5 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC5 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC5 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC5 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC6 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC6 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC6 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC6 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC6 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC6 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC6 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC6 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC7 Mux", "Slot0", "IF2 DAC0" },
+       { "IF2 DAC7 Mux", "Slot1", "IF2 DAC1" },
+       { "IF2 DAC7 Mux", "Slot2", "IF2 DAC2" },
+       { "IF2 DAC7 Mux", "Slot3", "IF2 DAC3" },
+       { "IF2 DAC7 Mux", "Slot4", "IF2 DAC4" },
+       { "IF2 DAC7 Mux", "Slot5", "IF2 DAC5" },
+       { "IF2 DAC7 Mux", "Slot6", "IF2 DAC6" },
+       { "IF2 DAC7 Mux", "Slot7", "IF2 DAC7" },
+
+       { "IF2 DAC01", NULL, "IF2 DAC0 Mux" },
+       { "IF2 DAC01", NULL, "IF2 DAC1 Mux" },
+       { "IF2 DAC23", NULL, "IF2 DAC2 Mux" },
+       { "IF2 DAC23", NULL, "IF2 DAC3 Mux" },
+       { "IF2 DAC45", NULL, "IF2 DAC4 Mux" },
+       { "IF2 DAC45", NULL, "IF2 DAC5 Mux" },
+       { "IF2 DAC67", NULL, "IF2 DAC6 Mux" },
+       { "IF2 DAC67", NULL, "IF2 DAC7 Mux" },
 
        { "IF3 DAC", NULL, "AIF3RX" },
        { "IF3 DAC", NULL, "I2S3" },
@@ -3073,9 +3606,13 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
        { "LOUT2 amp", NULL, "DAC 2" },
        { "LOUT3 amp", NULL, "DAC 3" },
 
-       { "LOUT1", NULL, "LOUT1 amp" },
-       { "LOUT2", NULL, "LOUT2 amp" },
-       { "LOUT3", NULL, "LOUT3 amp" },
+       { "LOUT1 vref", NULL, "LOUT1 amp" },
+       { "LOUT2 vref", NULL, "LOUT2 amp" },
+       { "LOUT3 vref", NULL, "LOUT3 amp" },
+
+       { "LOUT1", NULL, "LOUT1 vref" },
+       { "LOUT2", NULL, "LOUT2 vref" },
+       { "LOUT3", NULL, "LOUT3 vref" },
 
        { "PDM1L", NULL, "PDM1 L Mux" },
        { "PDM1R", NULL, "PDM1 R Mux" },
@@ -3458,14 +3995,12 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec,
                                RT5677_PR_BASE + RT5677_BIAS_CUR4,
                                0x0f00, 0x0f00);
                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
+                               RT5677_PWR_FV1 | RT5677_PWR_FV2 |
                                RT5677_PWR_VREF1 | RT5677_PWR_MB |
                                RT5677_PWR_BG | RT5677_PWR_VREF2,
                                RT5677_PWR_VREF1 | RT5677_PWR_MB |
                                RT5677_PWR_BG | RT5677_PWR_VREF2);
-                       mdelay(20);
-                       regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
-                               RT5677_PWR_FV1 | RT5677_PWR_FV2,
-                               RT5677_PWR_FV1 | RT5677_PWR_FV2);
+                       rt5677->is_vref_slow = false;
                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
                                RT5677_PWR_CORE, RT5677_PWR_CORE);
                        regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC,
@@ -3614,6 +4149,46 @@ static void rt5677_gpio_config(struct rt5677_priv *rt5677, unsigned offset,
        }
 }
 
+static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct regmap_irq_chip_data *data = rt5677->irq_data;
+       int irq;
+
+       if (offset >= RT5677_GPIO1 && offset <= RT5677_GPIO3) {
+               if ((rt5677->pdata.jd1_gpio == 1 && offset == RT5677_GPIO1) ||
+                       (rt5677->pdata.jd1_gpio == 2 &&
+                               offset == RT5677_GPIO2) ||
+                       (rt5677->pdata.jd1_gpio == 3 &&
+                               offset == RT5677_GPIO3)) {
+                       irq = RT5677_IRQ_JD1;
+               } else {
+                       return -ENXIO;
+               }
+       }
+
+       if (offset >= RT5677_GPIO4 && offset <= RT5677_GPIO6) {
+               if ((rt5677->pdata.jd2_gpio == 1 && offset == RT5677_GPIO4) ||
+                       (rt5677->pdata.jd2_gpio == 2 &&
+                               offset == RT5677_GPIO5) ||
+                       (rt5677->pdata.jd2_gpio == 3 &&
+                               offset == RT5677_GPIO6)) {
+                       irq = RT5677_IRQ_JD2;
+               } else if ((rt5677->pdata.jd3_gpio == 1 &&
+                               offset == RT5677_GPIO4) ||
+                       (rt5677->pdata.jd3_gpio == 2 &&
+                               offset == RT5677_GPIO5) ||
+                       (rt5677->pdata.jd3_gpio == 3 &&
+                               offset == RT5677_GPIO6)) {
+                       irq = RT5677_IRQ_JD3;
+               } else {
+                       return -ENXIO;
+               }
+       }
+
+       return regmap_irq_get_virq(data, irq);
+}
+
 static struct gpio_chip rt5677_template_chip = {
        .label                  = "rt5677",
        .owner                  = THIS_MODULE,
@@ -3621,6 +4196,7 @@ static struct gpio_chip rt5677_template_chip = {
        .set                    = rt5677_gpio_set,
        .direction_input        = rt5677_gpio_direction_in,
        .get                    = rt5677_gpio_get,
+       .to_irq                 = rt5677_to_irq,
        .can_sleep              = 1,
 };
 
@@ -3685,7 +4261,33 @@ static int rt5677_probe(struct snd_soc_codec *codec)
        for (i = 0; i < RT5677_GPIO_NUM; i++)
                rt5677_gpio_config(rt5677, i, rt5677->pdata.gpio_config[i]);
 
+       if (rt5677->irq_data) {
+               regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL1, 0x8000,
+                       0x8000);
+               regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x0018,
+                       0x0008);
+
+               if (rt5677->pdata.jd1_gpio)
+                       regmap_update_bits(rt5677->regmap, RT5677_JD_CTRL1,
+                               RT5677_SEL_GPIO_JD1_MASK,
+                               rt5677->pdata.jd1_gpio <<
+                               RT5677_SEL_GPIO_JD1_SFT);
+
+               if (rt5677->pdata.jd2_gpio)
+                       regmap_update_bits(rt5677->regmap, RT5677_JD_CTRL1,
+                               RT5677_SEL_GPIO_JD2_MASK,
+                               rt5677->pdata.jd2_gpio <<
+                               RT5677_SEL_GPIO_JD2_SFT);
+
+               if (rt5677->pdata.jd3_gpio)
+                       regmap_update_bits(rt5677->regmap, RT5677_JD_CTRL1,
+                               RT5677_SEL_GPIO_JD3_MASK,
+                               rt5677->pdata.jd3_gpio <<
+                               RT5677_SEL_GPIO_JD3_SFT);
+       }
+
        mutex_init(&rt5677->dsp_cmd_lock);
+       mutex_init(&rt5677->dsp_pri_lock);
 
        return 0;
 }
@@ -3738,6 +4340,51 @@ static int rt5677_resume(struct snd_soc_codec *codec)
 #define rt5677_resume NULL
 #endif
 
+static int rt5677_read(void *context, unsigned int reg, unsigned int *val)
+{
+       struct i2c_client *client = context;
+       struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
+
+       if (rt5677->is_dsp_mode) {
+               if (reg > 0xff) {
+                       mutex_lock(&rt5677->dsp_pri_lock);
+                       rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
+                               reg & 0xff);
+                       rt5677_dsp_mode_i2c_read(rt5677, RT5677_PRIV_DATA, val);
+                       mutex_unlock(&rt5677->dsp_pri_lock);
+               } else {
+                       rt5677_dsp_mode_i2c_read(rt5677, reg, val);
+               }
+       } else {
+               regmap_read(rt5677->regmap_physical, reg, val);
+       }
+
+       return 0;
+}
+
+static int rt5677_write(void *context, unsigned int reg, unsigned int val)
+{
+       struct i2c_client *client = context;
+       struct rt5677_priv *rt5677 = i2c_get_clientdata(client);
+
+       if (rt5677->is_dsp_mode) {
+               if (reg > 0xff) {
+                       mutex_lock(&rt5677->dsp_pri_lock);
+                       rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_INDEX,
+                               reg & 0xff);
+                       rt5677_dsp_mode_i2c_write(rt5677, RT5677_PRIV_DATA,
+                               val);
+                       mutex_unlock(&rt5677->dsp_pri_lock);
+               } else {
+                       rt5677_dsp_mode_i2c_write(rt5677, reg, val);
+               }
+       } else {
+               regmap_write(rt5677->regmap_physical, reg, val);
+       }
+
+       return 0;
+}
+
 #define RT5677_STEREO_RATES SNDRV_PCM_RATE_8000_96000
 #define RT5677_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
@@ -3863,6 +4510,20 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5677 = {
        .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes),
 };
 
+static const struct regmap_config rt5677_regmap_physical = {
+       .name = "physical",
+       .reg_bits = 8,
+       .val_bits = 16,
+
+       .max_register = RT5677_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5677_ranges) *
+                                               RT5677_PR_SPACING),
+       .readable_reg = rt5677_readable_register,
+
+       .cache_type = REGCACHE_NONE,
+       .ranges = rt5677_ranges,
+       .num_ranges = ARRAY_SIZE(rt5677_ranges),
+};
+
 static const struct regmap_config rt5677_regmap = {
        .reg_bits = 8,
        .val_bits = 16,
@@ -3872,6 +4533,8 @@ static const struct regmap_config rt5677_regmap = {
 
        .volatile_reg = rt5677_volatile_register,
        .readable_reg = rt5677_readable_register,
+       .reg_read = rt5677_read,
+       .reg_write = rt5677_write,
 
        .cache_type = REGCACHE_RBTREE,
        .reg_defaults = rt5677_reg,
@@ -3915,9 +4578,74 @@ static int rt5677_parse_dt(struct rt5677_priv *rt5677, struct device_node *np)
        of_property_read_u8_array(np, "realtek,gpio-config",
                rt5677->pdata.gpio_config, RT5677_GPIO_NUM);
 
+       of_property_read_u32(np, "realtek,jd1-gpio", &rt5677->pdata.jd1_gpio);
+       of_property_read_u32(np, "realtek,jd2-gpio", &rt5677->pdata.jd2_gpio);
+       of_property_read_u32(np, "realtek,jd3-gpio", &rt5677->pdata.jd3_gpio);
+
        return 0;
 }
 
+static struct regmap_irq rt5677_irqs[] = {
+       [RT5677_IRQ_JD1] = {
+               .reg_offset = 0,
+               .mask = RT5677_EN_IRQ_GPIO_JD1,
+       },
+       [RT5677_IRQ_JD2] = {
+               .reg_offset = 0,
+               .mask = RT5677_EN_IRQ_GPIO_JD2,
+       },
+       [RT5677_IRQ_JD3] = {
+               .reg_offset = 0,
+               .mask = RT5677_EN_IRQ_GPIO_JD3,
+       },
+};
+
+static struct regmap_irq_chip rt5677_irq_chip = {
+       .name = "rt5677",
+       .irqs = rt5677_irqs,
+       .num_irqs = ARRAY_SIZE(rt5677_irqs),
+
+       .num_regs = 1,
+       .status_base = RT5677_IRQ_CTRL1,
+       .mask_base = RT5677_IRQ_CTRL1,
+       .mask_invert = 1,
+};
+
+static int rt5677_init_irq(struct i2c_client *i2c)
+{
+       int ret;
+       struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c);
+
+       if (!rt5677->pdata.jd1_gpio &&
+               !rt5677->pdata.jd2_gpio &&
+               !rt5677->pdata.jd3_gpio)
+               return 0;
+
+       if (!i2c->irq) {
+               dev_err(&i2c->dev, "No interrupt specified\n");
+               return -EINVAL;
+       }
+
+       ret = regmap_add_irq_chip(rt5677->regmap, i2c->irq,
+               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 0,
+               &rt5677_irq_chip, &rt5677->irq_data);
+
+       if (ret != 0) {
+               dev_err(&i2c->dev, "Failed to register IRQ chip: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static void rt5677_free_irq(struct i2c_client *i2c)
+{
+       struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c);
+
+       if (rt5677->irq_data)
+               regmap_del_irq_chip(i2c->irq, rt5677->irq_data);
+}
+
 static int rt5677_i2c_probe(struct i2c_client *i2c,
                    const struct i2c_device_id *id)
 {
@@ -3963,7 +4691,16 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
                msleep(10);
        }
 
-       rt5677->regmap = devm_regmap_init_i2c(i2c, &rt5677_regmap);
+       rt5677->regmap_physical = devm_regmap_init_i2c(i2c,
+                                       &rt5677_regmap_physical);
+       if (IS_ERR(rt5677->regmap_physical)) {
+               ret = PTR_ERR(rt5677->regmap_physical);
+               dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                       ret);
+               return ret;
+       }
+
+       rt5677->regmap = devm_regmap_init(&i2c->dev, NULL, i2c, &rt5677_regmap);
        if (IS_ERR(rt5677->regmap)) {
                ret = PTR_ERR(rt5677->regmap);
                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -4015,6 +4752,7 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
        }
 
        rt5677_init_gpio(i2c);
+       rt5677_init_irq(i2c);
 
        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677,
                                      rt5677_dai, ARRAY_SIZE(rt5677_dai));
@@ -4023,6 +4761,7 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
 static int rt5677_i2c_remove(struct i2c_client *i2c)
 {
        snd_soc_unregister_codec(&i2c->dev);
+       rt5677_free_irq(i2c);
        rt5677_free_gpio(i2c);
 
        return 0;