1 files changed, 15 insertions, 10 deletions

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index e27c5a4a0a15..0ec7985ed306 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -1717,7 +1717,6 @@ static const struct snd_soc_dapm_widget rt5670_dapm_widgets[] = {
         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),
 
         /* DSP */
         SND_SOC_DAPM_PGA("TxDP_ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -2023,7 +2022,6 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = {
 
         { "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" },
@@ -2062,7 +2060,6 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = {
 
         { "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" },
@@ -2086,13 +2083,13 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = {
         { "IF1 ADC1 IN1 Mux", "IF1_ADC3", "IF1_ADC3" },
 
         { "IF1 ADC1 IN2 Mux", "IF1_ADC1_IN1", "IF1 ADC1 IN1 Mux" },
-        { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "IF1_ADC4" },
+        { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "TxDP_ADC" },
 
         { "IF1 ADC2 IN Mux", "IF_ADC2", "IF_ADC2" },
         { "IF1 ADC2 IN Mux", "VAD_ADC", "VAD_ADC" },
 
         { "IF1 ADC2 IN1 Mux", "IF1_ADC2_IN", "IF1 ADC2 IN Mux" },
-        { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "IF1_ADC4" },
+        { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "TxDP_ADC" },
 
         { "IF1_ADC1" , NULL, "IF1 ADC1 IN2 Mux" },
         { "IF1_ADC2" , NULL, "IF1 ADC2 IN1 Mux" },
@@ -2445,10 +2442,9 @@ static int rt5670_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         return 0;
 }
 
-static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
-                int clk_id, unsigned int freq, int dir)
+static int rt5670_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id,
+                                   int source, unsigned int freq, int dir)
 {
-        struct snd_soc_codec *codec = dai->codec;
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg_val = 0;
 
@@ -2472,7 +2468,7 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
         if (clk_id != RT5670_SCLK_S_RCCLK)
                 rt5670->sysclk_src = clk_id;
 
-        dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
+        dev_dbg(codec->dev, "Sysclk : %dHz clock id : %d\n", freq, clk_id);
 
         return 0;
 }
@@ -2724,7 +2720,6 @@ static int rt5670_resume(struct snd_soc_codec *codec)
 static const struct snd_soc_dai_ops rt5670_aif_dai_ops = {
         .hw_params = rt5670_hw_params,
         .set_fmt = rt5670_set_dai_fmt,
-        .set_sysclk = rt5670_set_dai_sysclk,
         .set_tdm_slot = rt5670_set_tdm_slot,
         .set_pll = rt5670_set_dai_pll,
 };
@@ -2777,6 +2772,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5670 = {
         .resume = rt5670_resume,
         .set_bias_level = rt5670_set_bias_level,
         .idle_bias_off = true,
+        .set_sysclk = rt5670_set_codec_sysclk,
         .component_driver = {
                 .controls               = rt5670_snd_controls,
                 .num_controls           = ARRAY_SIZE(rt5670_snd_controls),
@@ -2849,6 +2845,10 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Tablet B"),
                 },
         },
+        {}
+};
+
+static const struct dmi_system_id dmi_platform_intel_bytcht_jdmode2[] = {
         {
                 .ident = "Lenovo Thinkpad Tablet 10",
                 .matches = {
@@ -2883,6 +2883,11 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
                 rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
                 rt5670->pdata.dev_gpio = true;
                 rt5670->pdata.jd_mode = 1;
+        } else if (dmi_check_system(dmi_platform_intel_bytcht_jdmode2)) {
+                rt5670->pdata.dmic_en = true;
+                rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
+                rt5670->pdata.dev_gpio = true;
+                rt5670->pdata.jd_mode = 2;
         }
 
         rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap);