Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
  ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
  ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
  ALSA: usb-audio: add Yamaha MOX6/MOX8 support
  ALSA: virtuoso: add S/PDIF input support for all Xonars
  ALSA: ice1724 - Support for ooAoo SQ210a
  ALSA: ice1724 - Allow card info based on model only
  ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
  ALSA: hdspm - Provide unique driver id based on card serial
  ASoC: Dynamically allocate the rtd device for a non-empty release()
  ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
  ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
  ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
  ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
  ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
  ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
  ALSA: hda/cirrus - support for iMac12,2 model
  ASoC: cx20442: add bias control over a platform provided regulator
  ALSA: usb-audio - Avoid flood of frame-active debug messages
  ALSA: snd-usb-us122l: Delete calls to preempt_disable
  mfd: Put WM8994 into cache only mode when suspending
  ...

Fix up trivial conflicts in:
 - arch/arm/mach-s3c64xx/mach-crag6410.c:
	renamed speyside_wm8962 to tobermory, added littlemill right
	next to it
 - drivers/base/regmap/{regcache.c,regmap.c}:
	duplicate diff that had already come in with other changes in
	the regmap tree

11 files changed, 86 insertions, 13 deletions

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 28fcb27005d2..fb4bcf81a183 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -156,6 +156,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
                 else
                         /* The FIFO has 128 locations */
                         pdata->buffer_size = 0x80;
+        } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
+                /* The FIFO has 128 locations for all instances */
+                pdata->buffer_size = 0x80;
         }
 
         if (oh->class->rev >= MCBSP_CONFIG_TYPE3)
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 66600f05e436..11f1e735966e 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -436,6 +436,14 @@ static struct platform_device corgiled_device = {
 };
 
 /*
+ * Corgi Audio
+ */
+static struct platform_device corgi_audio_device = {
+        .name   = "corgi-audio",
+        .id     = -1,
+};
+
+/*
  * MMC/SD Device
  *
  * The card detect interrupt isn't debounced so we delay it by 250ms
@@ -641,6 +649,7 @@ static struct platform_device *devices[] __initdata = {
         &corgifb_device,
         &corgikbd_device,
         &corgiled_device,
+        &corgi_audio_device,
         &sharpsl_nand_device,
         &sharpsl_rom_device,
 };
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index f79a610c62fc..4cb2391a782e 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -528,12 +528,18 @@ static struct platform_device e740_t7l66xb_device = {
         .resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e740_audio_device = {
+        .name           = "e740-audio",
+        .id             = -1,
+};
+
 /* ----------------------------------------------------------------------- */
 
 static struct platform_device *e740_devices[] __initdata = {
         &e740_fb_device,
         &e740_t7l66xb_device,
         &e7xx_gpio_vbus,
+        &e740_audio_device,
 };
 
 static void __init e740_init(void)
@@ -722,12 +728,18 @@ static struct platform_device e750_tc6393xb_device = {
         .resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e750_audio_device = {
+        .name           = "e750-audio",
+        .id             = -1,
+};
+
 /* ------------------------------------------------------------- */
 
 static struct platform_device *e750_devices[] __initdata = {
         &e750_fb_device,
         &e750_tc6393xb_device,
         &e7xx_gpio_vbus,
+        &e750_audio_device,
 };
 
 static void __init e750_init(void)
@@ -929,12 +941,18 @@ static struct platform_device e800_tc6393xb_device = {
         .resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e800_audio_device = {
+        .name           = "e800-audio",
+        .id             = -1,
+};
+
 /* ----------------------------------------------------------------------- */
 
 static struct platform_device *e800_devices[] __initdata = {
         &e800_fb_device,
         &e800_tc6393xb_device,
         &e800_gpio_vbus,
+        &e800_audio_device,
 };
 
 static void __init e800_init(void)
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 69036e42ca31..744baee12c0c 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = {
 EXPORT_SYMBOL(poodle_scoop_device);
 
 
+static struct platform_device poodle_audio_device = {
+        .name   = "poodle-audio",
+        .id     = -1,
+};
+
 /* LoCoMo device */
 static struct resource locomo_resources[] = {
         [0] = {
@@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = {
 static struct platform_device *devices[] __initdata = {
         &poodle_locomo_device,
         &poodle_scoop_device,
+        &poodle_audio_device,
         &sharpsl_nand_device,
         &sharpsl_rom_device,
 };
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index d8a2467de92e..b0656e158d90 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = {
         .udc_command            = sg2_udc_command,
 };
 
+static struct platform_device imote2_audio_device = {
+        .name = "imote2-audio",
+        .id   = -1,
+};
+
 static struct platform_device *imote2_devices[] = {
         &stargate2_flash_device,
         &imote2_leds,
         &sht15,
+        &imote2_audio_device,
 };
 
 static void __init imote2_init(void)
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 7ce5c436cc4e..4d4eb60bad1e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -889,6 +889,11 @@ static struct platform_device wm9712_device = {
         .id     = -1,
 };
 
+static struct platform_device tosa_audio_device = {
+        .name   = "tosa-audio",
+        .id     = -1,
+};
+
 static struct platform_device *devices[] __initdata = {
         &tosascoop_device,
         &tosascoop_jc_device,
@@ -901,6 +906,7 @@ static struct platform_device *devices[] __initdata = {
         &sharpsl_rom_device,
         &wm9712_device,
         &tosa_gpio_vbus,
+        &tosa_audio_device,
 };
 
 static void tosa_poweroff(void)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 680fd758ff2d..1cc91d794c97 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -286,8 +286,8 @@ static struct platform_device lowland_device = {
         .id             = -1,
 };
 
-static struct platform_device speyside_wm8962_device = {
-        .name           = "speyside-wm8962",
+static struct platform_device tobermory_device = {
+        .name           = "tobermory",
         .id             = -1,
 };
 
@@ -347,7 +347,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
         &crag6410_lcd_powerdev,
         &crag6410_backlight_device,
         &speyside_device,
-        &speyside_wm8962_device,
+        &tobermory_device,
         &littlemill_device,
         &lowland_device,
         &wallvdd_device,
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 6a6f9f7568c2..d2e7b73aa9b6 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -762,9 +762,22 @@ static struct platform_device fsi_device = {
         },
 };
 
+static struct fsi_ak4642_info fsi2_ak4643_info = {
+        .name           = "AK4643",
+        .card           = "FSI2A-AK4643",
+        .cpu_dai        = "fsia-dai",
+        .codec          = "ak4642-codec.0-0013",
+        .platform       = "sh_fsi2",
+        .id             = FSI_PORT_A,
+};
+
 static struct platform_device fsi_ak4643_device = {
-        .name           = "sh_fsi2_a_ak4643",
+        .name   = "fsi-ak4642-audio",
+        .dev    = {
+                .platform_data  = &fsi_info,
+        },
 };
+
 static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
         .icb[0] = {
                 .marker_icb     = 30,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index ed5256687397..cbc5934ae03f 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -990,8 +990,20 @@ static struct platform_device fsi_device = {
         },
 };
 
+static struct fsi_ak4642_info fsi2_ak4643_info = {
+        .name           = "AK4643",
+        .card           = "FSI2A-AK4643",
+        .cpu_dai        = "fsia-dai",
+        .codec          = "ak4642-codec.0-0013",
+        .platform       = "sh_fsi2",
+        .id             = FSI_PORT_A,
+};
+
 static struct platform_device fsi_ak4643_device = {
-        .name           = "sh_fsi2_a_ak4643",
+        .name   = "fsi-ak4642-audio",
+        .dev    = {
+                .platform_data  = &fsi2_ak4643_info,
+        },
 };
 
 /*
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index a0f9634f6727..789bdc9e8f91 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -90,11 +90,11 @@ static struct wm8903_platform_data harmony_wm8903_pdata = {
         .micdet_delay = 100,
         .gpio_base = HARMONY_GPIO_WM8903(0),
         .gpio_cfg = {
-                WM8903_GPIO_NO_CONFIG,
-                WM8903_GPIO_NO_CONFIG,
                 0,
-                WM8903_GPIO_NO_CONFIG,
-                WM8903_GPIO_NO_CONFIG,
+                0,
+                WM8903_GPIO_CONFIG_ZERO,
+                0,
+                0,
         },
 };
 
diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index cfc74d46a09e..ebac65f52510 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@ -172,11 +172,11 @@ static struct wm8903_platform_data wm8903_pdata = {
         .micdet_delay = 100,
         .gpio_base = SEABOARD_GPIO_WM8903(0),
         .gpio_cfg = {
-                WM8903_GPIO_NO_CONFIG,
-                WM8903_GPIO_NO_CONFIG,
                 0,
-                WM8903_GPIO_NO_CONFIG,
-                WM8903_GPIO_NO_CONFIG,
+                0,
+                WM8903_GPIO_CONFIG_ZERO,
+                0,
+                0,
         },
 };