Unverified Commit 9ebacc8c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/amd',... 

Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/amd', 'asoc/fix/atmel', 'asoc/fix/da7218', 'asoc/fix/da7219', 'asoc/fix/fsl-asrc' and 'asoc/fix/fsl-ssi' into asoc-linus
parents 57ef0a43 50dd2ea8 fdaa4511 0f0be40b b7926c46 d3b05352 b89b6925 b880b805

Documentation/devicetree/bindings/sound/da7218.txt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ Example: 
		compatible = "dlg,da7218";

		reg = <0x1a>;

		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		wakeup-source;



		VDD-supply = <&reg_audio>;

Documentation/devicetree/bindings/sound/da7219.txt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Example: 
		reg = <0x1a>;



		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;



		VDD-supply = <&reg_audio>;

		VDDMIC-supply = <&reg_audio>;

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

+7 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,11 @@ static int acp_audio_probe(struct platform_device *pdev) 
	struct resource *res;

	const u32 *pdata = pdev->dev.platform_data;



	if (!pdata) {

		dev_err(&pdev->dev, "Missing platform data\n");

		return -ENODEV;

	}



	audio_drv_data = devm_kzalloc(&pdev->dev, sizeof(struct audio_drv_data),

					GFP_KERNEL);

	if (audio_drv_data == NULL)
@@ -1058,6 +1063,8 @@ static int acp_audio_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	audio_drv_data->acp_mmio = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(audio_drv_data->acp_mmio))

		return PTR_ERR(audio_drv_data->acp_mmio);



	/* The following members gets populated in device 'open'

	 * function. Till then interrupts are disabled in 'acp_init'

sound/soc/atmel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ config SND_AT91_SOC_SAM9X5_WM8731 
config SND_ATMEL_SOC_CLASSD

	tristate "Atmel ASoC driver for boards using CLASSD"

	depends on ARCH_AT91 || COMPILE_TEST

	select SND_ATMEL_SOC_DMA

	select SND_SOC_GENERIC_DMAENGINE_PCM

	select REGMAP_MMIO

	help

	  Say Y if you want to add support for Atmel ASoC driver for boards using

sound/soc/codecs/da7218.c

+1 −1
Original line number Diff line number Diff line
@@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) 
	}



	if (da7218->dev_id == DA7218_DEV_ID) {

		hpldet_np = of_find_node_by_name(np, "da7218_hpldet");

		hpldet_np = of_get_child_by_name(np, "da7218_hpldet");

		if (!hpldet_np)

			return pdata;