Doug / smarc-fsl-linux-kernel

31 May, 2010

1 commit

21 May, 2010

1 commit

  • 7f06a8b26   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: (250 commits)
    ALSA: hda: Storage class should be before const qualifier
    ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies
    ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT
    ASoC: sdp4430 - add sdp4430 pcm ops to DAI.
    ASoC: TWL6040: Enable earphone path in codec
    ASoC: SDP4430: Add support for Earphone speaker
    ASoC: SDP4430: Add sdp4430 machine driver
    ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF
    ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function
    ALSA: sound/pci/asihpi: Use kzalloc
    ALSA: hdmi - dont fail on extra nodes
    ALSA: intelhdmi - add id for the CougarPoint chipset
    ALSA: intelhdmi - user friendly codec name
    ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS
    ALSA: asihpi: incorrect range check
    ALSA: asihpi: testing the wrong variable
    ALSA: es1688: add pedantic range checks
    ARM: McBSP: Add support for omap4 in McBSP driver
    ARM: McBSP: Fix request for irq in OMAP4
    OMAP: McBSP: Add 32-bit mode support
    ...

    Linus Torvalds
     

20 May, 2010

1 commit

11 May, 2010

4 commits

12 Apr, 2010

1 commit

  • d21e0f4cd   ASoC: Zipit Z2 WM8750 ASoC driver ... Browse Code »

    This patch adds support for sound through the WM8750 codec on Zipit Z2.
    Also, this patch incorporates support for detecting headset jack
    insertion through the jack detection API.

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

    Marek Vasut
     

09 Apr, 2010

1 commit

  • 6ca0c22ef   ASoC: WM8750: Convert to new API ... Browse Code »

    Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code
    around. Hugely inspired by WM8753 which was already converted.

    Also, this patch fixes the Jive and Spitz machine.

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

    Marek Vasut
     

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
     

23 Mar, 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
     

09 Mar, 2010

1 commit

02 Mar, 2010

2 commits

02 Feb, 2010

1 commit

  • 026384d61   ASoC: fix PXA SSP port resume ... Browse Code »

    Unconditionally save the register states when suspending and restore
    them again at resume time. Register contents were not preserved over
    suspend, and hence the driver takes false assumptions about them.

    The clock must be enabled to access the register block.

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

    Daniel Mack
     

16 Jan, 2010

1 commit

  • a42129684   ASoC: support more sample rates on raumfeld devices ... Browse Code »

    Add support for sample rates other than 44100Khz on raumfeld audio
    devices. At startup time, call snd_soc_dai_set_sysclk() with 0 as 'freq'
    argument so it offers all the sample rates. Later, the function is
    called again to give proper constraints.

    Use the external audio clock generator to provide double data rate
    clocks as the PXA's internal baud generator does anything but what's
    described in the datasheets.

    Signed-off-by: Daniel Mack
    Cc: Mark Brown
    Cc: Timur Tabi
    Signed-off-by: Mark Brown

    Daniel Mack
     

30 Nov, 2009

1 commit

28 Nov, 2009

1 commit

15 Oct, 2009

1 commit

06 Oct, 2009

1 commit

04 Oct, 2009

1 commit

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

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

01 Oct, 2009

2 commits

26 Sep, 2009

1 commit

21 Sep, 2009

1 commit

06 Sep, 2009

1 commit

  • 85488037b   ASoC: Add source argument to PLL configuration ... Browse Code »

    More and more devices feature PLLs and FLLs with the ability to select
    between multiple input clocks. In order to better support these devices
    a new argument, source, has been added to the set_pll() configuration
    API. Using set_clkdiv() is often difficult due to the need to stop the
    PLL/FLL before any reconfiguration can be done.

    Signed-off-by: Mark Brown

    Mark Brown
     

24 Aug, 2009

1 commit

14 Aug, 2009

1 commit

06 Aug, 2009

1 commit

  • a5479e389   ASoC: change set_tdm_slot api to allow slot_width override. ... Browse Code »

    Extend set_tdm_slot to allow the user to arbitrarily set the frame width
    and active TX/RX slots.

    Updates magician.c and wm9081.c for the new set_tdm_slot(). wm9081.c
    still doesn't handle the slot_width override.

    While being there, correct an incorrect use of SlotsPerFrm(7) use in
    bitmask on pxa-ssp.c (SSCR0_SlotsPerFrm(x) is (((x) - 1) << 24)) ).

    (this series is meant for Mark's for-2.6.32 branch)

    Signed-off-by: Daniel Ribeiro
    Signed-off-by: Mark Brown

    Daniel Ribeiro
     

24 Jul, 2009

1 commit

  • 4ce2f2fe6   ASoC: Switch palm27x-asoc to jack detection api ... Browse Code »

    This patch removes the old method of jack detection from palm27x-asoc
    driver and adds jack detection api. It also removes some other (now)
    useless stuff from the driver and corrects pin configuration for the
    codec.

    Signed-off-by: Marek Vasut
    Signed-off-by: Mark Brown

    Marek Vasut
     

02 Jul, 2009

2 commits

25 Jun, 2009

2 commits

19 Jun, 2009

1 commit

17 Jun, 2009

1 commit

  • 661adc423   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: ctxfi - Fix deadlock with xfi-timer
    ALSA: intel8x0 - Fix PCM position craziness
    ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
    ASoC: magician: fix PXA SSP clock polarity
    ASoC: Instantiate any forgotten DAPM widgets
    ASoC: Revert duplicated code in SSM2602 driver
    ALSA: hda - Add quirk for Acer Aspire 6935G
    ALSA: ctxfi - Replace atc lock to mutex
    ASoC: Remove odd bit clock ratios for WM8903

    Linus Torvalds
     

16 Jun, 2009

1 commit