25 Oct, 2010

1 commit


19 Oct, 2010

1 commit

  • In this code, 0 is returned on failure, even though other
    failures return -ENOMEM or other similar values.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @a@
    identifier alloc;
    identifier ret;
    constant C;
    expression x;
    @@

    x = alloc(...);
    if (x == NULL) { }

    @@
    identifier f, a.alloc;
    expression ret;
    expression x,e1,e2,e3;
    @@

    ret = 0
    ... when != ret = e1
    *x = alloc(...)
    ... when != ret = e2
    if (x == NULL) { ... when != ret = e3
    return ret;
    }
    //

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

    Julia Lawall
     

17 Oct, 2010

1 commit


05 Oct, 2010

1 commit

  • Since only 4 mainline ASoC codecs support the trigger
    callback, we cannot rely upon them stopping the frame clock
    if they are master and must assume it is running even if the
    sound is paused. Thus we cannot start the ASP until the trigger
    method.

    Signed-off-by: Troy Kisky
    Signed-off-by: Martin Ambrose
    Signed-off-by: Mark Brown

    Troy Kisky
     

12 Aug, 2010

1 commit

  • 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
     

20 Jul, 2010

1 commit

  • Currently the EDMA queue to be used by for servicing ASP through
    internal RAM is fixed to EDMAQ_0 and that to service internal RAM
    from external RAM is fixed to EDMAQ_1.

    This may not be the desirable configuration on all platforms. For
    example, on DM365, queue 0 has large fifo size and is more suitable
    for video transfers. Having audio and video transfers on the same
    queue may lead to starvation on audio side.

    platform data as defined currently passes a queue number to the driver
    but that remains unused inside the driver.

    Fix this by defining one queue each for ASP and RAM transfers in the
    platform data and using it inside the driver.

    Since EDMAQ_0 maps to 0, thats the queue that will be used if
    the asp queue number is not initialized. None of the platforms
    currently utilize ping-pong transfers through internal RAM so that
    functionality remains unchanged too.

    This patch has been tested on DM644x and OMAP-L138 EVMs.

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

    Sekhar Nori
     

18 Jul, 2010

1 commit


13 Jul, 2010

1 commit


06 Jul, 2010

3 commits

  • i2s_accurate_sck switch can be used to have a better approximate
    sampling frequency.
    The clock is an externally visible bit clock and it is named
    i2s continuous serial clock (I2S_SCK).
    The trade off is between more accurate clock (fast clock)
    and less accurate clock (slow clock).
    The waveform will be not symmetric.
    Probably it is possible to get a better algorithm for calculating
    the divider, trying to keep a slower clock as possible.

    This patch has been developed against the
    http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
    git tree and has been tested on bmx board (similar to dm365 evm, but using
    uda1345 as external audio codec).

    Signed-off-by: Raffaele Recalcati
    Signed-off-by: Davide Bonfanti
    Acked-by: Liam Girdwood
    Acked-by: Sudhakar Rajashekhara
    Signed-off-by: Mark Brown

    Raffaele Recalcati
     
  • When McBSP peripheral gets the clock from an external pin,
    there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR
    and MCBSP_CLKS.
    evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different
    hardware connection and I use MCBSP_CLKS, so I have added
    this possibility.

    This patch has been developed against the:
    http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
    git tree and has been tested on bmx board (similar to dm365 evm)

    Signed-off-by: Raffaele Recalcati
    Signed-off-by: Davide Bonfanti
    Acked-by: Liam Girdwood
    Acked-by: Sudhakar Rajashekhara
    Signed-off-by: Mark Brown

    Raffaele Recalcati
     
  • Added two clocking options for dm365 McBSP peripheral when used
    with I2S timings, that are SND_SOC_DAIFMT_CBS_CFS (the cpu generates
    clock and frame sync) and SND_SOC_DAIFMT_CBS_CFM (the cpu gets clock
    from external pin and generates frame sync).
    A slave clock management can be important when the external codec needs
    the system clock and the bit clock synchronized (tested with uda1345).
    This patch has been developed against the:
    http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
    git tree and has been tested on bmx board (similar to dm365 evm, but using
    uda1345 as external audio codec).

    Signed-off-by: Raffaele Recalcati
    Signed-off-by: Davide Bonfanti
    Acked-by: Liam Girdwood
    Acked-by: Sudhakar Rajashekhara
    Signed-off-by: Mark Brown

    Raffaele Recalcati
     

15 Jun, 2010

1 commit

  • On DA830/OMAP-L137 and DA850/OMAP-L138 SoCs, the McASP peripheral
    has FIFO support. This FIFO provides additional data buffering. It
    also provides tolerance to variation in host/DMA controller response
    times. More details of the FIFO operation can be found at

    http://focus.ti.com/general/docs/lit/getliterature.tsp?literatureNumber=sprufm1&fileType=pdf

    Existing sequence of steps for audio playback/capture are:
    a. DMA configuration
    b. McASP configuration (configures and enables FIFO)
    c. Start DMA
    d. Start McASP (enables FIFO)

    During McASP configuration, while FIFO was being configured, FIFO
    was being enabled in davinci_hw_common_param() function of
    sound/soc/davinci/davinci-mcasp.c file. This generated a transmit
    DMA event, which gets serviced when DMA is started.

    https://patchwork.kernel.org/patch/84611/ patch clears the DMA
    events before starting DMA, which is the right thing to do. But
    this resulted in a state where DMA was waiting for an event from
    McASP (after step c above), but the event which was already there,
    has got cleared (because of step b above).

    The fix is not to enable the FIFO during McASP configuration as
    FIFO was being enabled as part of McASP start.

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

    Sudhakar Rajashekhara
     

20 May, 2010

1 commit


07 Apr, 2010

1 commit

  • * '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

  • 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

2 commits

  • …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
     
  • Implicit slab.h inclusion via percpu.h is about to go away. Make sure
    gfp.h or slab.h is included as necessary.

    Signed-off-by: Tejun Heo
    Signed-off-by: Takashi Iwai

    Tejun Heo
     

20 Mar, 2010

1 commit

  • 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
     

12 Mar, 2010

2 commits

  • The DM365 EVM has two codecs: the Audio Codec (AIC3x) and the Voice Codec,
    the idea is to have both enabled in the same kernel simultaneously. However,
    the current soc-core doesn't support simultaneous codecs, once that
    support will have added, a patch will be posted to enable both codecs in
    the DM365 EVM.

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

    Miguel Aguilar
     
  • This patch adds the support for the interface needed by the DaVinci
    Voice Codec CQ93VC.

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

    Miguel Aguilar
     

10 Mar, 2010

1 commit

  • On TI DM6467 EVM, S/PDIF DIT codec fails to open as it is unable to install
    hardware params. This dummy codec has no set_fmt and set_sysclk implementations
    and calls from the application to these functions cause errors. This patch adds
    a new hardware params callback function for S/PDIF transciever codec.

    Signed-off-by: Chaithrika U S
    Tested-by: Anuj Aggarwal
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Chaithrika U S
     

26 Jan, 2010

1 commit

  • Sometimes after a suspend-resume cycle, the ALSA application
    restarts the stream when resume fails and McASP fails to work
    as the clock is not enabled. This patch corrects this bug.

    Testes on TI DA850/OMAP-L138 EVM.

    Signed-off-by: Chaithrika U S
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Chaithrika U S
     

04 Dec, 2009

1 commit

  • Add clock enable and disable calls to resume and suspend respectively.
    Also add a member to the audio device data structure which tracks the clock
    status.

    Tested on DA850/OMAP-L138 EVM. For the purpose of testing, the patches[1] which
    add suspend-to-RAM support to DA850/OMAP-L138 SoC were applied.

    [1] http://linux.davincidsp.com/pipermail/davinci-linux-open-source/
    2009-November/016958.html

    Signed-off-by: Chaithrika U S
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Chaithrika U S
     

19 Nov, 2009

4 commits


18 Nov, 2009

1 commit


06 Oct, 2009

1 commit


04 Oct, 2009

1 commit

  • * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (21 commits)
    ALSA: usb - Use strlcat() correctly
    ALSA: Fix invalid __exit in sound/mips/*.c
    ALSA: hda - Fix / improve ALC66x parser
    ALSA: ctxfi: Swapped SURROUND-SIDE mute
    sound: Make keywest_driver static
    ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-B1VP
    ALSA: hda - Fix digita/analog mic auto-switching with IDT codecs
    ASoC: fix kconfig order of Blackfin drivers
    ALSA: hda - Added quirk to enable sound on Toshiba NB200
    ASoC: Fix dependency of CONFIG_SND_PXA2XX_SOC_IMOTE2
    ALSA: Don't assume i2c device probing always succeeds
    ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-T350P
    ALSA: echoaudio - Re-enable the line-out control for the Mia card
    ALSA: hda - Resurrect input-source mixer of ALC268 model=acer
    ALSA: hda - Analog Devices AD1984A add HP Touchsmart model
    ALSA: hda - Add HP Pavilion dv4t-1300 to MSI whitelist
    ALSA: hda - CD-audio sound for hda-intel conexant benq laptop
    ASoC: DaVinci: Correct McASP FIFO initialization
    ASoC: Davinci: Fix race with cpu_dai->dma_data
    ASoC: DaVinci: Fix divide by zero error during 1st execution
    ...

    Linus Torvalds
     

30 Sep, 2009

1 commit

  • The DMA params for McASP with FIFO has been updated so that it works for
    various FIFO levels. A member- 'fifo_level' has been added to the DMA
    params data structure. The fifo_level can be adjusted by the tx[rx]_numevt
    platform data. This is relevant only for DA8xx/OMAP-L1xx platforms. This
    implementation has been tested for numevt values 1, 2, 4, 8.

    Signed-off-by: Chaithrika U S
    Signed-off-by: Mark Brown

    Chaithrika U S
     

24 Sep, 2009

5 commits


19 Sep, 2009

1 commit

  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
    DaVinci: DM646x - platform changes for vpif capture and display drivers
    davinci: DM355 - platform changes for vpfe capture
    davinci: DM644x platform changes for vpfe capture
    davinci: audio: move tlv320aic33 i2c setup into board files
    DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
    DaVinci: DM365: Adding entries for DM365 IRQ's
    DaVinci: DM355: Adding PINMUX entries for DM355 Display
    davinci: Handle pinmux conflict between mmc/sd and nor flash
    davinci: Add NOR flash support for da850/omap-l138
    davinci: Add NAND flash support for DA850/OMAP-L138
    davinci: Add MMC/SD support for da850/omap-l138
    davinci: Add platform support for da850/omap-l138 GLCD
    davinci: Macro to convert GPIO signal to GPIO pin number
    davinci: Audio support for DA850/OMAP-L138 EVM
    davinci: Audio support for DA830 EVM
    davinci: Correct the number of GPIO pins for da850/omap-l138
    davinci: Configure MDIO pins for EMAC
    DaVinci: DM365: Add Support for new Revision of silicon
    DaVinci: DM365: Fix Compilation issue due to PINMUX entry
    DaVinci: EDMA: Updating default queue handling
    ...

    Linus Torvalds
     

18 Sep, 2009

2 commits


16 Sep, 2009

1 commit