Eric Lee / smarc-fsl-linux-kernel

08 Oct, 2011

1 commit

30 Mar, 2011

2 commits

25 Jan, 2011

1 commit

22 Nov, 2010

1 commit

06 Nov, 2010

3 commits

  • 989db2005   Merge branch 'for-2.6.37' into for-2.6.38 Browse Code »
    Mark Brown
     
  • 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
     
  • 71a295602   ASoC: Lock the CODEC in PXA external jack controls ... Browse Code »

    When doing anything with the system, especially DAPM, we need to hold the
    CODEC mutex.

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

    Mark Brown
     

18 Aug, 2010

2 commits

  • 9745e824a   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

    Mark Brown
     
  • 1593d7dd8   ASoC: Fix a few more PXA build errors ... Browse Code »

    Dead pxa2xx-pcm.h includes and a missing ,

    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
     

16 Jun, 2009

1 commit

29 Mar, 2009

1 commit

12 Mar, 2009

1 commit

09 Mar, 2009

1 commit

18 Feb, 2009

2 commits

11 Feb, 2009

1 commit

03 Dec, 2008

1 commit

02 Dec, 2008

1 commit

  • 5220ed6b3   ALSA: ASoC: Fix compile warnings on corgi.c ... Browse Code »

    Fix the wrong shutdown callback type. Also removed the unused variables
    there:

    sound/soc/pxa/corgi.c: In function 'corgi_shutdown':
    sound/soc/pxa/corgi.c:114: warning: unused variable 'codec'
    sound/soc/pxa/corgi.c: At top level:
    sound/soc/pxa/corgi.c:175: warning: initialization from incompatible pointer type

    Acked-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     

21 Nov, 2008

1 commit

  • 875065491   ASoC: Rename snd_soc_card to snd_soc_machine ... Browse Code »

    One of the issues with the ASoC v1 API which has been addressed in the
    ASoC v2 work that Liam Girdwood has done is that the ALSA card provided
    by ASoC is distributed around the ASoC structures. For example, machine
    wide data such as the struct snd_card are maintained as part of the
    CODEC data structure, preventing the use of multiple codecs. This has
    been addressed by refactoring the data structures so that all the data
    for the ALSA card is contained in a single structure snd_soc_card which
    replaces the existing snd_soc_machine and snd_soc_device.

    Begin the process of backporting this by renaming struct snd_soc_machine
    to struct snd_soc_card, better reflecting its function and bringing it
    closer to standard ALSA terminology.

    Signed-off-by: Mark Brown

    Mark Brown
     

14 Oct, 2008

1 commit

  • be3bfbba8   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (33 commits)
    ALSA: ASoC codec: remove unused #include
    ALSA: ASoC: update email address for Liam Girdwood
    ALSA: hda: corrected invalid mixer values
    ALSA: hda: add mixers for analog mixer on 92hd75xx codecs
    ALSA: ASoC: Add destination and source port for DMA on OMAP1
    ALSA: ASoC: Drop device registration from GTA01 lm4857 driver
    ALSA: ASoC: Fix build of GTA01 audio driver
    ALSA: ASoC: Add widgets before setting endpoints on GTA01
    ALSA: ASoC: Fix inverted input PGA mute bits in WM8903
    ALSA: ASoC: OMAP: Set DMA stream name at runtime in McBSP DAI driver
    ALSA: ASoC: OMAP: Add support for OMAP2430 and OMAP34xx in McBSP DAI driver
    ALSA: ASoC: OMAP: Add multilink support to McBSP DAI driver
    ALSA: ASoC: Make TLV320AIC26 user-visible
    ALSA: ASoC - clean up Kconfig for TLV320AIC2
    ALSA: ASoC: Make WM8510 microphone input a DAPM mixer
    ALSA: ASoC: Implement WM8510 bias level control
    ALSA: ASoC: Remove unused AUDIO_NAME define from codec drivers
    ALSA: ASoC: tlv320aic3x: Use uniform tlv320aic naming
    ALSA: ASoC: Add WM8510 SPI support
    ALSA: ASoC: Add WM8753 SPI support
    ...

    Linus Torvalds
     

13 Oct, 2008

2 commits

12 Oct, 2008

1 commit

  • 7cc4e87f9   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
    [ARM] 5300/1: fixup spitz reset during boot
    [ARM] 5295/1: make ZONE_DMA optional
    [ARM] 5239/1: Palm Zire 72 power management support
    [ARM] 5298/1: Drop desc_handle_irq()
    [ARM] 5297/1: [KS8695] Fix two compile-time warnings
    [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
    [ARM] pxa: allow multi-machine PCMCIA builds
    [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
    [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
    [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
    [ARM] pxa/zylonite: add support for USB OHCI
    [ARM] ohci-pxa27x: use ioremap() and offset for register access
    [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
    [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
    [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
    [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
    [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
    [ARM] pxa: simplify DMA register definitions
    [ARM] pxa: make additional DCSR bits valid for PXA3xx
    [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
    ...

    Fixed up conflicts in
    arch/arm/mach-versatile/core.c
    sound/soc/pxa/pxa2xx-ac97.c
    sound/soc/pxa/pxa2xx-i2s.c
    manually.

    Linus Torvalds
     

24 Sep, 2008

1 commit

04 Sep, 2008

1 commit

07 Aug, 2008

1 commit

10 Jul, 2008

3 commits

19 May, 2008

2 commits

24 Apr, 2008

1 commit

29 Feb, 2008

1 commit

01 Feb, 2008

1 commit

  • 9004acc70   [ALSA] Remove sound/driver.h ... Browse Code »

    This header file exists only for some hacks to adapt alsa-driver
    tree. It's useless for building in the kernel. Let's move a few
    lines in it to sound/core.h and remove it.
    With this patch, sound/driver.h isn't removed but has just a single
    compile warning to include it. This should be really killed in
    future.

    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Takashi Iwai
     

09 Feb, 2007

2 commits

  • d928b25a8   [ALSA] soc - ASoC Sharp corgi machine ... Browse Code »

    This patch updates the Sharp corgi machine driver to the new API in ASoC
    0.13.
    Changes:-
    o Manually configure DAI hardware format.
    o Removed config_sysclk() function. No longer needed as clocking is now
    configured manually.

    Signed-off-by: Liam Girdwood
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Liam Girdwood
     
  • a1eb4b3ca   [ALSA] ASoC pxa2xx Corgi machine support ... Browse Code »

    This patch adds Alsa audio support to the Sharp Zaurus SL-C7x0/C860
    (Corgi) machines.
    From: Liam Girdwood
    Signed-off-by: Graeme Gregory
    Signed-off-by: Richard Purdie
    Signed-off-by: Liam Girdwood
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Liam Girdwood