linux-2.6
11 years agoASoC: Set the MPC5200 i2s driver to BROKEN status.
Jon Smirl [Mon, 27 Apr 2009 16:44:41 +0000 (12:44 -0400)] 
ASoC: Set the MPC5200 i2s driver to BROKEN status.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix logic in WM8350 master clocking check
Mark Brown [Mon, 27 Apr 2009 18:18:22 +0000 (19:18 +0100)] 
ASoC: Fix logic in WM8350 master clocking check

We need to check only if the WM8350 is master and only when starting
the stream so if either is not true then we can skip the check.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: s3c-i2s-v2 needs to declare a license for modular builds
Mark Brown [Thu, 23 Apr 2009 14:43:45 +0000 (15:43 +0100)] 
ASoC: s3c-i2s-v2 needs to declare a license for modular builds

It relies on EXPORT_SYMBOL_GPL() symbols.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge commit 'takashi/fix/asoc' into for-2.6.30
Mark Brown [Thu, 23 Apr 2009 09:33:47 +0000 (10:33 +0100)] 
Merge commit 'takashi/fix/asoc' into for-2.6.30

11 years agoASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991
Takashi Iwai [Thu, 23 Apr 2009 06:22:23 +0000 (08:22 +0200)] 
ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: Fix WM8580 volume update handling for large register changes
Mark Brown [Tue, 21 Apr 2009 11:57:00 +0000 (12:57 +0100)] 
ASoC: Fix WM8580 volume update handling for large register changes

The driver is out of sync with the core functions it is using.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix offset of freqmode in WM8580 PLL configuration
Mark Brown [Tue, 21 Apr 2009 11:35:15 +0000 (12:35 +0100)] 
ASoC: Fix offset of freqmode in WM8580 PLL configuration

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
11 years agoASoC: Fix warning in wm9705
Russell King - ARM Linux [Sat, 18 Apr 2009 09:11:53 +0000 (10:11 +0100)] 
ASoC: Fix warning in wm9705

I notice that the fixes were merged, minus one:

sound/soc/codecs/wm9705.c: At top level:
sound/soc/codecs/wm9705.c:445: warning: initialization from incompatible pointer type

so you might find this trivial patch useful.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: Update contact addresses
Jarkko Nikula [Fri, 17 Apr 2009 11:42:26 +0000 (14:42 +0300)] 
ASoC: OMAP: Update contact addresses

My email address is going to expire soon so update it. Adding also
Peter Ujfalusi <peter.ujfalusi@nokia.com> as a second contact to OMAP core
drivers since I won't have anymore access to non-public OMAP documentation
in the future and Peter is working with these drivers as well.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR
Philipp Zabel [Fri, 17 Apr 2009 09:39:38 +0000 (11:39 +0200)] 
ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR

Those macros are just screwed as soon as CONFIG_PXA25x is enabled.

This patch
- changes ssp_set_scr to take an ssp_dev pointer instead of ssp_device
- adds a corresponding ssp_get_scr function.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: Fix FS polarity in OSK5912 machine driver
Jarkko Nikula [Wed, 15 Apr 2009 10:48:17 +0000 (13:48 +0300)] 
ASoC: OMAP: Fix FS polarity in OSK5912 machine driver

Using inverted FS polarity in OSK5912 must be an error since TLV320AIC23
do not have support for inverted polarities. This is mostly due the hassle
with the DSP formats in OMAP McBSP DAI and inversion on OMAP side probably
just made this configuration working at some point.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Arun KS <arunks@mistralsolutions.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
Jarkko Nikula [Wed, 15 Apr 2009 10:48:16 +0000 (13:48 +0300)] 
ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver

The DSP format wasn't still correct in OMAP McBSP DAI even after the commit
bd25867a6cbe7a00ef7dbe8d9ddebc91b00b9b3f.

Thanks to Peter Ujfalusi <peter.ujfalusi@nokia.com> for noticing and being
part of the fix. Now the FS length definition is more clear by defining
it with  FWID(0).

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix include build error in s3c2412-i2s.c
Ben Dooks [Thu, 16 Apr 2009 09:32:21 +0000 (10:32 +0100)] 
ASoC: Fix include build error in s3c2412-i2s.c

Fix accidental change of <mach/regs-gpio.h> to
<plat/regs-gpio.h> in s3c2412-i2s.c

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
Ben Dooks [Thu, 16 Apr 2009 09:32:22 +0000 (10:32 +0100)] 
ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes

Fix the build error in s3c-i2s-v2.c caused by
a change to the snd_soc_dai ops field.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
Ben Dooks [Thu, 16 Apr 2009 09:32:23 +0000 (10:32 +0100)] 
ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate

The definition of s3c_i2sv2_iis_calc_rate was never
renamed from s3c2412_iis_calc_rate, so rename this
to allow the build to work.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix jive_wm8750.c build problems
Ben Dooks [Thu, 16 Apr 2009 09:32:20 +0000 (10:32 +0100)] 
ASoC: Fix jive_wm8750.c build problems

Fix build errors in sound/soc/s3c24xx/jive_wm8750.c
from changes to ASoC.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: pxa-ssp: allow setting of dai format 0
Daniel Mack [Wed, 15 Apr 2009 18:24:45 +0000 (20:24 +0200)] 
ASoC: pxa-ssp: allow setting of dai format 0

pxa_ssp_set_dai_fmt() currently has an early exit if the desired format
equals the current configuration. This is correct behaviour unless this
function is called with a zero value parameter for the first time.
Zero is a valid value for this function, but the early exit is bogus in
this case.

Hence, set priv->dai_fmt to -1 in the beginning so we can configure the
port.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: pHilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Disable S3C64xx support in Kconfig
Mark Brown [Thu, 9 Apr 2009 15:40:41 +0000 (16:40 +0100)] 
ASoC: Disable S3C64xx support in Kconfig

Due to the process and communications issues with the 2.6.30 S3C
platform merges none of the underlying arch/arm code for S3C64xx audio
support made it into mainline, rendering the drivers useless.  Disable
them in Kconfig to avoid user confusion - users patching in the required
support can always reenable this too.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h
Eric Miao [Thu, 9 Apr 2009 06:13:07 +0000 (14:13 +0800)] 
ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: TWL4030: Compillation error fix
Peter Ujfalusi [Tue, 7 Apr 2009 06:14:00 +0000 (09:14 +0300)] 
ASoC: TWL4030: Compillation error fix

Fix for compillation error introduced by the constrain patch.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: fsl_dma: Pass the proper device for dma mapping routines
Anton Vorontsov [Sat, 4 Apr 2009 18:33:19 +0000 (22:33 +0400)] 
ASoC: fsl_dma: Pass the proper device for dma mapping routines

The driver should pass a device that specifies internal DMA ops, but
substream->pcm is just a logical device, and thus doesn't have arch-
specific dma callbacks, therefore following bug appears:

  Freescale Synchronous Serial Interface (SSI) ASoC Driver
  ------------[ cut here ]------------
  kernel BUG at arch/powerpc/include/asm/dma-mapping.h:237!
  Oops: Exception in kernel mode, sig: 5 [#1]
  ...
  NIP [c02259c4] snd_malloc_dev_pages+0x58/0xac
  LR [c0225c74] snd_dma_alloc_pages+0xf8/0x108
  Call Trace:
  [df02bde0] [df02be2c] 0xdf02be2c (unreliable)
  [df02bdf0] [c0225c74] snd_dma_alloc_pages+0xf8/0x108
  [df02be10] [c023a100] fsl_dma_new+0x68/0x124
  [df02be20] [c02342ac] soc_new_pcm+0x1bc/0x234
  [df02bea0] [c02343dc] snd_soc_new_pcms+0xb8/0x148
  [df02bed0] [c023824c] cs4270_probe+0x34/0x124
  [df02bef0] [c0232fe8] snd_soc_instantiate_card+0x1a4/0x2f4
  [df02bf20] [c0233164] snd_soc_instantiate_cards+0x2c/0x68
  [df02bf30] [c0234704] snd_soc_register_platform+0x60/0x80
  [df02bf50] [c03d5664] fsl_soc_platform_init+0x18/0x28
  ...

This patch fixes the issue by using card's device instead.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix null dereference in ak4535_remove()
Dan Carpenter [Mon, 6 Apr 2009 01:50:46 +0000 (03:50 +0200)] 
ASoC: Fix null dereference in ak4535_remove()

ak4535_remove() from sound/soc/codecs/ak4535.c calls
i2c_unregister_device() with a possibly null pointer.

This bug was found by smatch (http://repo.or.cz/w/smatch.git/).

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: TWL4030: Add actual support for 96KHz playback support
Peter Ujfalusi [Fri, 3 Apr 2009 11:39:05 +0000 (14:39 +0300)] 
ASoC: TWL4030: Add actual support for 96KHz playback support

Adds the needed code to be able to use 96KHz playback.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Implement suspend and resume operations for WM9705
Mark Brown [Thu, 2 Apr 2009 14:49:41 +0000 (15:49 +0100)] 
ASoC: Implement suspend and resume operations for WM9705

Without this the WM9705 driver fails badly when resuming.

Tested-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Set parent for AC97 devices we register
Mark Brown [Wed, 1 Apr 2009 18:35:01 +0000 (19:35 +0100)] 
ASoC: Set parent for AC97 devices we register

Ensure that any AC97 devices that bind to the CODEC are below the
ASoC device in the device tree so the suspend and resume code can
figure out what order to handle them in.

Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Don't defer resume work for AC97 codecs
Mark Brown [Tue, 31 Mar 2009 10:27:03 +0000 (11:27 +0100)] 
ASoC: Don't defer resume work for AC97 codecs

AC97 devices may have other drivers hanging off them directly so need to
have resumed when the resume function returns meaning that we can't defer
the resume - complete it immediately for them. Non-AC97 devices should
not have other drivers hanging directly off the ASoC devices.

We only really need the deferral for non-AC97 devices - it's there since
some I2C buses are very slow and non-AC97 codecs often have large numbers
of registers to restore and require delays to bring the codec up cleanly
leading to a substantial impact on overall resume time.

Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add some documentation for the ASoC jack API
Mark Brown [Fri, 27 Mar 2009 17:14:52 +0000 (17:14 +0000)] 
ASoC: Add some documentation for the ASoC jack API

A brief overview of how the components of the API fit together.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: Set minimum buffer size constraint for McBSP2 in OMAP3
Jarkko Nikula [Fri, 27 Mar 2009 13:32:01 +0000 (15:32 +0200)] 
ASoC: OMAP: Set minimum buffer size constraint for McBSP2 in OMAP3

McBSP2 in OMAP3 has 1 ksample (1k x 32 bit) internal FIFO. During
initial playback startup, this FIFO is keeping the DMA request active
until the FIFO is full.

So now if ALSA buffer size is smaller, DMA is looping around it while
filling up the HW FIFO, generating burst of interrupts as well and SW
doesn't have any change to fill enough data.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: TWL4030: Add constrains for second stream
Peter Ujfalusi [Fri, 27 Mar 2009 08:39:08 +0000 (10:39 +0200)] 
ASoC: TWL4030: Add constrains for second stream

In case of duplex mode (capture and playback at the same time), the second
stream has to have the same parameters (rate, sample size) as the already
running stream.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: TWL4030: 96KHz playback support
Peter Ujfalusi [Fri, 27 Mar 2009 08:39:07 +0000 (10:39 +0200)] 
ASoC: TWL4030: 96KHz playback support

TWL4030 supports 96KHz sample playback, but only playback.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: trim SSI sysfs statistics in Freescale MPC8610 sound drivers
Timur Tabi [Thu, 26 Mar 2009 16:42:38 +0000 (11:42 -0500)] 
ASoC: trim SSI sysfs statistics in Freescale MPC8610 sound drivers

Optimize the display of SSI statistics in the Freescale MPC8610 sound driver
to display the status count only of the interrupts that were actually enabled.
Previously, it would display the counts of all SISR status bits, even those
that were not enabled.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agopxa2xx-ac97: fix displaying GSR after reset timeout
Luotao Fu [Thu, 26 Mar 2009 12:18:03 +0000 (13:18 +0100)] 
pxa2xx-ac97: fix displaying GSR after reset timeout

the variable gsr_bit is set in isr. It is however set to 0 and interrupts are
disabled prior to reset. Hence it doesn't make a lot of sense to show the
content of gsr_bit in case of a reset timeout.

Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: remove trigger delay in Freescale MPC8610 sound driver
Timur Tabi [Wed, 25 Mar 2009 23:20:37 +0000 (18:20 -0500)] 
ASoC: remove trigger delay in Freescale MPC8610 sound driver

Remove the delay from the trigger function in the Freescale MPC8610 sound
driver when capture is started.  This delay was used to ensure that the DMA
controller was active when ALSA call the .pointer function to request a
DMA transfer status.  A better approach is for the .pointer function to detect
that DMA has not started, and return zero instead.  This change eliminates
the need for the delay.

Also add some related code to check for a DMA programming error, and report
XRUN if it occurs.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add Magician machine support
Philipp Zabel [Thu, 19 Mar 2009 08:34:46 +0000 (09:34 +0100)] 
ASoC: Add Magician machine support

HTC Magician has a Philips UDA1380 codec connected via
SSP1 (playback) and I2S (capture).
There is a flip-flop between the SSP frame clock output
and the codec's word select input pin. To make the codec
see proper I2S input, the SSP has to send two frames per
sample.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: pxa-ssp: Use 16-bit DMA for magician stereo
Philipp Zabel [Thu, 19 Mar 2009 08:32:01 +0000 (09:32 +0100)] 
ASoC: pxa-ssp: Use 16-bit DMA for magician stereo

Now magician and similar boards can use network mode with only one
active slot to explicitly set 16 bit frame width, even for S16_LE
stereo sound.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
Takashi Iwai [Thu, 19 Mar 2009 13:08:58 +0000 (14:08 +0100)] 
ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c

Fix the wrong device pointer passed to dev_err().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: Declare Headset as Mic and Headphone widgets for SDP3430
Lopez Cruz, Misael [Thu, 19 Mar 2009 06:07:34 +0000 (01:07 -0500)] 
ASoC: Declare Headset as Mic and Headphone widgets for SDP3430

Headset was declared previously as a Headphone widget connecting
HSMIC and HSOL/HSOR pins of TWL4030 codec in SDP430 machine driver.
The capture path becomes invalid as the Headphone widget is not a
valid input endpoint.

Instead of that, the Headset is declared as separate Microphone
and Headphone widgets. Current patch modifies audio map:

- Headset Mic: HSMIC with bias
- Headset Stereophone: HSOL, HSOR

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: N810: Add more jack functions
Jarkko Nikula [Wed, 18 Mar 2009 14:46:54 +0000 (16:46 +0200)] 
ASoC: OMAP: N810: Add more jack functions

Add functions "Headset" and "Mic" to the control "Jack Function" for
activating and de-activating codec input pin LINE1L which is connected to
the mic pin of 4-pole Nokia AV connecter.

Note there is no mic bias voltage management here since bias is coming from
Nokia ASIC and driver for it is not in mainline.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: OMAP: N810: Mark not connected input pins
Jarkko Nikula [Wed, 18 Mar 2009 14:46:53 +0000 (16:46 +0200)] 
ASoC: OMAP: N810: Mark not connected input pins

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add FLL support for WM8400
Mark Brown [Wed, 18 Mar 2009 18:28:01 +0000 (18:28 +0000)] 
ASoC: Add FLL support for WM8400

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add separate AVDD for WM8400
Mark Brown [Wed, 18 Mar 2009 15:19:48 +0000 (15:19 +0000)] 
ASoC: Add separate AVDD for WM8400

There is an AVDD supply as well, normally one or more of the other
upplies would be tied to it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Further optimise WM8400 bias configuration sequence
Mark Brown [Wed, 18 Mar 2009 15:19:10 +0000 (15:19 +0000)] 
ASoC: Further optimise WM8400 bias configuration sequence

The active discharge does not bring sufficient benefit to justify the
lengthy times involved so don't do that.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge branch 'pxa-ssp' into for-2.6.30
Mark Brown [Tue, 17 Mar 2009 19:07:26 +0000 (19:07 +0000)] 
Merge branch 'pxa-ssp' into for-2.6.30

11 years agoASoC: Only deregister AC97 dev if it's name was not "AC97"
Atsushi Nemoto [Mon, 16 Mar 2009 14:26:20 +0000 (23:26 +0900)] 
ASoC: Only deregister AC97 dev if it's name was not "AC97"

The commit 14fa43f53ff3a9c3d8b9662574b7369812a31a97 ("ASoC: Only
register AC97 bus if it's not done already") added a condition for
calling of soc_ac97_dev_register() but not added for calling of
soc_ac97_dev_unregister().  This patch adds same condition for
soc_ac97_dev_unregister().  Without this fix, kernel crashes when
unloading an asoc driver.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Each PXA AC97 DAI needs a separate ops
Mark Brown [Mon, 16 Mar 2009 14:13:12 +0000 (14:13 +0000)] 
ASoC: Each PXA AC97 DAI needs a separate ops

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix some missing dai_ops conversions
Mark Brown [Mon, 16 Mar 2009 14:02:07 +0000 (14:02 +0000)] 
ASoC: Fix some missing dai_ops conversions

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: twl4030 - Fix build error
Joonyoung Shim [Mon, 16 Mar 2009 12:23:35 +0000 (21:23 +0900)] 
ASoC: twl4030 - Fix build error

CC      sound/soc/codecs/twl4030.o
sound/soc/codecs/twl4030.c:1400: warning: braces around scalar initializer
sound/soc/codecs/twl4030.c:1400: warning: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1401: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1401: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1401: warning: initialization from incompatible pointer type
sound/soc/codecs/twl4030.c:1402: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1402: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1402: warning: excess elements in scalar initializer
sound/soc/codecs/twl4030.c:1402: warning: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1403: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1403: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1403: warning: excess elements in scalar initializer
sound/soc/codecs/twl4030.c:1403: warning: (near initialization for 'twl4030_dai.ops')

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Allow choice of ac97 gpio reset line
Robert Jarzmik [Sun, 15 Mar 2009 13:10:54 +0000 (14:10 +0100)] 
ASoC: Allow choice of ac97 gpio reset line

As the PXA27x series allow 2 gpios to reset the ac97 bus,
allow through platform data configuration the definition of
the correct gpio which will reset the AC97 bus.

This comes from a silicon defect on the PXA27x series, where
the gpio must be manually controlled in warm reset cases.

Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix Zylonite for non-networked SSP mode
Mark Brown [Fri, 13 Mar 2009 14:27:08 +0000 (14:27 +0000)] 
ASoC: Fix Zylonite for non-networked SSP mode

This also simplifies the code a bit.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix non-networked I2S mode for PXA SSP
Mark Brown [Fri, 13 Mar 2009 14:26:08 +0000 (14:26 +0000)] 
ASoC: Fix non-networked I2S mode for PXA SSP

Two issues are fixed here:

 - I2S transmits the left frame with the clock low but I don't seem to
   get LRCLK out without SFRMDLY being set so invert SFRMP and set a
   delay.
 - I2S has a clock cycle prior to the first data byte in each channel
   so we need to delay the data by one cycle.

Tested-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: switch PXA SSP driver from network mode to PSP
Daniel Mack [Thu, 12 Mar 2009 10:27:49 +0000 (11:27 +0100)] 
ASoC: switch PXA SSP driver from network mode to PSP

This switches the pxa ssp port usage from network mode to PSP mode.
Removed some comments and checks for configured TDM channels.
A special case is added to support configuration where BCLK = 64fs. We
need to do some black magic in this case which doesn't look nice but
there is unfortunately no other option than that.

Diagnosed-by: Tim Ruetz <tim@caiaq.de>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Move headset jack registration to device initialization for SDP3430
Lopez Cruz, Misael [Fri, 13 Mar 2009 02:45:27 +0000 (21:45 -0500)] 
ASoC: Move headset jack registration to device initialization for SDP3430

Move headset jack registration to the codec/machine specific
initialization. Having the jack registration in machine init
causes that the jack device gets initialized but not registered
since the sound card is registered before the jack. Moving jack
registration to device initialization will register the jack
device along with all other devices associated to the card when
the card is registed. As a consequence of jack device registered
properly, the jack is detected as an input device.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Replace remaining uses of snd_soc_cnew with snd_soc_add_controls.
Philipp Zabel [Thu, 12 Mar 2009 10:07:54 +0000 (11:07 +0100)] 
ASoC: Replace remaining uses of snd_soc_cnew with snd_soc_add_controls.

The drivers are basically duplicating the same code over and over.
As snd_soc_cnew is going to be made static some time after the next
merge window, we might as well convert them now.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Move WM8580 to normal I2C device probe
Mark Brown [Wed, 11 Mar 2009 18:31:08 +0000 (18:31 +0000)] 
ASoC: Move WM8580 to normal I2C device probe

Refactor the WM8580 device registration to probe via standard I2C device
registration, registering the DAIs once the device has probed via I2C.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge branch 's3c-iis-header' into for-2.6.30
Mark Brown [Wed, 11 Mar 2009 18:30:48 +0000 (18:30 +0000)] 
Merge branch 's3c-iis-header' into for-2.6.30

11 years ago[ARM] Revert futher extraneous changes from the S3C header move
Mark Brown [Wed, 11 Mar 2009 18:28:24 +0000 (18:28 +0000)] 
[ARM] Revert futher extraneous changes from the S3C header move

Can't see any immediate need for these; build tested.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Merge dai_ops factor out
Mark Brown [Wed, 11 Mar 2009 16:51:31 +0000 (16:51 +0000)] 
ASoC: Merge dai_ops factor out

Merge Eric Maio's patch to merge snd_soc_dai_ops out of line.  Fixed
merge issues and updated drivers, plus an issue with the ops for the two
s3c2443 AC97 DAIs having been merged.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix formats for s3c24xx-i2s register prints
Mark Brown [Wed, 11 Mar 2009 16:28:29 +0000 (16:28 +0000)] 
ASoC: Fix formats for s3c24xx-i2s register prints

The register values are all u32 so don't need the long format.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Remove version display from WM8580 driver
Mark Brown [Wed, 11 Mar 2009 14:12:28 +0000 (14:12 +0000)] 
ASoC: Remove version display from WM8580 driver

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add initial driver for the WM8400 CODEC
Mark Brown [Tue, 10 Mar 2009 10:55:15 +0000 (10:55 +0000)] 
ASoC: Add initial driver for the WM8400 CODEC

The WM8400 is a highly integrated audio CODEC and power management unit
intended for mobile multimedia application.  This driver supports the
primary audio CODEC features, including:

 - 1W speaker driver
 - Fully differential headphone output
 - Up to 4 differential microphone inputs

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: buildfix for OSK
David Brownell [Wed, 11 Mar 2009 10:37:25 +0000 (02:37 -0800)] 
ASoC: buildfix for OSK

Buildfix:

  CC      sound/soc/omap/osk5912.o
  sound/soc/omap/osk5912.c: In function 'osk_soc_init':
  sound/soc/omap/osk5912.c:189: error: implicit declaration of function 'clk_get_usecount'
  make[3]: *** [sound/soc/omap/osk5912.o] Error 1

There's no such (standard) clock interface.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge branch 's3c-iis-header' into for-2.6.30
Mark Brown [Wed, 11 Mar 2009 11:12:48 +0000 (11:12 +0000)] 
Merge branch 's3c-iis-header' into for-2.6.30

Conflicts:
arch/arm/mach-shark/include/mach/io.h

11 years ago[ARM] Revert extraneous changes from the S3C audio header move
Mark Brown [Wed, 11 Mar 2009 11:02:33 +0000 (11:02 +0000)] 
[ARM] Revert extraneous changes from the S3C audio header move

These changes were included in the S3C audio header move but are not
directly related to it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix up merge with the ARM tree
Mark Brown [Tue, 10 Mar 2009 19:51:07 +0000 (19:51 +0000)] 
ASoC: Fix up merge with the ARM tree

The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: don't touch pxa-ssp registers when stream is running
Daniel Mack [Tue, 10 Mar 2009 15:41:00 +0000 (16:41 +0100)] 
ASoC: don't touch pxa-ssp registers when stream is running

In pxa_ssp_set_dai_fmt(), check whether there is anything to do at all.
If there would be but the SSP port is in use already, bail out.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoALSA: ASoC: Davinci: Updated sffsdr_hw_params() function to new format
Hugo Villeneuve [Tue, 10 Mar 2009 03:32:08 +0000 (23:32 -0400)] 
ALSA: ASoC: Davinci: Updated sffsdr_hw_params() function to new format

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoALSA: ASoC: Davinci: Replaced DAI format RIGHT_J by DSP_B for SFFSDR
Hugo Villeneuve [Tue, 10 Mar 2009 03:32:07 +0000 (23:32 -0400)] 
ALSA: ASoC: Davinci: Replaced DAI format RIGHT_J by DSP_B for SFFSDR

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge commit 'takashi/topic/asoc' into for-2.6.30
Mark Brown [Tue, 10 Mar 2009 15:42:03 +0000 (15:42 +0000)] 
Merge commit 'takashi/topic/asoc' into for-2.6.30

11 years agoASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitions
Ben Dooks [Mon, 9 Mar 2009 17:47:13 +0000 (17:47 +0000)] 
ASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitions

The definitions of S3C2412_IISMOD_SDF_MSB and S3C2412_IISMOD_SDF_LSB
are incorrect, being the same S3C2412_IISMOD_SDF_IIS which is the
only correct one in this series.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Convert PXA AC97 driver to probe with the platform device
Mark Brown [Mon, 9 Mar 2009 18:18:33 +0000 (18:18 +0000)] 
ASoC: Convert PXA AC97 driver to probe with the platform device

This will break any boards that don't register the AC97 controller
device due to using ASoC.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Mon, 9 Mar 2009 11:05:21 +0000 (12:05 +0100)] 
Merge branch 'for-2.6.30' of git://git./linux/kernel/git/broonie/sound-2.6 into topic/asoc

11 years agoASoC: Add a driver for AK4104 S/PDIF transmitter
Daniel Mack [Mon, 9 Mar 2009 01:13:17 +0000 (02:13 +0100)] 
ASoC: Add a driver for AK4104 S/PDIF transmitter

This adds a driver for the SPI connected AK4104 S/PDIF transmitter
device. Its features are fairly simple, but as there is need to set up
certain bits in the IEC958 information, this better goes into a real
driver.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Mark Brown <broonie@sirena.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix Kconfig dependency of CONFIG_SND_S3C24XX_SOC_JIVE_WM8750
Takashi Iwai [Sun, 8 Mar 2009 23:52:17 +0000 (00:52 +0100)] 
ASoC: Fix Kconfig dependency of CONFIG_SND_S3C24XX_SOC_JIVE_WM8750

Remove a non-existing Kconfig CONFIG_SND_SOC_WM8750_SPI.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: Remove unneeded forward reference to WM8753 SPI implementation
Mark Brown [Sun, 8 Mar 2009 18:57:34 +0000 (18:57 +0000)] 
ASoC: Remove unneeded forward reference to WM8753 SPI implementation

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: bring cs4270 feature/limitations list in sync
Daniel Mack [Sun, 8 Mar 2009 16:51:52 +0000 (17:51 +0100)] 
ASoC: bring cs4270 feature/limitations list in sync

Removes numbers from the list of features/limitations and makes it
reflect recent changes to the code.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Improve pause/unpause performance in Freescale 8610 drivers
Timur Tabi [Sat, 7 Mar 2009 00:39:34 +0000 (18:39 -0600)] 
ASoC: Improve pause/unpause performance in Freescale 8610 drivers

Add support for true pause and unpause.  Without this, mplayer will drop some
audio (less than one second, but still noticeable) when pausing playback.

Remove support for PM suspend and resume from the trigger function, since the
driver doesn't support PM anyway.

Optimize the delay after starting capture.  Instead of delaying 1ms, the driver
now polls the hardware.  The new delay is shorter by over 90% yet still
effective.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Davinci: Fix incorrect machine type for SFFSDR board
Hugo Villeneuve [Fri, 6 Mar 2009 20:56:53 +0000 (15:56 -0500)] 
ASoC: Davinci: Fix incorrect machine type for SFFSDR board

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix logging severity for some S3C error messages
Mark Brown [Fri, 6 Mar 2009 18:13:43 +0000 (18:13 +0000)] 
ASoC: Fix logging severity for some S3C error messages

Upgrade the severity of some failure messages from debug level so
they're displayed by default.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Re-remove hand-rolled pr_debug() macros
Mark Brown [Fri, 6 Mar 2009 18:04:34 +0000 (18:04 +0000)] 
ASoC: Re-remove hand-rolled pr_debug() macros

The recent set of S3C64xx patches re-added a lot of uses of DBG() that
had previously been removed - revert this so the standard pr_debug()
macro is used.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Staticise workqueue function for GPIO jack detection
Mark Brown [Fri, 6 Mar 2009 11:32:17 +0000 (11:32 +0000)] 
ASoC: Staticise workqueue function for GPIO jack detection

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Blackfin: fix typo in MUTE definition
Mike Frysinger [Fri, 6 Mar 2009 07:53:30 +0000 (15:53 +0800)] 
ASoC: Blackfin: fix typo in MUTE definition

Reported-by: Rob Maris <maris.rob@vdi.de>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Blackfin: move gpio_err behind the define that is only user of it
Mike Frysinger [Fri, 6 Mar 2009 07:53:28 +0000 (15:53 +0800)] 
ASoC: Blackfin: move gpio_err behind the define that is only user of it

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add headset jack detection for SDP3430 machine driver
Lopez Cruz, Misael [Thu, 5 Mar 2009 17:32:31 +0000 (11:32 -0600)] 
ASoC: Add headset jack detection for SDP3430 machine driver

Add headset jack detection for SDP3430 boards using SoC jack
reporting interface. Headset detection on SDP3430 board is
achieved through TWL4030 GPIO_2 pin.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: add support for SSI asynchronous mode to the Freescale SSI drivers
Timur Tabi [Thu, 5 Mar 2009 23:23:37 +0000 (17:23 -0600)] 
ASoC: add support for SSI asynchronous mode to the Freescale SSI drivers

Add a new device tree property for the SSI node: "fsl,ssi-asynchronous".  If
defined, the SSI is programmed into asynchronous mode, otherwise it is
programmed into synchronous mode.  In asynchronous mode, pin SRCK must be
connected to the same clock source as STFS, and pin SRFS must be connected to
the same signal as STFS.  Asynchronous mode allows playback and capture to
use different sample sizes.  It also technically allows different sample rates,
but the driver does not support that.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Update Kconfig for Samsung CPUs to reflect S3C64xx support
Mark Brown [Thu, 5 Mar 2009 17:26:15 +0000 (17:26 +0000)] 
ASoC: Update Kconfig for Samsung CPUs to reflect S3C64xx support

We now support the 64xx series as well as the 24xx series - make sure
people using Kconfig know this.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix memory allocation for snd_soc_dapm_switch names
Mark Brown [Thu, 5 Mar 2009 17:06:23 +0000 (17:06 +0000)] 
ASoC: Fix memory allocation for snd_soc_dapm_switch names

snd_soc_dapm_switch ends up ends up in dapm_new_mixer() (since a switch
is a special case of a mixer with only one input) but this wasn't
correctly handled in the code.

Also fix the coding style for the switch below while we're here.

Reported-by: Joonyoung Shim <dofmind@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: add two more bitfields for PXA SSP
Daniel Mack [Thu, 5 Mar 2009 13:21:26 +0000 (14:21 +0100)] 
ASoC: add two more bitfields for PXA SSP

Add two more bitfields for the PSP register. As they seem to exist
for PXA3xx only, define them conditionally.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Factor out DAPM widget power check into separate function
Mark Brown [Sun, 1 Mar 2009 19:21:10 +0000 (19:21 +0000)] 
ASoC: Factor out DAPM widget power check into separate function

Essentially simple code motion to facilitate refactoring of the power
decisions.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Fix name of register bit in pxa-ssp
Daniel Mack [Wed, 4 Mar 2009 20:16:57 +0000 (21:16 +0100)] 
ASoC: Fix name of register bit in pxa-ssp

A bit in PXA's SSCR0 register was erroneously named ADC but its name is
in fact ACS (audio clock select).

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: TWL4030: Make the HS ramp delay configurable
Peter Ujfalusi [Thu, 5 Mar 2009 10:48:49 +0000 (12:48 +0200)] 
ASoC: TWL4030: Make the HS ramp delay configurable

Enum type for selecting the desired ramp delay for the headset output.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Refresh JIVE driver
Mark Brown [Wed, 4 Mar 2009 20:17:48 +0000 (20:17 +0000)] 
ASoC: Refresh JIVE driver

Remove uneeded startup callback and use snd_soc_dapm_nc_pin()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Select DMA if I2S is configured
Ben Dooks [Wed, 4 Mar 2009 00:49:34 +0000 (00:49 +0000)] 
ASoC: Select DMA if I2S is configured

Select the relevant DMA implementation when the
sound driver is selected.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add s3c64xx-i2s support
Ben Dooks [Wed, 4 Mar 2009 00:49:31 +0000 (00:49 +0000)] 
ASoC: Add s3c64xx-i2s support

Add the initial code to support the S3C64XX I2S hardware using the
s3c-i2s-v2 core code.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Split s3c2412-i2s.c into core and SoC specific parts
Ben Dooks [Wed, 4 Mar 2009 00:49:30 +0000 (00:49 +0000)] 
ASoC: Split s3c2412-i2s.c into core and SoC specific parts

The S3C2412 I2S (IIS) interface is replicated on further Samsung SoC
parts in a broadly compatible way, so split the common code out into
a core called s3c-i2s-v2.[ch] so that the newer SoCs such as the
S3C6410 can make use of it.

As such, all the original s3c2412 functions are currently being left
with their original names, and will be renamed later in the series.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add JIVE audio support
Ben Dooks [Wed, 4 Mar 2009 00:49:27 +0000 (00:49 +0000)] 
ASoC: Add JIVE audio support

Add support for the Jive's WM8750 codec attached via the S3C2412 IIS.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: Add DAPM machine widgets to SDP3430 driver
Lopez Cruz, Misael [Wed, 4 Mar 2009 17:39:07 +0000 (11:39 -0600)] 
ASoC: Add DAPM machine widgets to SDP3430 driver

Add DAPM machine domain widgets to SDP3430 machine driver.
Interconnection:
* Ext Mic: MAINMIC, SUBMIC
* Ext Spk: HFL, HFR
* Headset Jack: HSMIC, HSOL, HSOR

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoMerge commit 's3c-iis-header' into HEAD
Mark Brown [Fri, 6 Mar 2009 13:36:37 +0000 (13:36 +0000)] 
Merge commit 's3c-iis-header' into HEAD

11 years agoS3C: Move <mach/audio.h> to <plat/audio.h>
Ben Dooks [Wed, 4 Mar 2009 00:49:28 +0000 (00:49 +0000)] 
S3C: Move <mach/audio.h> to <plat/audio.h>

The <mach/audio.h> file needs to be common to both ARCH_S3C2410 and
ARCH_S3C64XX as they share common driver code, so move it to <plat/audio.h>.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoS3C24XX: Move and update IIS headers
Ben Dooks [Wed, 4 Mar 2009 00:49:26 +0000 (00:49 +0000)] 
S3C24XX: Move and update IIS headers

Move the IIS headers to their correct place.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
11 years agoASoC: make ops a pointer in 'struct snd_soc_dai'
Eric Miao [Tue, 3 Mar 2009 01:41:00 +0000 (09:41 +0800)] 
ASoC: make ops a pointer in 'struct snd_soc_dai'

Considering the fact that most cpu_dai or codec_dai are using a same
'snd_soc_dai_ops' for several similar interfaces, 'ops' would be better
made a pointer instead, to make sharing easier and code a bit cleaner.

The patch below is rather preliminary since the asoc tree is being
actively developed, and this touches almost every piece of code,
(and possibly many others in development need to be changed as
well). Building of all codecs are OK, yet to every SoC, I didn't test
that.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>