Merge branch 'fix/asoc' into for-linus (673bca19) · Commits · 戴 / test

sound/soc/codecs/ad1836.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		#include <linux/init.h>
		#include <linux/module.h>
		#include <linux/version.h>
		#include <linux/kernel.h>
		#include <linux/device.h>
		#include <sound/core.h>

sound/soc/codecs/ad1938.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@

		#include <linux/init.h>
		#include <linux/module.h>
		#include <linux/version.h>
		#include <linux/kernel.h>
		#include <linux/device.h>
		#include <sound/core.h>

sound/soc/codecs/wm8974.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@

		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/version.h>
		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/delay.h>

sound/soc/fsl/mpc5200_dma.c

+20 −13

Original line number	Diff line number	Diff line
		@@ -447,6 +447,7 @@ int mpc5200_audio_dma_create(struct of_device *op)
		int size, irq, rc;
		const __be32 *prop;
		void __iomem *regs;
		int ret;

		/* Fetch the registers and IRQ of the PSC */
		irq = irq_of_parse_and_map(op->node, 0);
		@@ -463,14 +464,16 @@ int mpc5200_audio_dma_create(struct of_device *op)
		/* Allocate and initialize the driver private data */
		psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
		if (!psc_dma) {
		iounmap(regs);
		return -ENOMEM;
		ret = -ENOMEM;
		goto out_unmap;
		}

		/* Get the PSC ID */
		prop = of_get_property(op->node, "cell-index", &size);
		if (!prop \|\| size < sizeof *prop)
		return -ENODEV;
		if (!prop \|\| size < sizeof *prop) {
		ret = -ENODEV;
		goto out_free;
		}

		spin_lock_init(&psc_dma->lock);
		mutex_init(&psc_dma->mutex);
		@@ -493,9 +496,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
		if (!psc_dma->capture.bcom_task \|\|
		!psc_dma->playback.bcom_task) {
		dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
		iounmap(regs);
		kfree(psc_dma);
		return -ENODEV;
		ret = -ENODEV;
		goto out_free;
		}

		/* Disable all interrupts and reset the PSC */
		@@ -537,12 +539,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
		&psc_dma_bcom_irq_tx, IRQF_SHARED,
		"psc-dma-playback", &psc_dma->playback);
		if (rc) {
		free_irq(psc_dma->irq, psc_dma);
		free_irq(psc_dma->capture.irq,
		&psc_dma->capture);
		free_irq(psc_dma->playback.irq,
		&psc_dma->playback);
		return -ENODEV;
		ret = -ENODEV;
		goto out_irq;
		}

		/* Save what we've done so it can be found again later */
		@@ -550,6 +548,15 @@ int mpc5200_audio_dma_create(struct of_device *op)

		/* Tell the ASoC OF helpers about it */
		return snd_soc_register_platform(&mpc5200_audio_dma_platform);
		out_irq:
		free_irq(psc_dma->irq, psc_dma);
		free_irq(psc_dma->capture.irq, &psc_dma->capture);
		free_irq(psc_dma->playback.irq, &psc_dma->playback);
		out_free:
		kfree(psc_dma);
		out_unmap:
		iounmap(regs);
		return ret;
		}
		EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create);

sound/soc/s3c24xx/s3c-i2s-v2.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -230,6 +230,8 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
		pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic);
		}

		#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)

		/*
		* Wait for the LR signal to allow synchronisation to the L/R clock
		* from the codec. May only be needed for slave mode.
		@@ -237,20 +239,22 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
		static int s3c2412_snd_lrsync(struct s3c_i2sv2_info *i2s)
		{
		u32 iiscon;
		unsigned long timeout = jiffies + msecs_to_jiffies(5);
		unsigned long loops = msecs_to_loops(5);

		pr_debug("Entered %s\n", __func__);

		while (1) {
		while (--loops) {
		iiscon = readl(i2s->regs + S3C2412_IISCON);
		if (iiscon & S3C2412_IISCON_LRINDEX)
		break;

		if (timeout < jiffies) {
		cpu_relax();
		}

		if (!loops) {
		printk(KERN_ERR "%s: timeout\n", __func__);
		return -ETIMEDOUT;
		}
		}

		return 0;
		}

Admin message