Eric Lee / smarc-fsl-linux-kernel

11 Jan, 2012

1 commit

  • e4e9e0540   ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC ... Browse Code »

    commit 739be96 "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC"
    introduces below build warnings:

    drivers/misc/Kconfig:212:error: recursive dependency detected!
    drivers/misc/Kconfig:212: symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC
    sound/soc/atmel/Kconfig:9: symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731
    sound/soc/atmel/Kconfig:18: symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC

    SND_ATMEL_SOC_SSC needs ATMEL_SSC to pass compilation.
    This patch remove the "select ATMEL_SSC" from SND_ATMEL_SOC_SSC to avoid above
    warnings. And then ensures all the machine drivers that select SND_ATMEL_SOC_SSC
    need to depend on ATMEL_SSC.

    Reported-by: Stephen Rothwell
    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     

08 Jan, 2012

1 commit

  • 25e9e7565   ASoC: check for substream not channels_min in pcm engines ... Browse Code »

    This is a follow up on 53dea36c70c1857 which fixes the other affected
    pcm engines.

    Description from 53dea36c70c1857:
    Don't rely on the codec's channels_min information to decide wheter or
    not allocate a substream's DMA buffer. Rather check if the substream
    itself was allocated previously.

    Without this patch I was seeing null-pointer dereferenc in atmel-pcm.

    Signed-off-by: Joachim Eastwood
    Signed-off-by: Mark Brown

    Joachim Eastwood
     

06 Jan, 2012

1 commit

  • 739be96ab   ASoC: Fix build dependency for SND_ATMEL_SOC_SSC ... Browse Code »

    Make SND_ATMEL_SOC_SSC select ATMEL_SSC to fix below build errors:

    LD .tmp_vmlinux1
    sound/built-in.o: In function `atmel_ssc_remove':
    sound/soc/atmel/atmel_ssc_dai.c:713: undefined reference to `ssc_free'
    sound/built-in.o: In function `atmel_ssc_probe':
    sound/soc/atmel/atmel_ssc_dai.c:700: undefined reference to `ssc_request'
    sound/built-in.o: In function `atmel_ssc_set_audio':
    sound/soc/atmel/atmel_ssc_dai.c:845: undefined reference to `ssc_request'
    sound/soc/atmel/atmel_ssc_dai.c:851: undefined reference to `ssc_free'
    make: *** [.tmp_vmlinux1] Error 1

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     

23 Dec, 2011

1 commit

25 Nov, 2011

1 commit

23 Nov, 2011

3 commits

  • 554671230   Merge branch 'for-3.2' into for-3.3 Browse Code »
    Mark Brown
     
  • 85e7652d8   ASoC: Constify snd_soc_dai_ops structs ... Browse Code »

    Commit 1ee46ebd("ASoC: Make the DAI ops constant in the DAI structure")
    introduced the possibility to have constant DAI ops structures, yet this is
    barley used in both existing drivers and also new drivers being submitted,
    although none of them modifies its DAI ops structure. The later is not
    surprising since existing drivers are often used as templates for new drivers.
    So this patch just constifies all existing snd_soc_dai_ops structs to eliminate
    the issue altogether.

    The patch was generated with the following coccinelle semantic patch:
    //
    @@
    identifier ops;
    @@
    -struct snd_soc_dai_ops ops =
    +const struct snd_soc_dai_ops ops =
    { ... };
    //

    Signed-off-by: Lars-Peter Clausen
    Signed-off-by: Mark Brown

    Lars-Peter Clausen
     
  • 4ca8af579   ASoC: drop support for PlayPaq with WM8510 ... Browse Code »

    SoC Audio support for PlayPaq with WM8510 got added in commit 9aaca9683b
    ("[ALSA] Revised AT32 ASoC Patch"). That support depends on
    BOARD_PLAYPAQ. That Kconfig symbol didn't exist when that support got
    added in v2.6.27. It still doesn't. It has never been possible to even
    build this driver. Drop it.

    Signed-off-by: Paul Bolle
    Signed-off-by: Mark Brown

    Paul Bolle
     

08 Oct, 2011

1 commit

10 Sep, 2011

1 commit

10 Jun, 2011

1 commit

08 Jun, 2011

1 commit

07 Jun, 2011

1 commit

06 Jun, 2011

1 commit

03 Jun, 2011

1 commit

30 May, 2011

1 commit

26 May, 2011

4 commits

19 Apr, 2011

1 commit

31 Mar, 2011

1 commit

30 Mar, 2011

1 commit

25 Jan, 2011

1 commit

  • 81d7da540   ASoC: Fix codec device id format used by some dai_links ... Browse Code »

    The id part of an I2C device name is created with the "%d-%04x" format string.

    So for example for an I2C device which is connected to the adapter with the id 0
    and has its address set to 0x1a the id part of the devices name would be
    "0-001a".

    Currently some sound board drivers have the id part the codec_name field of
    their dai_link structures set as if it had been created by a "%d-0x%x" format
    string. For example "0-0x1a" instead of "0-001a".

    As a result there is no match between the codec device and the dai_link and no
    sound card is instantiated.

    This patch fixes it.

    Signed-off-by: Lars-Peter Clausen
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown
    Cc: stable@kernel.org

    Lars-Peter Clausen
     

25 Nov, 2010

3 commits

23 Nov, 2010

2 commits

22 Nov, 2010

1 commit

12 Nov, 2010

1 commit

11 Nov, 2010

1 commit

  • bbde7814c   Fix Atmel soc audio boards Kconfig dependency ... Browse Code »

    Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC
    audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing
    clk_set_parent and clk_set_rate when building without
    AT91_PROGRAMMABLE_CLOCKS.

    Signed-off-by: Ryan Mallon
    Acked-by: Geoffrey Wossum
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Ryan Mallon
     

06 Nov, 2010

1 commit

  • ce6120cca   ASoC: Decouple DAPM from CODECs ... Browse Code »

    Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
    required when developing ASoC further. Such as for other ASoC components to
    have DAPM widgets or when extending DAPM to handle cross-device paths.

    This patch decouples DAPM related variables from struct snd_soc_codec and
    moves them to new struct snd_soc_dapm_context that is used to encapsulate
    DAPM context of a device. ASoC core and API of DAPM functions are modified
    to use DAPM context instead of codec.

    This patch does not change current functionality and a large part of changes
    come because of structure and internal API changes.

    Core implementation is from Liam Girdwood with some
    minor core changes, codecs and machine driver conversions from
    Jarkko Nikula .

    Signed-off-by: Liam Girdwood
    Signed-off-by: Jarkko Nikula
    Cc: Nicolas Ferre
    Cc: Manuel Lauss
    Cc: Mike Frysinger
    Cc: Cliff Cai
    Cc: Kevin Hilman
    Cc: Ryan Mallon
    Cc: Timur Tabi
    Cc: Sascha Hauer
    Cc: Lars-Peter Clausen
    Cc: Arnaud Patard (Rtp)
    Cc: Wan ZongShun
    Cc: Eric Miao
    Cc: Jassi Brar
    Cc: Daniel Gloeckner
    Cc: Kuninori Morimoto
    Signed-off-by: Mark Brown

    Liam Girdwood
     

18 Aug, 2010

3 commits

  • abfa4eae0   ASoC: Add simplfied device registration for Atmel SSC devices ... Browse Code »

    Since the SSC is already being registered as a device under arch and
    the DMA and SSC hardware are pretty much the same provide a simplified
    device registration function for the Atmel SSC which will add the
    ASoC-specific devices within the ASoC code, parenting the SSC device
    off the actual SSC device. Also use it in the sam9g20-ek driver.

    Signed-off-by: Mark Brown
    Acked-by: Liam Girdwood

    Mark Brown
     
  • dad965f07   ASoC: Fix device name for AT91SAM9G20-EK devices ... Browse Code »

    A couple of typos in the multi-component conversion.

    Signed-off-by: Mark Brown
    Acked-by: Liam Girdwood

    Mark Brown
     
  • e77125105   ASoC: Support non-crystal master clocks for WM8731 ... Browse Code »

    Instead of unconditionally enabling the crystal oscillator on the WM8731
    only enable it when explicitly selected via set_sysclk(), allowing machine
    drivers to specify that they drive a clock into MCLK alone. This avoids
    any conflicts between the oscillator and the external MCLK source and saves
    power for systems which do not need the oscillator.

    This should also deliver a small power saving on systems using the crystal
    since the oscillator will only be enabled when the ADC or DAC is active.

    Signed-off-by: Mark Brown
    Acked-by: Liam Girdwood

    Mark Brown
     

12 Aug, 2010

1 commit

  • f0fba2ad1   ASoC: multi-component - ASoC Multi-Component Support ... Browse Code »

    This patch extends the ASoC API to allow sound cards to have more than one
    CODEC and more than one platform DMA controller. This is achieved by dividing
    some current ASoC structures that contain both driver data and device data into
    structures that only either contain device data or driver data. i.e.

    struct snd_soc_codec ---> struct snd_soc_codec (device data)
    +-> struct snd_soc_codec_driver (driver data)

    struct snd_soc_platform ---> struct snd_soc_platform (device data)
    +-> struct snd_soc_platform_driver (driver data)

    struct snd_soc_dai ---> struct snd_soc_dai (device data)
    +-> struct snd_soc_dai_driver (driver data)

    struct snd_soc_device ---> deleted

    This now allows ASoC to be more tightly aligned with the Linux driver model and
    also means that every ASoC codec, platform and (platform) DAI is a kernel
    device. ASoC component private data is now stored as device private data.

    The ASoC sound card struct snd_soc_card has also been updated to store lists
    of it's components rather than a pointer to a codec and platform. The PCM
    runtime struct soc_pcm_runtime now has pointers to all its components.

    This patch adds DAPM support for ASoC multi-component and removes struct
    snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
    or runtime PCM level basis rather than using snd_soc_socdev.

    Other notable multi-component changes:-

    * Stream operations now de-reference less structures.
    * close_delayed work() now runs on a DAI basis rather than looping all DAIs
    in a card.
    * PM suspend()/resume() operations can now handle N CODECs and Platforms
    per sound card.
    * Added soc_bind_dai_link() to bind the component devices to the sound card.
    * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
    DAI link components.
    * sysfs entries can now be registered per component per card.
    * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
    * snd_soc_register_codec() now does all the codec list and mutex init.

    This patch changes the probe() and remove() of the CODEC drivers as follows:-

    o Make CODEC driver a platform driver
    o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
    o Removed all static codec pointers (drivers now support > 1 codec dev)
    o snd_soc_register_pcms() now done by core.
    o snd_soc_register_dai() folded into snd_soc_register_codec().

    CS4270 portions:
    Acked-by: Timur Tabi

    Some TLV320aic23 and Cirrus platform fixes.
    Signed-off-by: Ryan Mallon

    TI CODEC and OMAP fixes
    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Jarkko Nikula

    Samsung platform and misc fixes :-
    Signed-off-by: Chanwoo Choi
    Signed-off-by: Joonyoung Shim
    Signed-off-by: Kyungmin Park
    Reviewed-by: Jassi Brar
    Signed-off-by: Seungwhan Youn

    MPC8610 and PPC fixes.
    Signed-off-by: Timur Tabi

    i.MX fixes and some core fixes.
    Signed-off-by: Sascha Hauer

    J4740 platform fixes:-
    Signed-off-by: Lars-Peter Clausen

    CC: Tony Lindgren
    CC: Nicolas Ferre
    CC: Kevin Hilman
    CC: Sascha Hauer
    CC: Atsushi Nemoto
    CC: Kuninori Morimoto
    CC: Daniel Gloeckner
    CC: Manuel Lauss
    CC: Mike Frysinger
    CC: Arnaud Patard
    CC: Wan ZongShun

    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Liam Girdwood
     

07 Jun, 2010

1 commit

04 Jun, 2010

1 commit

20 Mar, 2010

1 commit

  • fd23b7dee   ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream ... Browse Code »

    This fixes a memory corruption when ASoC devices are used in
    full-duplex mode. Specifically for pxa-ssp code, where this pointer
    is dynamically allocated for each direction and destroyed upon each
    stream start.

    All other platforms are fixed blindly, I couldn't even compile-test
    them. Sorry for any breakage I may have caused.

    Reported-by: Sven Neumann
    Reported-by: Michael Hirsch
    Signed-off-by: Daniel Mack
    Acked-by: Peter Ujfalusi
    Acked-by: Jarkko Nikula
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Daniel Mack