ASoC: rt5640: Remove the unused or incorrect setting of clock source

The patch removes the unused or incorrect setting of clock source.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 19634d0992bcf98c30acbda85f8e7c58e21ff660..4c866135e40fcce0b843bb53ad5fc58678a6c3f7 100644 (file)
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -487,7 +487,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
 
        val = snd_soc_read(source->codec, RT5640_GLB_CLK);
        val &= RT5640_SCLK_SRC_MASK;
-       if (val == RT5640_SCLK_SRC_PLL1 || val == RT5640_SCLK_SRC_PLL1T)
+       if (val == RT5640_SCLK_SRC_PLL1)
                return 1;
        else
                return 0;
@@ -1694,12 +1694,6 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai,
        case RT5640_SCLK_S_PLL1:
                reg_val |= RT5640_SCLK_SRC_PLL1;
                break;
-       case RT5640_SCLK_S_PLL1_TK:
-               reg_val |= RT5640_SCLK_SRC_PLL1T;
-               break;
-       case RT5640_SCLK_S_RCCLK:
-               reg_val |= RT5640_SCLK_SRC_RCCLK;
-               break;
        default:
                dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
                return -EINVAL;

diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 5e8df25a13f34b9edc2e992a49d2a1e7a22d7e88..cbd07b5f8060c53e9a89f398a6d0433972540460 100644 (file)
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -976,8 +976,6 @@
 #define RT5640_SCLK_SRC_SFT                    14
 #define RT5640_SCLK_SRC_MCLK                   (0x0 << 14)
 #define RT5640_SCLK_SRC_PLL1                   (0x1 << 14)
-#define RT5640_SCLK_SRC_PLL1T                  (0x2 << 14)
-#define RT5640_SCLK_SRC_RCCLK                  (0x3 << 14) /* 15MHz */
 #define RT5640_PLL1_SRC_MASK                   (0x3 << 12)
 #define RT5640_PLL1_SRC_SFT                    12
 #define RT5640_PLL1_SRC_MCLK                   (0x0 << 12)