From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jan 2012 16:00:30 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
X-Git-Tag: v3.3-rc1~88
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a429638cac1e5c656818a45aaff78df7b743004e;p=karo-tx-linux.git

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
---

a429638cac1e5c656818a45aaff78df7b743004e
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 6fdb450b05fb,2c1b2cb85399..ecc6a6cd26c1
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -34,12 -32,10 +34,13 @@@ powervr	Imagination Technologie
  qcom	Qualcomm, Inc.
  ramtron	Ramtron International
  samsung	Samsung Semiconductor
 +sbs	Smart Battery System
  schindler	Schindler
 +sil	Silicon Image
  simtek
  sirf	SiRF Technology, Inc.
 +st	STMicroelectronics
  stericsson	ST-Ericsson
  ti	Texas Instruments
+ wlf	Wolfson Microelectronics
  xlnx	Xilinx
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 680fd758ff2d,55c0e75f5edc..1cc91d794c97
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -347,8 -338,7 +347,8 @@@ static struct platform_device *crag6410
  	&crag6410_lcd_powerdev,
  	&crag6410_backlight_device,
  	&speyside_device,
- 	&speyside_wm8962_device,
+ 	&tobermory_device,
 +	&littlemill_device,
  	&lowland_device,
  	&wallvdd_device,
  };
diff --cc arch/sh/boards/mach-se/7724/setup.c
index affde85ff63e,b49723b21912..2585733e9bce
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@@ -301,10 -310,25 +301,22 @@@ static struct platform_device fsi_devic
  	.dev	= {
  		.platform_data	= &fsi_info,
  	},
 -	.archdata = {
 -		.hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
 -	},
  };
  
+ static struct fsi_ak4642_info fsi_ak4642_info = {
+ 	.name		= "AK4642",
+ 	.card		= "FSIA-AK4642",
+ 	.cpu_dai	= "fsia-dai",
+ 	.codec		= "ak4642-codec.0-0012",
+ 	.platform	= "sh_fsi.0",
+ 	.id		= FSI_PORT_A,
+ };
+ 
  static struct platform_device fsi_ak4642_device = {
- 	.name		= "sh_fsi_a_ak4642",
+ 	.name	= "fsi-ak4642-audio",
+ 	.dev	= {
+ 		.platform_data	= &fsi_ak4642_info,
+ 	},
  };
  
  /* KEYSC in SoC (Needs SW33-2 set to ON) */