Eric Lee / smarc-fsl-linux-kernel

24 Nov, 2011

1 commit

23 Nov, 2011

1 commit

  • 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
     

06 Oct, 2011

1 commit

31 Aug, 2011

2 commits

24 Jun, 2011

2 commits

08 Jun, 2011

1 commit

19 Apr, 2011

1 commit

31 Mar, 2011

1 commit

27 Mar, 2011

1 commit

02 Mar, 2011

1 commit

  • 0a93421b6   ASoC: Fix burstsize and DSP_B format problems in imx-ssi. ... Browse Code »

    When choosing IMX_DMA flag, burtsizes are set to its default
    value (0) which leads to driver malfunction. Change them to 4.

    DSP_B interface needs additional flag to match DSP_B formats
    as described in several codecs as wm8741 and aic3205.

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

    Javier Martin
     

25 Nov, 2010

2 commits

05 Nov, 2010

2 commits

  • 22e2fda56   ASoC: i.MX: we can do mono ... Browse Code »

    Whether we can do mono or not depends on the codec. No need
    to limit this in the ssi driver.

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

    Sascha Hauer
     
  • f562be51f   ASoC i.MX: register dma audio device ... Browse Code »

    We have two different transfer methods on i.MX: FIQ and DMA. Since
    the merge of the ASoC multicomponent support the DMA device is lost.
    Add it again. Also, imx_ssi_dai_probe has to be called for !AC97
    aswell.

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

    Sascha Hauer
     

01 Oct, 2010

1 commit

  • 205d231bf   ASoC: Remove -dai suffix from i.MX SSI driver ... Browse Code »

    While it is a generic serial port in practice the i.MX SSI is only supported
    in Linux as an audio port (the i.MX has dedicated SPI controllers and so on).
    This means we don't need to disambiguate against other uses of the hardware
    and so can drop the -dai suffix from the driver name which fixes merge
    issues with the i.MX tree in -next.

    Signed-off-by: Mark Brown
    Acked-by: Uwe Kleine-König
    Acked-by: Liam Girdwood

    Mark Brown
     

23 Aug, 2010

2 commits

17 Aug, 2010

1 commit

  • e4862f2f6   Merge branch 'for-2.6.36' into for-2.6.37 ... Browse Code »

    Fairly simple conflicts, the most serious ones are the i.MX ones which I
    suspect now need another rename.

    Conflicts:
    arch/arm/mach-mx2/clock_imx27.c
    arch/arm/mach-mx2/devices.c
    arch/arm/mach-omap2/board-rx51-peripherals.c
    arch/arm/mach-omap2/board-zoom2.c
    sound/soc/fsl/mpc5200_dma.c
    sound/soc/fsl/mpc5200_dma.h
    sound/soc/fsl/mpc8610_hpcd.c
    sound/soc/pxa/spitz.c

    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
     

08 Aug, 2010

1 commit

  • faa38b5e0   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: (214 commits)
    ALSA: hda - Add pin-fix for HP dc5750
    ALSA: als4000: Fix potentially invalid DMA mode setup
    ALSA: als4000: enable burst mode
    ALSA: hda - Fix initial capsrc selection in patch_alc269()
    ASoC: TWL4030: Capture route runtime DAPM ordering fix
    ALSA: hda - Add PC-beep whitelist for an Intel board
    ALSA: hda - More relax for pending period handling
    ALSA: hda - Define AC_FMT_* constants
    ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
    ALSA: hda - Add support for HDMI HBR passthrough
    ALSA: hda - Set Stream Type in Stream Format according to AES0
    ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
    ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
    ASoC: wm9081: fix resource reclaim in wm9081_register error path
    ASoC: wm8978: fix a memory leak if a wm8978_register fail
    ASoC: wm8974: fix a memory leak if another WM8974 is registered
    ASoC: wm8961: fix resource reclaim in wm8961_register error path
    ASoC: wm8955: fix resource reclaim in wm8955_register error path
    ASoC: wm8940: fix a memory leak if wm8940_register return error
    ASoC: wm8904: fix resource reclaim in wm8904_register error path
    ...

    Linus Torvalds
     

19 Jul, 2010

1 commit

04 Jun, 2010

1 commit

  • 0e7961201   ASoC: imx-ssi.c: add new choices to platform configuration ... Browse Code »

    * introduce 3 new flags to allow a more detailed configuration
    of the SSI link :
    IMX_SSI_NET : enable Network Mode
    IMX_SSI_SYN : enable Synchronous Mode
    IMX_SSI_USE_I2S_SLAVE : enable I2S Slave Mode
    * new platform can use these settings without breaking actual
    platforms.

    Signed-off-by: Eric Bénard
    Acked-by: Sascha Hauer
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Eric Bénard
     

16 Apr, 2010

1 commit

08 Apr, 2010

1 commit

  • 206b60e18   ASoC: imx-ssi: honor IMX_SSI_DMA flag ... Browse Code »

    When checking if we are DMA capable we have to check for the
    IMX_SSI_DMA flag which is already set from platform_data instead
    of setting it again when we want to do DMA.

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

    Sascha Hauer
     

07 Apr, 2010

1 commit

  • 84db18bbe   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:
    ALSA: mixart: range checking proc file
    ALSA: hda - Fix a wrong array range check in patch_realtek.c
    ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream
    ALSA: hda - Enable amplifiers on Acer Inspire 6530G
    ASoC: Only do WM8994 bias off transition from standby
    ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices
    ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction
    ASoC: Support second DC servo readback method for wm_hubs
    ASoC: Avoid wraparound in wm_hubs DC servo correction
    ALSA: echoaudio - Eliminate use after free
    ALSA: i2c: cleanup: change parameter to pointer
    ALSA: hda - Add MSI blacklist for Aopen MZ915-M
    ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code
    ALSA: hda - Update document about MSI and interrupts
    ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981
    ALSA: hda - Add missing printk argument in previous patch
    ASoC: Fix passing platform_data to ac97 bus users and fix a leak
    ALSA: hda - Fix ADC/MUX assignment of ALC269 codec
    ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo()
    ASoC: wm8994: playback => capture

    Linus Torvalds
     

06 Apr, 2010

1 commit

  • 5f712b2b7   ALSA: 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.

    [Note that this is a backported version for 2.6.34.
    Upstream commit is fd23b7dee]

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

    Daniel Mack
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

17 Jan, 2010

3 commits