1 files changed, 39 insertions, 41 deletions

diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h
index d11b9c207e26..21f8e18c13c4 100644
--- a/sound/soc/codecs/rt5670.h
+++ b/sound/soc/codecs/rt5670.h
@@ -1023,50 +1023,33 @@
 #define RT5670_DMIC_2_M_NOR                     (0x0 << 8)
 #define RT5670_DMIC_2_M_ASYN                    (0x1 << 8)
 
+/* ASRC clock source selection (0x84, 0x85) */
+#define RT5670_CLK_SEL_SYS                      (0x0)
+#define RT5670_CLK_SEL_I2S1_ASRC                (0x1)
+#define RT5670_CLK_SEL_I2S2_ASRC                (0x2)
+#define RT5670_CLK_SEL_I2S3_ASRC                (0x3)
+#define RT5670_CLK_SEL_SYS2                     (0x5)
+#define RT5670_CLK_SEL_SYS3                     (0x6)
+
 /* ASRC Control 2 (0x84) */
-#define RT5670_MDA_L_M_MASK                     (0x1 << 15)
-#define RT5670_MDA_L_M_SFT                      15
-#define RT5670_MDA_L_M_NOR                      (0x0 << 15)
-#define RT5670_MDA_L_M_ASYN                     (0x1 << 15)
-#define RT5670_MDA_R_M_MASK                     (0x1 << 14)
-#define RT5670_MDA_R_M_SFT                      14
-#define RT5670_MDA_R_M_NOR                      (0x0 << 14)
-#define RT5670_MDA_R_M_ASYN                     (0x1 << 14)
-#define RT5670_MAD_L_M_MASK                     (0x1 << 13)
-#define RT5670_MAD_L_M_SFT                      13
-#define RT5670_MAD_L_M_NOR                      (0x0 << 13)
-#define RT5670_MAD_L_M_ASYN                     (0x1 << 13)
-#define RT5670_MAD_R_M_MASK                     (0x1 << 12)
-#define RT5670_MAD_R_M_SFT                      12
-#define RT5670_MAD_R_M_NOR                      (0x0 << 12)
-#define RT5670_MAD_R_M_ASYN                     (0x1 << 12)
-#define RT5670_ADC_M_MASK                       (0x1 << 11)
-#define RT5670_ADC_M_SFT                        11
-#define RT5670_ADC_M_NOR                        (0x0 << 11)
-#define RT5670_ADC_M_ASYN                       (0x1 << 11)
-#define RT5670_STO_DAC_M_MASK                   (0x1 << 5)
-#define RT5670_STO_DAC_M_SFT                    5
-#define RT5670_STO_DAC_M_NOR                    (0x0 << 5)
-#define RT5670_STO_DAC_M_ASYN                   (0x1 << 5)
-#define RT5670_I2S1_R_D_MASK                    (0x1 << 4)
-#define RT5670_I2S1_R_D_SFT                     4
-#define RT5670_I2S1_R_D_DIS                     (0x0 << 4)
-#define RT5670_I2S1_R_D_EN                      (0x1 << 4)
-#define RT5670_I2S2_R_D_MASK                    (0x1 << 3)
-#define RT5670_I2S2_R_D_SFT                     3
-#define RT5670_I2S2_R_D_DIS                     (0x0 << 3)
-#define RT5670_I2S2_R_D_EN                      (0x1 << 3)
-#define RT5670_PRE_SCLK_MASK                    (0x3)
-#define RT5670_PRE_SCLK_SFT                     0
-#define RT5670_PRE_SCLK_512                     (0x0)
-#define RT5670_PRE_SCLK_1024                    (0x1)
-#define RT5670_PRE_SCLK_2048                    (0x2)
+#define RT5670_DA_STO_CLK_SEL_MASK              (0xf << 12)
+#define RT5670_DA_STO_CLK_SEL_SFT               12
+#define RT5670_DA_MONOL_CLK_SEL_MASK            (0xf << 8)
+#define RT5670_DA_MONOL_CLK_SEL_SFT             8
+#define RT5670_DA_MONOR_CLK_SEL_MASK            (0xf << 4)
+#define RT5670_DA_MONOR_CLK_SEL_SFT             4
+#define RT5670_AD_STO1_CLK_SEL_MASK             (0xf << 0)
+#define RT5670_AD_STO1_CLK_SEL_SFT              0
 
 /* ASRC Control 3 (0x85) */
-#define RT5670_I2S1_RATE_MASK                   (0xf << 12)
-#define RT5670_I2S1_RATE_SFT                    12
-#define RT5670_I2S2_RATE_MASK                   (0xf << 8)
-#define RT5670_I2S2_RATE_SFT                    8
+#define RT5670_UP_CLK_SEL_MASK                  (0xf << 12)
+#define RT5670_UP_CLK_SEL_SFT                   12
+#define RT5670_DOWN_CLK_SEL_MASK                (0xf << 8)
+#define RT5670_DOWN_CLK_SEL_SFT                 8
+#define RT5670_AD_MONOL_CLK_SEL_MASK            (0xf << 4)
+#define RT5670_AD_MONOL_CLK_SEL_SFT             4
+#define RT5670_AD_MONOR_CLK_SEL_MASK            (0xf << 0)
+#define RT5670_AD_MONOR_CLK_SEL_SFT             0
 
 /* ASRC Control 4 (0x89) */
 #define RT5670_I2S1_PD_MASK                     (0x7 << 12)
@@ -1983,6 +1966,21 @@ enum {
         RT5670_DMIC_DATA_GPIO5,
 };
 
+/* filter mask */
+enum {
+        RT5670_DA_STEREO_FILTER = 0x1,
+        RT5670_DA_MONO_L_FILTER = (0x1 << 1),
+        RT5670_DA_MONO_R_FILTER = (0x1 << 2),
+        RT5670_AD_STEREO_FILTER = (0x1 << 3),
+        RT5670_AD_MONO_L_FILTER = (0x1 << 4),
+        RT5670_AD_MONO_R_FILTER = (0x1 << 5),
+        RT5670_UP_RATE_FILTER   = (0x1 << 6),
+        RT5670_DOWN_RATE_FILTER = (0x1 << 7),
+};
+
+int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                            unsigned int filter_mask, unsigned int clk_src);
+
 struct rt5670_priv {
         struct snd_soc_codec *codec;
         struct rt5670_platform_data pdata;