Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c0d539e authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/rt5640' of... 

Merge branch 'topic/rt5640' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
parents a657ae7e c49aed77

sound/soc/codecs/rt5640.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/rt5640.h

+1 −0
Original line number Diff line number Diff line
@@ -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)