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

Commit 0fac2590 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 61a6a108 9058020c

sound/soc/codecs/ssm2602.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -431,7 +431,8 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, 
static int ssm2602_set_bias_level(struct snd_soc_codec *codec,

static int ssm2602_set_bias_level(struct snd_soc_codec *codec,

				 enum snd_soc_bias_level level)

				 enum snd_soc_bias_level level)

{

{

	u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;

	u16 reg = snd_soc_read(codec, SSM2602_PWR);

	reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN);





	switch (level) {

	switch (level) {

	case SND_SOC_BIAS_ON:

	case SND_SOC_BIAS_ON:

sound/soc/omap/omap-mcbsp.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -516,6 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, 
	struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;

	struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;

	int err = 0;

	int err = 0;





	if (mcbsp_data->active)

		if (freq == mcbsp_data->in_freq)

			return 0;

		else

			return -EBUSY;



	/* The McBSP signal muxing functions are only available on McBSP1 */

	/* The McBSP signal muxing functions are only available on McBSP1 */

	if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||

	if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||

	    clk_id == OMAP_MCBSP_CLKR_SRC_CLKX ||

	    clk_id == OMAP_MCBSP_CLKR_SRC_CLKX ||