diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-15 14:12:00 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-15 14:12:00 (GMT) |
| commit | 0c0d539e3335c79d00cf96d9cae24973ca1cfc3e (patch) | |
| tree | 639de8ccedcc2e06e994c8dc72a9079498ad6953 | |
| parent | a657ae7e5c0c9fd8858e5498e6de65c222d206d1 (diff) | |
| parent | c49aed77d55b42a1ec5e1d01c2ab788abc82717c (diff) | |
| download | linux-0c0d539e3335c79d00cf96d9cae24973ca1cfc3e.tar.xz | |
Merge branch 'topic/rt5640' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5640.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 09e8988..b0f6f07 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1870,6 +1870,9 @@ 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_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 58b664b..90c8871 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -984,6 +984,7 @@ #define RT5640_SCLK_SRC_SFT 14 #define RT5640_SCLK_SRC_MCLK (0x0 << 14) #define RT5640_SCLK_SRC_PLL1 (0x1 << 14) +#define RT5640_SCLK_SRC_RCCLK (0x2 << 14) #define RT5640_PLL1_SRC_MASK (0x3 << 12) #define RT5640_PLL1_SRC_SFT 12 #define RT5640_PLL1_SRC_MCLK (0x0 << 12) |