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

Commit 1693849f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

ASoC: Fixes for v3.7

Clean up some fallout from the OMAP header reorganisation and a minor
fix for DMIC which has no practical effect but is neater.
parents 5afc13af 19118eb8

sound/soc/omap/omap-dmic.c

+2 −2
Original line number Diff line number Diff line
@@ -464,9 +464,9 @@ static __devinit int asoc_dmic_probe(struct platform_device *pdev) 


	mutex_init(&dmic->mutex);



	dmic->fclk = clk_get(dmic->dev, "dmic_fck");

	dmic->fclk = clk_get(dmic->dev, "fck");

	if (IS_ERR(dmic->fclk)) {

		dev_err(dmic->dev, "cant get dmic_fck\n");

		dev_err(dmic->dev, "cant get fck\n");

		return -ENODEV;

	}

sound/soc/omap/zoom2.c

+2 −3
Original line number Diff line number Diff line
@@ -21,15 +21,14 @@ 


#include <linux/clk.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/soc.h>



#include <asm/mach-types.h>

#include <mach/hardware.h>

#include <mach/gpio.h>

#include <mach/board-zoom.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/gpio-omap.h>



/* Register descriptions for twl4030 codec part */

#include <linux/mfd/twl4030-audio.h>