diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-28 09:55:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-28 09:55:01 +0100 |
| commit | 1693849f71b818be9e6e2b6e6fbcb45f6f518f96 (patch) | |
| tree | fb718e7373047d94860f81acc621f6765e96fce4 | |
| parent | 5afc13af36d2fdaa48bc54386c6ad43590d88be5 (diff) | |
| parent | 19118eb8dc3cd6bb1b1fdf0e4ad62070c6683158 (diff) | |
| download | linux-frv-1693849f71b818be9e6e2b6e6fbcb45f6f518f96.tar.gz | |
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.
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 4 | ||||
| -rw-r--r-- | sound/soc/omap/zoom2.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 68f2cd1a920615..5a6aeaf552a896 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -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; } diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 677b567935f805..1ff6bb9ade5c98 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -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> |