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

Commit d839c98f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and... 

Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'asoc/fix/tfa9879' into asoc-linus
parents a78001b0 60a8d62b c479163a 427ced4b

sound/soc/codecs/rt5677.c

+4 −1
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ static const struct reg_default init_list[] = { 
	{RT5677_PR_BASE + 0x1e,	0x0000},

	{RT5677_PR_BASE + 0x12,	0x0eaa},

	{RT5677_PR_BASE + 0x14,	0x018a},

	{RT5677_PR_BASE + 0x15,	0x0490},

	{RT5677_PR_BASE + 0x38,	0x0f71},

	{RT5677_PR_BASE + 0x39,	0x0f71},

};

#define RT5677_INIT_REG_LEN ARRAY_SIZE(init_list)
@@ -914,7 +917,7 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	int idx = rl6231_calc_dmic_clk(rt5677->sysclk);

	int idx = rl6231_calc_dmic_clk(rt5677->lrck[RT5677_AIF1] << 8);



	if (idx < 0)

		dev_err(codec->dev, "Failed to set DMIC clock\n");

sound/soc/codecs/tfa9879.c

+2 −2
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ static int tfa9879_i2c_probe(struct i2c_client *i2c, 
	int i;



	tfa9879 = devm_kzalloc(&i2c->dev, sizeof(*tfa9879), GFP_KERNEL);

	if (IS_ERR(tfa9879))

		return PTR_ERR(tfa9879);

	if (!tfa9879)

		return -ENOMEM;



	i2c_set_clientdata(i2c, tfa9879);

sound/soc/samsung/s3c24xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) 
		return -ENOENT;

	}

	s3c24xx_i2s.regs = devm_ioremap_resource(&pdev->dev, res);

	if (s3c24xx_i2s.regs == NULL)

		return -ENXIO;

	if (IS_ERR(s3c24xx_i2s.regs))

		return PTR_ERR(s3c24xx_i2s.regs);



	s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO;

	s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO;