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

Merge remote-tracking branches 'asoc/topic/dmaengine', 'asoc/topic/fsi',... 

Merge remote-tracking branches 'asoc/topic/dmaengine', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/fsl-ssi' into asoc-next
parents 41caf056 0aed1124 9a42ab04 1169006b ca264189

drivers/dma/of-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, 


	return ERR_PTR(ret_no_channel);

}

EXPORT_SYMBOL_GPL(of_dma_request_slave_channel);



/**

 * of_dma_simple_xlate - Simple DMA engine translation function

sound/soc/fsl/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config SND_SOC_FSL_SAI 
	  in-tree drivers select it automatically.



config SND_SOC_FSL_SSI

	tristate "Synchronous Serial Interface module support"

	tristate "Synchronous Serial Interface module (SSI) support"

	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n

	select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)

	select REGMAP_MMIO
@@ -35,7 +35,7 @@ config SND_SOC_FSL_SSI 
	  in-tree drivers select it automatically.



config SND_SOC_FSL_SPDIF

	tristate "Sony/Philips Digital Interface module support"

	tristate "Sony/Philips Digital Interface (S/PDIF) module support"

	select REGMAP_MMIO

	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n

	select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)

sound/soc/fsl/fsl_ssi.c

+10 −22
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	const struct of_device_id *of_id;

	const char *p, *sprop;

	const uint32_t *iprop;

	struct resource res;

	struct resource *res;

	void __iomem *iomem;

	char name[64];
@@ -1335,19 +1335,11 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	}

	ssi_private->cpu_dai_drv.name = dev_name(&pdev->dev);



	/* Get the addresses and IRQ */

	ret = of_address_to_resource(np, 0, &res);

	if (ret) {

		dev_err(&pdev->dev, "could not determine device resources\n");

		return ret;

	}

	ssi_private->ssi_phys = res.start;



	iomem = devm_ioremap(&pdev->dev, res.start, resource_size(&res));

	if (!iomem) {

		dev_err(&pdev->dev, "could not map device resources\n");

		return -ENOMEM;

	}

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	if (IS_ERR(iomem))

		return PTR_ERR(iomem);

	ssi_private->ssi_phys = res->start;



	ret = of_property_match_string(np, "clock-names", "ipg");

	if (ret < 0) {
@@ -1393,7 +1385,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
			return ret;

	}



	ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,

	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,

					      &ssi_private->cpu_dai_drv, 1);

	if (ret) {

		dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
@@ -1407,13 +1399,13 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
		if (ret < 0) {

			dev_err(&pdev->dev, "could not claim irq %u\n",

					ssi_private->irq);

			goto error_irq;

			goto error_asoc_register;

		}

	}



	ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);

	if (ret)

		goto error_irq;

		goto error_asoc_register;



	/*

	 * If codec-handle property is missing from SSI node, we assume
@@ -1454,9 +1446,6 @@ done: 
error_sound_card:

	fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);



error_irq:

	snd_soc_unregister_component(&pdev->dev);



error_asoc_register:

	if (ssi_private->soc->imx)

		fsl_ssi_imx_clean(pdev, ssi_private);
@@ -1472,7 +1461,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) 


	if (ssi_private->pdev)

		platform_device_unregister(ssi_private->pdev);

	snd_soc_unregister_component(&pdev->dev);



	if (ssi_private->soc->imx)

		fsl_ssi_imx_clean(pdev, ssi_private);

sound/soc/fsl/mpc5200_psc_ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int psc_ac97_of_remove(struct platform_device *op) 
}



/* Match table for of_platform binding */

static struct of_device_id psc_ac97_match[] = {

static const struct of_device_id psc_ac97_match[] = {

	{ .compatible = "fsl,mpc5200-psc-ac97", },

	{ .compatible = "fsl,mpc5200b-psc-ac97", },

	{}

sound/soc/fsl/mpc5200_psc_i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int psc_i2s_of_remove(struct platform_device *op) 
}



/* Match table for of_platform binding */

static struct of_device_id psc_i2s_match[] = {

static const struct of_device_id psc_i2s_match[] = {

	{ .compatible = "fsl,mpc5200-psc-i2s", },

	{ .compatible = "fsl,mpc5200b-psc-i2s", },

	{}