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
     

01 Oct, 2009

1 commit


21 Sep, 2009

1 commit


24 Aug, 2009

1 commit


14 Aug, 2009

1 commit


06 Aug, 2009

1 commit

  • 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

  • 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

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

2 commits

  • The wm8731 driver has been converted to register using the standard I2C
    device registration mechanism so we can now do the registration in the
    arch/arm code as normal.

    Signed-off-by: Mark Brown
    Signed-off-by: Eric Miao

    Mark Brown
     
  • This patch mostly follows commit 5998102b9095fdb7c67755812038612afea315c5
    "ASoC: Refactor WM8731 device registration" to make UDA1380 use standard
    device instantiation. Similarly, the I2C device registration temporarily
    moves into the magician machine driver before it will find its final
    resting place in the board file.

    At the same time, platform specific configuration is moved to platform data
    and common power/reset GPIO handling moves into the codec driver.

    Signed-off-by: Philipp Zabel
    Signed-off-by: Mark Brown

    Philipp Zabel
     

15 Jun, 2009

1 commit

  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
    MAINTAINERS: EB110ATX is not ebsa110
    MAINTAINERS: update Eric Miao's email address and status
    fb: add support of LCD display controller on pxa168/910 (base layer)
    [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
    [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
    [ARM] 5544/1: Trust PrimeCell resource sizes
    [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
    [ARM] pxa/sharpsl_pm: drop set_irq_type calls
    [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
    [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
    [ARM] sa1100: remove unused collie_pm.c
    [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
    [ARM] 5550/1: Add default configure file for w90p910 platform
    [ARM] 5549/1: Add clock api for w90p910 platform.
    [ARM] 5548/1: Add gpio api for w90p910 platform
    [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
    [ARM] Make ARM_VIC_NR depend on ARM_VIC
    [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
    ARM: OMAP4: SMP: Update defconfig for OMAP4430
    ARM: OMAP4: SMP: Enable SMP support for OMAP4430
    ...

    Linus Torvalds
     

14 Jun, 2009

1 commit


12 Jun, 2009

1 commit

  • * We don't need to write the registers twice, remove the first write.
    * DAIFMT_INV switch is duplicated inside DAIFMT_FORMAT switch, move it
    out.

    (This patch is for Mark's for-2.6.32 branch, I have not checked if the
    code is duplicated on current 2.6.30)

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

    Daniel Ribeiro
     

05 Jun, 2009

1 commit


28 May, 2009

1 commit


15 May, 2009

5 commits

  • Use default to optimize the switch/case in magicial_playback_hw_params(),
    which also fixes the compile warnings below:
    sound/soc/pxa/magician.c:89: warning: 'acds' may be used uninitialized in this function
    sound/soc/pxa/magician.c:89: warning: 'acps' may be used uninitialized in this function

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • pxa2xx_i2s_resume is :
    - unconditionnaly setting SACR0_ENB
    - unsetting SACR0_ENB in saved SACR0 pxa_i2s.sacr0
    fix these.

    In pxa2xx_i2s_{resume,suspend}, save/restore registers even
    when !dai->active.

    Signed-off-by: Karl Beldan
    Signed-off-by: Mark Brown

    Karl Beldan
     
  • i2s_clk is 'put' for no reason in pxa2xx_i2s_shutdown.
    Now we 'get' i2s_clk at probe and 'put' it at driver removal or when
    probe fails.

    Signed-off-by: Karl Beldan
    Signed-off-by: Mark Brown

    Karl Beldan
     
  • - hw_params enables both RPL and REC functions each time : Enable the
    appropriate function in pxa2xx_i2s_trigger.
    - pxa2xx_i2s_shutdown disables i2s anytime one of RPL or REC function is
    off : Turn it off only when both functions are off.

    Signed-off-by: Karl Beldan
    Signed-off-by: Mark Brown

    Karl Beldan
     
  • Make sure we are in a know good state at end of probe :
    Reset FIFO logic and registers, and make sure REC and RPL functions
    along with FIFO service are disabled (SACR0_RST enables REC and RPL).

    Resetting loses current settings so remove reset from stream startup.
    Now reset occurs only at probe.

    Signed-off-by: Karl Beldan
    Signed-off-by: Mark Brown

    Karl Beldan
     

12 May, 2009

2 commits


05 May, 2009

2 commits


04 May, 2009

1 commit


24 Apr, 2009

1 commit

  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] 5460/1: Orion: reduce namespace pollution
    [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
    [ARM] 5457/1: mach-imx gpio buildfix
    [ARM] 5456/1: add sys_preadv and sys_pwritev
    [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
    [ARM] pxa/palm27x: General fix for Palm27x aSoC driver
    [ARM] pxa/mioa701: use GPIO95 as AC97 reset line
    [ARM] pxa: merge AC97 platform data structures
    [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h

    Linus Torvalds
     

23 Apr, 2009

2 commits


21 Apr, 2009

1 commit


20 Apr, 2009

2 commits


19 Apr, 2009

2 commits

  • Firstly, this patch makes the palm27x asoc driver a little more sane. Also,
    since all affected devices use GPIO95 as AC97_nRESET, this patch sets that
    properly. Affected are PalmT5, TX and LifeDrive.

    Signed-off-by: Marek Vasut
    Signed-off-by: Eric Miao

    Marek Vasut
     
  • * fix/asoc:
    ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
    ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
    ASoC: Fix include build error in s3c2412-i2s.c
    ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
    ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
    ASoC: Fix jive_wm8750.c build problems
    ASoC: pxa-ssp: allow setting of dai format 0

    Takashi Iwai
     

17 Apr, 2009

1 commit


16 Apr, 2009

1 commit