08 Jun, 2012

4 commits


05 Jun, 2012

2 commits


04 Jun, 2012

2 commits


02 Jun, 2012

1 commit

  • Pull sound fixes from Takashi Iwai:
    "Just a few trivial driver-specific fixes."

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hdspm - Work around broken DDS value on PCI RME MADI
    ALSA: usb-audio: fix rate_list memory leak
    ASoC: fsi: bugfix: ensure dma is terminated
    ASoC: fsi: bugfix: correct dma area
    ASoC: fsi: bugfix: enable master clock control on DMA stream
    ASoC: imx-ssi: Use clk_prepare_enable/clk_disable_unprepare

    Linus Torvalds
     

01 Jun, 2012

1 commit


31 May, 2012

2 commits


30 May, 2012

3 commits


28 May, 2012

1 commit

  • Fix the following kernel crash:

    ------------[ cut here ]------------
    WARNING: at drivers/clk/clk.c:508 __clk_enable+0x9c/0xa8()
    Modules linked in:
    Backtrace:
    [] (dump_backtrace+0x0/0x10c) from [] (dump_stack+0x18/0x1c)
    r7:00000009 r6:000001fc r5:803002ac r4:00000000
    [] (dump_stack+0x0/0x1c) from [] (warn_slowpath_common+0x54/0x6c)
    [] (warn_slowpath_common+0x0/0x6c) from [] (warn_slowpath_null+0x24/0x2c)
    r9:00000090 r8:8600e2c0 r7:8605c808 r6:8605c800 r5:8605d780
    r4:8600e2c0
    [] (warn_slowpath_null+0x0/0x2c) from [] (__clk_enable+0x9c/0xa8)
    [] (__clk_enable+0x0/0xa8) from [] (clk_enable+0x18/0x30)
    r5:8605d780 r4:80000013
    [] (clk_enable+0x0/0x30) from [] (imx_ssi_probe+0xa0/0x4f4)
    r5:8605d780 r4:86174180
    [] (imx_ssi_probe+0x0/0x4f4) from [] (platform_drv_probe+0x20/0x24)
    [] (platform_drv_probe+0x0/0x24) from [] (driver_probe_device+0x80/0x1f0)
    [] (driver_probe_device+0x0/0x1f0) from [] (__driver_attach+0x94/0x98)
    r9:00000090 r8:805b7800 r7:00000000 r6:8605c83c r5:805b1b44
    r4:8605c808
    [] (__driver_attach+0x0/0x98) from [] (bus_for_each_dev+0x68/0x94)
    r7:00000000 r6:80229db0 r5:86033eb0 r4:805b1b44
    [] (bus_for_each_dev+0x0/0x94) from [] (driver_attach+0x20/0x28)
    r7:00000000 r6:86174100 r5:8059f6d0 r4:805b1b44
    [] (driver_attach+0x0/0x28) from [] (bus_add_driver+0x18c/0x268)
    [] (bus_add_driver+0x0/0x268) from [] (driver_register+0x80/0x134)
    [] (driver_register+0x0/0x134) from [] (platform_driver_register+0x4c/0x60)
    r7:00000000 r6:805b7800 r5:00000018 r4:86032000
    [] (platform_driver_register+0x0/0x60) from [] (imx_ssi_driver_init+0x14/0x1c)
    [] (imx_ssi_driver_init+0x0/0x1c) from [] (do_one_initcall+0x40/0x194)
    [] (do_one_initcall+0x0/0x194) from [] (kernel_init+0x114/0x1f0)
    [] (kernel_init+0x0/0x1f0) from [] (do_exit+0x0/0x788)
    ---[ end trace d4aa739205917dbb ]---
    asoc: mc13783-hifi imx-ssi.0 mapping ok

    Signed-off-by: Fabio Estevam
    Signed-off-by: Mark Brown

    Fabio Estevam
     

27 May, 2012

1 commit

  • Pull arm-soc clock driver changes from Olof Johansson:
    "The new clock subsystem was merged in linux-3.4 without any users,
    this now moves the first three platforms over to it: imx, mxs and
    spear.

    The series also contains the changes for the clock subsystem itself,
    since Mike preferred to have it together with the platforms that
    require these changes, in order to avoid interdependencies and
    conflicts."

    Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
    removed in one branch, added OF support in another) and
    drivers/dma/imx-sdma.c (independent changes next to each other).

    * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
    clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
    clk: Provide dummy clk_unregister()
    SPEAr: Update defconfigs
    SPEAr: Add SMI NOR partition info in dts files
    SPEAr: Switch to common clock framework
    SPEAr: Call clk_prepare() before calling clk_enable
    SPEAr: clk: Add General Purpose Timer Synthesizer clock
    SPEAr: clk: Add Fractional Synthesizer clock
    SPEAr: clk: Add Auxiliary Synthesizer clock
    SPEAr: clk: Add VCO-PLL Synthesizer clock
    SPEAr: Add DT bindings for SPEAr's timer
    ARM i.MX: remove now unused clock files
    ARM: i.MX6: implement clocks using common clock framework
    ARM i.MX35: implement clocks using common clock framework
    ARM i.MX5: implement clocks using common clock framework
    ARM: Kirkwood: Replace clock gating
    ARM: Orion: Audio: Add clk/clkdev support
    ARM: Orion: PCIE: Add support for clk
    ARM: Orion: XOR: Add support for clk
    ARM: Orion: CESA: Add support for clk
    ...

    Linus Torvalds
     

25 May, 2012

5 commits

  • Pull sound update from Takashi Iwai:
    "This is the second updates for 3.5-rc1. It's mainly for OMAP4 HDMI
    updates and the device tree updates for OMAP, in addition to a couple
    of PCM accuray improvement and Realtek ALC269VD codec support."

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
    ALSA: hda/realtek - Add new codec support for ALC269VD
    ALSA: core: group read of pointer, tstamp and jiffies
    ASoC: OMAP: HDMI: Rename sound card source file
    ASoC: OMAP: HDMI: Make sound card naming more generic
    ASoC: OMAP: HDMI: Make build config options more generic
    ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI
    ASoC: OMAP: HDMI: Improve how the display state is verified
    ASoC: OMAP: HDMI: Expand configuration of hw_params
    ASoC: OMAP: HDMI: Use the DSS audio interface
    ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI
    ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI
    ASoC: OMAP: HDMI: Update the platform device names
    ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters
    ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table
    ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure
    ASoC: omap-dmic: Add device tree bindings
    ASoC: omap-mcpdm: Add device tree bindings
    ASoC: omap-mcbsp: buffer size constraint only applies to playback stream
    ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC
    ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode
    ...

    Linus Torvalds
     
  • Pull VGA-switcheroo audio client support for HD-audio from Takashi Iwai.

    This depended on the recent drm pull.

    * tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - unlock on error in azx_interrupt()
    ALSA: hda - Support VGA-switcheroo
    ALSA: hda - Export snd_hda_lock_devices()
    ALSA: hda - Check the dead HDMI audio controller by vga-switcheroo

    Linus Torvalds
     
  • Also fix some settings applied only for ALC269VB.

    Signed-off-by: Kailang Yang
    Signed-off-by: Takashi Iwai

    Kailang Yang
     
  • Pull IEEE 1394 (FireWire) subsystem updates from Stefan Richter:

    - Fix mismatch between DMA mapping direction (was wrong) and DMA
    synchronization direction (was correct) of isochronous reception
    buffers of userspace drivers if vma-mapped for R/W access. For
    example, libdc1394 was affected.

    - more consistent retry stategy in device discovery/ rediscovery, and
    improved failure diagnostics

    - various small cleanups, e.g. use SCSI layer's DMA mapping API in
    firewire-sbp2

    * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
    firewire: sbp2: document the absence of alignment requirements
    firewire: sbp2: remove superfluous blk_queue_max_segment_size() call
    firewire: sbp2: use scsi_dma_(un)map
    firewire: sbp2: give correct DMA device to scsi framework
    firewire: core: fw_device_refresh(): clean up error handling
    firewire: core: log config rom reading errors
    firewire: core: log error in case of failed bus manager lock
    firewire: move rcode_string() to core
    firewire: core: improve reread_config_rom() interface
    firewire: core: wait for inaccessible devices after bus reset
    firewire: ohci: omit spinlock IRQ flags where possible
    firewire: ohci: correct signedness of a local variable
    firewire: core: fix DMA mapping direction
    firewire: use module_pci_driver

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:
    - some V4L2 API updates needed by embedded devices
    - DVB API extensions for ATSC-MH delivery system, used in US for mobile
    TV
    - new tuners for fc0011/0012/0013 and tua9001
    - a new dvb driver for af9033/9035
    - a new ATSC-MH frontend (lg2160)
    - new remote controller keymaps
    - Removal of a few legacy webcam driver that got replaced by gspca on
    several kernel versions ago
    - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
    - a new webcam sensor driver (smiapp)
    - a new video input driver for embedded (sta2x1xx)
    - several improvements, fixes, cleanups, etc inside the drivers.

    Manually fix up conflicts due to err() -> dev_err() conversion in
    drivers/staging/media/easycap/easycap_main.c

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
    [media] saa7134-cards: Remove a PCI entry added by mistake
    [media] radio-sf16fmi: add support for SF16-FMD
    [media] rc-loopback: remove duplicate line
    [media] patch for Asus My Cinema PS3-100 (1043:48cd)
    [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
    [media] em28xx: simple comment fix
    [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
    [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
    [media] smiapp: Add support for 8-bit uncompressed formats
    [media] smiapp: Allow generic quirk registers
    [media] smiapp: Use non-binning limits if the binning limit is zero
    [media] smiapp: Initialise rval in smiapp_read_nvm()
    [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
    [media] smiapp: Use 8-bit reads only before identifying the sensor
    [media] smiapp: Quirk for sensors that only do 8-bit reads
    [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
    [media] smiapp: Allow using external clock from the clock framework
    [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
    [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
    [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
    ...

    Linus Torvalds
     

24 May, 2012

1 commit

  • Pull sound updates from Takashi Iwai:
    "This is the first big chunk for 3.5 merges of sound stuff.

    There are a few big changes in different areas. First off, the
    streaming logic of USB-audio endpoints has been largely rewritten for
    the better support of "implicit feedback". If anything about USB got
    broken, this change has to be checked.

    For HD-audio, the resume procedure was changed; instead of delaying
    the resume of the hardware until the first use, now waking up
    immediately at resume. This is for buggy BIOS.

    For ASoC, dynamic PCM support and the improved support for digital
    links between off-SoC devices are major framework changes.

    Some highlights are below:

    * HD-audio
    - Avoid accesses of invalid pin-control bits that may stall the codec
    - V-ref setup cleanups
    - Fix the races in power-saving code
    - Fix the races in codec cache hashes and connection lists
    - Split some common codes for BIOS auto-parser to hda_auto_parser.c
    - Changed the PM resume code to wake up immediately for buggy BIOS
    - Creative SoundCore3D support
    - Add Conexant CX20751/2/3/4 codec support

    * ASoC
    - Dynamic PCM support, allowing support for SoCs with internal
    routing through components with tight sequencing and formatting
    constraints within their internal paths or where there are multiple
    components connected with CPU managed DMA controllers inside the
    SoC.
    - Greatly improved support for direct digital links between off-SoC
    devices, providing a much simpler way of connecting things like
    digital basebands to CODECs.
    - Much more fine grained and robust locking, cleaning up some of the
    confusion that crept in with multi-component.
    - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
    ST-Ericsson MSP I2S controolers
    - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
    Texas Instruments LM49453.
    - Some regmap changes needed by the Tegra I2S driver.
    - mc13783 audio support.

    * Misc
    - Rewrite with module_pci_driver()
    - Xonar DGX support for snd-oxygen
    - Improvement of packet handling in snd-firewire driver
    - New USB-endpoint streaming logic
    - Enhanced M-audio FTU quirks and relevant cleanups
    - Increment the support of OSS devices to 256
    - snd-aloop accuracy improvement

    There are a few more pending changes for 3.5, but they will be sent
    slightly later as partly depending on the changes of DRM."

    Fix up conflicts in regmap (due to duplicate patches, with some further
    updates then having already come in from the regmap tree). Also some
    fairly trivial context conflicts in the imx and mcx soc drivers.

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
    ALSA: snd-usb: fix stream info output in /proc
    ALSA: pcm - Add proper state checks to snd_pcm_drain()
    ALSA: sh: Fix up namespace collision in sh_dac_audio.
    ALSA: hda/realtek - Fix unused variable compile warning
    ASoC: sh: fsi: enable chip specific data transfer mode
    ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
    ASoC: sh: fsi: use same format for IN/OUT
    ASoC: sh: fsi: add fsi_version() and removed meaningless version check
    ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
    ASoC: tegra: Add machine driver for WM8753 codec
    ALSA: hda - Fix possible races of accesses to connection list array
    ASoC: OMAP: HDMI: Introduce codec
    ARM: mx31_3ds: Add sound support
    ASoC: imx-mc13783 cleanup
    mx31moboard: Add sound support
    ASoC: mc13783 codec cleanups
    ASoC: add imx-mc13783 sound support
    ASoC: Add mc13783 codec
    mfd: mc13xxx: add codec platform data
    ASoC: don't flip master of DT-instantiated DAI links
    ...

    Linus Torvalds
     

23 May, 2012

17 commits

  • Pull trivial updates from Jiri Kosina:
    "As usual, it's mostly typo fixes, redundant code elimination and some
    documentation updates."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
    edac, mips: don't change code that has been removed in edac/mips tree
    xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
    lib: Change mail address of Oskar Schirmer
    net: Change mail address of Oskar Schirmer
    arm/m68k: Change mail address of Sebastian Hess
    i2c: Change mail address of Oskar Schirmer
    net: Fix tcp_build_and_update_options comment in struct tcp_sock
    atomic64_32.h: fix parameter naming mismatch
    Kconfig: replace "--- help ---" with "---help---"
    c2port: fix bogus Kconfig "default no"
    edac: Fix spelling errors.
    qla1280: Remove redundant NULL check before release_firmware() call
    remoteproc: remove redundant NULL check before release_firmware()
    qla2xxx: Remove redundant NULL check before release_firmware() call.
    aic94xx: Get rid of redundant NULL check before release_firmware() call
    tehuti: delete redundant NULL check before release_firmware()
    qlogic: get rid of a redundant test for NULL before call to release_firmware()
    bna: remove redundant NULL test before release_firmware()
    tg3: remove redundant NULL test before release_firmware() call
    typhoon: get rid of redundant conditional before all to release_firmware()
    ...

    Linus Torvalds
     
  • Group read of hw_ptr, tstamp and jiffies in a sequence
    for better correlation. Previous code took timestamp at the
    end, which could introduce delays between audio time and
    system time.

    Signed-off-by: Pierre-Louis Bossart
    Signed-off-by: Takashi Iwai

    Pierre-Louis Bossart
     
  • Takashi Iwai
     
  • Pull arm soc-specific pinctrl changes from Olof Johansson:
    "With this, five platforms are moving to the relatively new pinctrl
    subsystem for their pin management, replacing the older soc specific
    in-kernel interfaces with common code.

    There is quite a bit of net addition of code for each platform being
    added to the pinctrl subsystem. But the payback comes later when
    adding new boards can be done by only providing new device trees
    instead."

    Fix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}

    * tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
    mtd: nand: gpmi: fix compile error caused by pinctrl call
    ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig
    ARM: nomadik: enable PINCTRL_NOMADIK where needed
    ARM: mxs: enable pinctrl support
    video: mxsfb: adopt pinctrl support
    ASoC: mxs-saif: adopt pinctrl support
    i2c: mxs: adopt pinctrl support
    mtd: nand: gpmi: adopt pinctrl support
    mmc: mxs-mmc: adopt pinctrl support
    serial: mxs-auart: adopt pinctrl support
    serial: amba-pl011: adopt pinctrl support
    spi/imx: adopt pinctrl support
    i2c: imx: adopt pinctrl support
    can: flexcan: adopt pinctrl support
    net: fec: adopt pinctrl support
    ARM: ux500: switch MSP to using pinctrl for pins
    ARM: ux500: alter MSP registration to return a device pointer
    ARM: ux500: switch to using pinctrl for uart0
    ARM: ux500: delete custom pin control system
    ARM: ux500: switch over to Nomadik pinctrl driver
    ...

    Linus Torvalds
     
  • Rename sound card driver source file to encompass not only OMAP4 but future
    OMAP versions that feature HDMI.

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

    Ricardo Neri
     
  • Rename all the relevant structures, variables and functions to not
    make specific reference to OMAP4. This is to make the driver encompass
    future OMAP versions that feature HDMI and not only OMAP4. These
    changes are only in naming. There are not functional changes.

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

    Ricardo Neri
     
  • Make Kconfig and Makefile more generic to encompass not only
    OMAP4 but other OMAP processors featuring HDMI.

    Also, relax the dependency list to depend only on any OMAP processor
    supporting OMAP2_DSS and OMAP4_DSS_HDMI. As HDMI support for
    future OMAP versions is added, the dependency list must change
    accordingly.

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

    Ricardo Neri
     
  • According to the HDMI specification, a source is permitted to
    transmit L-PCM audio in the following sample rates: 32kHz, 44.1kHz,
    48kHz, 88.2kHz, 96kHz, 176.4kHz or 192kHz.

    It also supports up to 8 audio channels.

    The sink may not necessarily support all these sample rates and
    channels. However, as this CPU DAI describes the HDMI source, it
    makes sense to include them. The limitation of capabilities as
    supported by the sink should be done in the ASoC HDMI codec.

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

    Ricardo Neri
     
  • Before starting to play audio, we need to make sure that the
    display is active and the current video mode supports audio. instead
    of using the overlay manager in the machine driver, we use the DSS audio
    interface's audio_supported function. As we already have a pointer to
    the correct dssdev, we do not have to look for it every time audio is
    to be played. Also, the CPU DAI startup function is called earlier
    than the card hw_param function. Hence and we can detect the state of
    the display earlier.

    While there, add a error message if the constraint cannot be applied.

    Signed-off-by: Ricardo Neri
    Acked-by: Mark Brown

    squash to improve err
    Signed-off-by: Liam Girdwood

    Ricardo Neri
     
  • Expand the configuration of the hw_params to include the IEC-60958
    channel status word and the CEA-861 audio infoframe. The configuration
    of such structures depends on the snd_pcm_hw_params received. A
    omap_dss_audio is used to pass the configuration parameters to DSS.

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

    Ricardo Neri
     
  • Instead of accessing the HDMI IP directly, the CPU DAI driver takes
    advantage of the audio interface provided by the DSS device driver.
    The ASoC driver will link the DSS audio functionality with ALSA by
    calling the appropriate DSS device driver functions at the relevant
    moments. For this, three new DAI operations are added: trigger, prepare
    and shutdown operations.

    At the moment, it is assumed that only one HDMI display is available
    in the system, as it is the case in OMAP4. However, in the future,
    one DAI for each HDMI display should be provided.

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

    Ricardo Neri
     
  • Create a struct hdmi_priv to store the relevant data of the CPU DAI
    driver. As more data is added to the driver, having all the data
    in the same location eases its handling. At the moment, only the DMA
    configuration parameters are included in the structure.

    Also, the required memory is allocated using devm_kzalloc rather than
    using a static global variable.

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

    Ricardo Neri
     
  • When getting the needed resources fails, return -ENODEV. This is more
    in line with other drivers do and it gives a more descriptive error.

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

    Ricardo Neri
     
  • In order to utilize the new OMAP HDMI codec and the updated name of
    the device of the CPU DAI, update the names at the drivers accordingly.

    While there, also update the name of the machine driver to be more
    generic and encompass more OMAP processors featuring HDMI and not
    only OMAP4.

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

    Ricardo Neri
     
  • In preparation to Device Tree support.
    With DT booted kernel we can not rely on pdata which used to
    hold information needed for the driver at runtime.
    Use the card's driver data to hold these informations from now on.

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

    Peter Ujfalusi
     
  • The needed change in routing will be done runtime for the non
    twl6040 connected widgets, like the Digital microphone.

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

    Peter Ujfalusi
     
  • There is no need to have two snd_soc_dai_link structure for the two setup
    the machine driver supports.
    We can just tell core to register only the first link if the DMIC link is
    not in use on the device.

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

    Peter Ujfalusi