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

Unverified Commit 44fedd7d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-4.18' into asoc-4.19 for amd dep

parents 3bec6fa3 1b31de92

sound/soc/amd/acp-pcm-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -773,6 +773,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, 
	if (WARN_ON(!rtd))

		return -EINVAL;



	if (pinfo)

		rtd->i2s_instance = pinfo->i2s_instance;

	if (adata->asic_type == CHIP_STONEY) {

		val = acp_reg_read(adata->acp_mmio,

sound/soc/codecs/cs47l24.c

+8 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,12 @@ static int cs47l24_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);

	if (ret != 0)

		dev_warn(&pdev->dev,

			 "Failed to set compressed IRQ as a wake source: %d\n",

			 ret);



	arizona_init_common(arizona);



	ret = arizona_init_vol_limit(arizona);
@@ -1306,6 +1312,7 @@ static int cs47l24_probe(struct platform_device *pdev) 
err_spk_irqs:

	arizona_free_spk_irqs(arizona);

err_dsp_irq:

	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);



	return ret;
@@ -1323,6 +1330,7 @@ static int cs47l24_remove(struct platform_device *pdev) 


	arizona_free_spk_irqs(arizona);



	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);



	return 0;

sound/soc/codecs/wm5102.c

+8 −0
Original line number Diff line number Diff line
@@ -2094,6 +2094,12 @@ static int wm5102_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);

	if (ret != 0)

		dev_warn(&pdev->dev,

			 "Failed to set compressed IRQ as a wake source: %d\n",

			 ret);



	arizona_init_common(arizona);



	ret = arizona_init_vol_limit(arizona);
@@ -2117,6 +2123,7 @@ static int wm5102_probe(struct platform_device *pdev) 
err_spk_irqs:

	arizona_free_spk_irqs(arizona);

err_dsp_irq:

	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);



	return ret;
@@ -2133,6 +2140,7 @@ static int wm5102_remove(struct platform_device *pdev) 


	arizona_free_spk_irqs(arizona);



	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);



	return 0;

sound/soc/codecs/wm5110.c

+8 −0
Original line number Diff line number Diff line
@@ -2455,6 +2455,12 @@ static int wm5110_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);

	if (ret != 0)

		dev_warn(&pdev->dev,

			 "Failed to set compressed IRQ as a wake source: %d\n",

			 ret);



	arizona_init_common(arizona);



	ret = arizona_init_vol_limit(arizona);
@@ -2478,6 +2484,7 @@ static int wm5110_probe(struct platform_device *pdev) 
err_spk_irqs:

	arizona_free_spk_irqs(arizona);

err_dsp_irq:

	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);



	return ret;
@@ -2496,6 +2503,7 @@ static int wm5110_remove(struct platform_device *pdev) 


	arizona_free_spk_irqs(arizona);



	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);



	return 0;

sound/soc/sh/rcar/core.c

+6 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,12 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, 
		of_node_put(capture);

	}



	if (rsnd_ssi_is_pin_sharing(io_capture) ||

	    rsnd_ssi_is_pin_sharing(io_playback)) {

		/* should have symmetric_rates if pin sharing */

		drv->symmetric_rates = 1;

	}



	dev_dbg(dev, "%s (%s/%s)\n", rdai->name,

		rsnd_io_to_mod_ssi(io_playback) ? "play"    : " -- ",

		rsnd_io_to_mod_ssi(io_capture) ? "capture" : "  --   ");