10 May, 2013

2 commits

  • Pull sound fixes from Takashi Iwai:
    "This contains small fixes since the previous pull request:

    - A few regression fixes and small updates of HD-audio

    - Yet another fix for Haswell HDMI audio

    - A copule of trivial fixes in ASoC McASP, DPAM and WM8994"

    * tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    Revert "ALSA: hda - Don't set up active streams twice"
    ALSA: Add comment for control TLV API
    ALSA: hda - Apply pin-enablement workaround to all Haswell HDMI codecs
    ALSA: HDA: Fix Oops caused by dereference NULL pointer
    ALSA: mips/sgio2audio: Remove redundant platform_set_drvdata()
    ALSA: mips/hal2: Remove redundant platform_set_drvdata()
    ALSA: hda - Fix 3.9 regression of EAPD init on Conexant codecs
    sound: Fix make allmodconfig on MIPS
    ALSA: hda - Fix system panic when DMA > 40 bits for Nvidia audio controllers
    ALSA: atmel: Remove redundant platform_set_drvdata()
    ASoC: McASP: Fix receive clock polarity in DAIFMT_NB_NF mode.
    ASoC: wm8994: missing break in wm8994_aif3_hw_params()
    ASoC: McASP: Add pins output direction for rx clocks when configured in CBS_CFS format
    ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare

    Linus Torvalds
     
  • This reverts commit affdb62b815b38261f09f9d4ec210a35c7ffb1f3.

    The commit introduced a regression with AD codecs where the stream is
    always clean up. Since the patch is just a minor optimization and
    reverting the commit fixes the issue, let's just revert it.

    Reported-and-tested-by: Michael Burian
    Cc: [v3.9+]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     

08 May, 2013

2 commits

  • This is a revised patch based on Mengdong Lin's fix patch, which is a
    supplement to a previous patch [1611a9c9: ALSA: hda - Add fixup for
    Haswell to enable all pin and convertor widgets].

    Some Haswell BIOS will disable the 2nd and 3rd pin/covertor widgets
    when the HD-A controller changes state from D3 to D0. So when the
    controller resumes after a system or runtime suspend, these widgets
    are disabled and programming these widgets to D0 will cause H/W error
    and codec will not respond.

    In addition, we found out that some BIOS disables the pins at S3
    although it shows up at boot. This confuses the driver utterly, and
    the hardware falls into the fatal communication error like the above.

    So in this patch, we apply intel_haswell_enable_all_pins() not only as
    a fixup to a certain device (with 8086:2010) but to all Haswell
    machines. The codec driver basically assumes that all pins are
    exposed, so it's anyway better to see them from the beginning. Even
    if all pins and converters are shown by this call, there should be no
    regression in practice: the pin default configurations are still kept,
    thus the disabled pins are handled as disabled by the driver
    properly.

    Signed-off-by: Mengdong Lin
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • Faster kernel compiles by way of fewer unnecessary includes.

    [akpm@linux-foundation.org: fix fallout]
    [akpm@linux-foundation.org: fix build]
    Signed-off-by: Kent Overstreet
    Cc: Zach Brown
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Cc: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kent Overstreet
     

07 May, 2013

1 commit

  • The interrupt handler azx_interrupt will call azx_update_rirb,
    which may call snd_hda_queue_unsol_event, snd_hda_queue_unsol_event
    will dereference chip->bus pointer.

    The problem is we alloc chip->bus in azx_codec_create
    which will be called after we enable IRQ and enable unsolicited
    event in azx_probe.

    This will cause Oops due dereference NULL pointer. I meet it, good luck:)

    [Rearranged the NULL check before the tracepoint and added another
    NULL check of bus->workq -- tiwai]

    Signed-off-by: Wang YanQing
    Cc:
    Signed-off-by: Takashi Iwai

    Wang YanQing
     

06 May, 2013

2 commits


04 May, 2013

2 commits

  • The older Conexant codecs have up to two EAPDs and these are supposed
    to be rather statically turned on. The new generic parser code
    assumes the dynamic on/off per path usage, thus it resulted in the
    silent output on some machines.

    This patch fixes the problem by simply assuming the static EAPD on for
    such old Conexant codecs as we did until 3.8 kernel.

    Reported-and-tested-by: Christopher K.
    Cc: [v3.9]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • Pull sound updates from Takashi Iwai:
    "Mostly many small changes spread as seen in diffstat in sound/*
    directory by this update. A significant change in the subsystem level
    is the introduction of snd_soc_component, which will help more generic
    handling of SoC and off-SoC components.

    Also, snd_BUG_ON() macro is enabled unconditionally now due to its
    misuses, so people might hit kernel warnings (it's a good thing for
    us).

    - compress-offload: support for capture by Charles Keepax
    - HD-audio: codec delay support by Dylan Reid
    - HD-audio: improvements/fixes in generic parser: better headphone
    mic and headset mic support, jack_modes hint consolidation, proper
    beep attach/detachment, generalized power filter controls by David
    Henningsson, et al
    - HD-audio: Improved management of HDMI codec pins/converters
    - HD-audio: Better pin/DAC assignment for VIA codecs
    - HD-audio: Haswell HDMI workarounds
    - HD-audio: ALC268 codec support, a few new quirks for Chromebooks
    - USB: regression fixes: USB-MIDI autopm fix, the recent ISO latency
    fix by Clemens Ladisch
    - USB: support for DSD formats by Daniel Mack
    - USB: A few UAC2 device endian/cock fixes by Eldad Zack
    - USB: quirks for Emu 192kHz support, Novation Twitch DJ controller,
    Yamaha THRxx devices
    - HDSPM: updates for TCO controls by Adrian Knoth
    - ASoC: Add a snd_soc_component object type for generic handling of
    SoC and off-SoC components by Kuninori Morimoto,
    - dmaengine: a large set of cleanups and conversions by Lars-Peter
    Clausen
    - ASoC DAPM: performance optimizations from Ryo Tsutsui
    - ASoC DAPM: support for mixer control sharing by Stephen Warren
    - ASoC: multiplatform ARM cleanups from Arnd Bergmann
    - ASoC: new codec drivers for AK5385 and TAS5086 from Daniel Mack"

    * tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (315 commits)
    ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch
    ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats
    ALSA: pcm_format_to_bits strong-typed conversion
    ALSA: compress: fix the states to check for allowing read
    ALSA: hda - Move Thinkpad X220 to use auto parser
    ALSA: USB: adjust for changed 3.8 USB API
    ALSA: usb - Avoid unnecessary sample rate changes on USB 2.0 clock sources
    sound: oss/dmabuf: use dma_map_single
    ALSA: ali5451: use mdelay instead of large udelay constants
    ALSA: hda - Add the support for ALC286 codec
    ALSA: usb-audio: USB quirk for Yamaha THR10C
    ALSA: usb-audio: USB quirk for Yamaha THR5A
    ALSA: usb-audio: USB quirk for Yamaha THR10
    ALSA: usb-audio: Fix autopm error during probing
    ALSA: snd-usb: try harder to find USB_DT_CS_ENDPOINT
    ALSA: sound kconfig typo
    ALSA: emu10k1: Fix dock firmware loading
    ASoC: ux500: forward declare msp_i2s_platform_data
    ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes
    ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers
    ...

    Linus Torvalds
     

03 May, 2013

9 commits

  • The compile of soundcard.c is broken on MIPS when allmodconfig is used
    because of the missing MAX_DMA_CHANNELS definition. As a simple
    workaround, just add a Kconfig dependency.

    Reported-by: Andrew Morton
    Cc: Ralf Baechle
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • The audio driver mistakenly allows 64 bit addresses to be created for
    the audio driver on Nvidia GPUs. Unfortunately, the hardware normally
    only supports up to 40 bits of DMA. This can cause system panics as
    well as misdirected data when the address is > 40 bits as the upper
    part the address is truncated.

    Signed-off-by: Mike Travis
    Reviewed-by: Mike Habeck
    Signed-off-by: Takashi Iwai

    Mike Travis
     
  • Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
    driver is bound) removes the need to set driver data field to
    NULL.

    Signed-off-by: Sachin Kamat
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Nicolas Ferre
    Signed-off-by: Takashi Iwai

    Sachin Kamat
     
  • …e/sound into for-next

    ASoC: Updates for v3.10

    A few more bug fixes, the DAPM clock fix is actually a driver specific
    one since currently there's only one user of the clock support due to
    the problems relying on the clock API.

    Takashi Iwai
     
  • Mark Brown
     
  • Mark Brown
     
  • According documentation bit ACLKRPOL is set to 0 (receiver samples data
    on falling edge) and when set to 1 (receiver samples data on rising edge).

    I2S data are always sampled on falling edge and valid during rising edge
    of bit clock. So in case of capture data transmitter sample data on falling
    edge and macsp must read then on rising edge.

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

    Marek BElisko
     
  • Pull ARM SoC multiplatform updates from Olof Johansson:
    "More multiplatform enablement for ARM platforms. The ones converted
    in this branch are:

    - bcm2835
    - cns3xxx
    - sirf
    - nomadik
    - msx
    - spear
    - tegra
    - ux500

    We're getting close to having most of them converted!

    One of the larger platforms remaining is Samsung Exynos, and there are
    a bunch of supporting patches in this merge window for it. There was
    a patch in this branch to a early version of multiplatform conversion,
    but it ended up being reverted due to need of more bake time. The
    revert commit is part of the branch since it would have required
    rebasing multiple dependent branches and they were stable by then"

    * tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
    mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms
    clocksource: nomadik-mtu: fix up clocksource/timer
    Revert "ARM: exynos: enable multiplatform support"
    ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
    ARM: exynos: enable multiplatform support
    rtc: s3c: make header file local
    mtd: onenand/samsung: make regs-onenand.h file local
    thermal/exynos: remove unnecessary header inclusions
    mmc: sdhci-s3c: remove platform dependencies
    ARM: samsung: move mfc device definition to s5p-dev-mfc.c
    ARM: exynos: move debug-macro.S to include/debug/
    ARM: exynos: prepare for sparse IRQ
    ARM: exynos: introduce EXYNOS_ATAGS symbol
    ARM: tegra: build assembly files with -march=armv7-a
    ARM: Push selects for TWD/SCU into machine entries
    ARM: ux500: build hotplug.o for ARMv7-a
    ARM: ux500: move to multiplatform
    ARM: ux500: make remaining headers local
    ARM: ux500: make irqs.h local to platform
    ARM: ux500: get rid of
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanup from Olof Johansson:
    "Here is a collection of cleanup patches. Among the pieces that stand
    out are:

    - The deletion of h720x platforms
    - Split of at91 non-dt platforms to their own Kconfig file to keep
    them separate
    - General cleanups and refactoring of i.MX and MXS platforms
    - Some restructuring of clock tables for OMAP
    - Convertion of PMC driver for Tegra to dt-only
    - Some renames of sunxi -> sun4i (Allwinner A10)
    - ... plus a bunch of other stuff that I haven't mentioned"

    * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
    ARM: i.MX: remove unused ARCH_* configs
    ARM i.MX53: remove platform ahci support
    ARM: sunxi: Rework the restart code
    irqchip: sunxi: Rename sunxi to sun4i
    irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
    clocksource: sunxi: Rename sunxi to sun4i
    clocksource: sunxi: make use of CLKSRC_OF
    clocksource: sunxi: Cleanup the timer code
    ARM: at91: remove trailing semicolon from macros
    ARM: at91/setup: fix trivial typos
    ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
    ARM: EXYNOS: change the name of USB ohci header
    ARM: SAMSUNG: Remove unnecessary code for dma
    ARM: S3C24XX: Remove unused GPIO drive strength register definitions
    ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
    ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
    ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
    ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
    ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
    ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
    ...

    Linus Torvalds
     

02 May, 2013

3 commits

  • Pull VFS updates from Al Viro,

    Misc cleanups all over the place, mainly wrt /proc interfaces (switch
    create_proc_entry to proc_create(), get rid of the deprecated
    create_proc_read_entry() in favor of using proc_create_data() and
    seq_file etc).

    7kloc removed.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
    don't bother with deferred freeing of fdtables
    proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
    proc: Make the PROC_I() and PDE() macros internal to procfs
    proc: Supply a function to remove a proc entry by PDE
    take cgroup_open() and cpuset_open() to fs/proc/base.c
    ppc: Clean up scanlog
    ppc: Clean up rtas_flash driver somewhat
    hostap: proc: Use remove_proc_subtree()
    drm: proc: Use remove_proc_subtree()
    drm: proc: Use minor->index to label things, not PDE->name
    drm: Constify drm_proc_list[]
    zoran: Don't print proc_dir_entry data in debug
    reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
    proc: Supply an accessor for getting the data from a PDE's parent
    airo: Use remove_proc_subtree()
    rtl8192u: Don't need to save device proc dir PDE
    rtl8187se: Use a dir under /proc/net/r8180/
    proc: Add proc_mkdir_data()
    proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
    proc: Move PDE_NET() to fs/proc/proc_net.c
    ...

    Linus Torvalds
     
  • Supply a function (proc_remove()) to remove a proc entry (and any subtree
    rooted there) by proc_dir_entry pointer rather than by name and (optionally)
    root dir entry pointer. This allows us to eliminate all remaining pde->name
    accesses outside of procfs.

    Signed-off-by: David Howells
    Acked-by: Grant Likely
    cc: linux-acpi@vger.kernel.org
    cc: openipmi-developer@lists.sourceforge.net
    cc: devicetree-discuss@lists.ozlabs.org
    cc: linux-pci@vger.kernel.org
    cc: netdev@vger.kernel.org
    cc: netfilter-devel@vger.kernel.org
    cc: alsa-devel@alsa-project.org
    Signed-off-by: Al Viro

    David Howells
     
  • Supply accessor functions to set attributes in proc_dir_entry structs.

    The following are supplied: proc_set_size() and proc_set_user().

    Signed-off-by: David Howells
    Acked-by: Mauro Carvalho Chehab
    cc: linuxppc-dev@lists.ozlabs.org
    cc: linux-media@vger.kernel.org
    cc: netdev@vger.kernel.org
    cc: linux-wireless@vger.kernel.org
    cc: linux-pci@vger.kernel.org
    cc: netfilter-devel@vger.kernel.org
    cc: alsa-devel@alsa-project.org
    Signed-off-by: Al Viro

    David Howells
     

01 May, 2013

5 commits

  • The missing break here means that we always return early and the
    function is a no-op.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Mark Brown
    Cc: stable@vger.kernel.org

    Dan Carpenter
     
  • When McASP is bit clock and frame clock master enable pin output for rx clocks.

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

    Marek BElisko
     
  • Update dapm_clock_event to use clk_prepare_enable and
    clk_disable_unprepare.

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

    Fabio Baltieri
     
  • Pull media update from Mauro Carvalho Chehab:

    - OF documentation and patches at core and drivers, to be used by for
    embedded media systems

    - some I2C drivers used on go7007 were rewritten/promoted from staging:
    sony-btf-mpx, tw2804, tw9903, tw9906, wis-ov7640, wis-uda1342

    - add fimc-is driver (Exynos)

    - add a new radio driver: radio-si476x

    - add a two new tuners: r820t and tuner_it913x

    - split camera code on em28xx driver and add more models

    - the cypress firmware load is used outside dvb usb drivers. So, move
    it to a common directory to make easier to re-use it

    - siano media driver updated to work with sms2270 devices

    - several work done in order to promote go7007 and solo6x1x out of
    staging (still, there are some pending issues)

    - several API compliance fixes at v4l2 drivers that don't behave as
    expected

    - as usual, lots of driver fixes, improvements, cleanups and new device
    addition at the existing drivers.

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (831 commits)
    [media] cx88: make core less verbose
    [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
    [media] s5c73m3: fix indentation of the help section in Kconfig
    [media] cx25821-alsa: get rid of a __must_check warning
    [media] cx25821-video: declare cx25821_vidioc_s_std as static
    [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
    [media] r820t: Remove a warning for an unused value
    [media] dib0090: Fix a warning at dib0090_set_EFUSE
    [media] dib8000: fix a warning
    [media] dib8000: Fix sub-channel range
    [media] dib8000: store dtv_property_cache in a temp var
    [media] dib8000: warning fix: declare internal functions as static
    [media] r820t: quiet gcc warning on n_ring
    [media] r820t: memory leak in release()
    [media] r820t: precendence bug in r820t_xtal_check()
    [media] videodev2.h: Remove the unused old V4L1 buffer types
    [media] anysee: Grammar s/report the/report to/
    [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
    [media] media: videobuf2: fix the length check for mmap
    [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
    ...

    Linus Torvalds
     
  • Pull trivial tree updates from Jiri Kosina:
    "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
    code cleanups"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
    mm: Convert print_symbol to %pSR
    gfs2: Convert print_symbol to %pSR
    m32r: Convert print_symbol to %pSR
    iostats.txt: add easy-to-find description for field 6
    x86 cmpxchg.h: fix wrong comment
    treewide: Fix typo in printk and comments
    doc: devicetree: Fix various typos
    docbook: fix 8250 naming in device-drivers
    pata_pdc2027x: Fix compiler warning
    treewide: Fix typo in printks
    mei: Fix comments in drivers/misc/mei
    treewide: Fix typos in kernel messages
    pm44xx: Fix comment for "CONFIG_CPU_IDLE"
    doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
    mmzone: correct "pags" to "pages" in comment.
    kernel-parameters: remove outdated 'noresidual' parameter
    Remove spurious _H suffixes from ifdef comments
    sound: Remove stray pluses from Kconfig file
    radio-shark: Fix printk "CONFIG_LED_CLASS"
    doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
    ...

    Linus Torvalds
     

30 Apr, 2013

4 commits

  • * patchwork: (831 commits)
    [media] cx88: make core less verbose
    [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
    [media] s5c73m3: fix indentation of the help section in Kconfig
    [media] cx25821-alsa: get rid of a __must_check warning
    [media] cx25821-video: declare cx25821_vidioc_s_std as static
    [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
    [media] r820t: Remove a warning for an unused value
    [media] dib0090: Fix a warning at dib0090_set_EFUSE
    [media] dib8000: fix a warning
    [media] dib8000: Fix sub-channel range
    [media] dib8000: store dtv_property_cache in a temp var
    [media] dib8000: warning fix: declare internal functions as static
    [media] r820t: quiet gcc warning on n_ring
    [media] r820t: memory leak in release()
    [media] r820t: precendence bug in r820t_xtal_check()
    [media] videodev2.h: Remove the unused old V4L1 buffer types
    [media] anysee: Grammar s/report the/report to/
    [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
    [media] media: videobuf2: fix the length check for mmap
    [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
    ...

    Conflicts:
    drivers/media/pci/cx25821/cx25821-video.c
    drivers/media/platform/Kconfig

    Mauro Carvalho Chehab
     
  • Current code does this:

    be16_to_cpu(buf[i * 2] << 8 | buf[(i * 2) + 1])

    Which is effectively (neglecting the index):

    be16_to_cpu(be16_to_cpu(*((u16 *) buf)))

    This means the int16 in the buffer is not converted at all.

    Daniel Mack confirmed that the driver works on little endian
    CPUs, leading to the conclusion that the device-side structure
    is actually little endian.
    This changes the code to use le16_to_cpu().

    Caught by sparse.

    Acked-by: Daniel Mack
    Signed-off-by: Eldad Zack
    Signed-off-by: Takashi Iwai

    Eldad Zack
     
  • it is not (and it has never been) an ->fsync() instance...

    Signed-off-by: Al Viro

    Al Viro
     
  • Pull char/misc driver update from Greg Kroah-Hartman:
    "Here's the big char / misc driver update for 3.10-rc1

    A number of various driver updates, the majority being new
    functionality in the MEI driver subsystem (it's now a subsystem, it
    started out just a single driver), extcon updates, memory updates,
    hyper-v updates, and a bunch of other small stuff that doesn't fit in
    any other tree.

    All of these have been in linux-next for a while"

    * tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (148 commits)
    Tools: hv: Fix a checkpatch warning
    tools: hv: skip iso9660 mounts in hv_vss_daemon
    tools: hv: use FIFREEZE/FITHAW in hv_vss_daemon
    tools: hv: use getmntent in hv_vss_daemon
    Tools: hv: Fix a checkpatch warning
    tools: hv: fix checks for origin of netlink message in hv_vss_daemon
    Tools: hv: fix warnings in hv_vss_daemon
    misc: mark spear13xx-pcie-gadget as broken
    mei: fix krealloc() misuse in in mei_cl_irq_read_msg()
    mei: reduce flow control only for completed messages
    mei: reseting -> resetting
    mei: fix reading large reposnes
    mei: revamp mei_irq_read_client_message function
    mei: revamp mei_amthif_irq_read_message
    mei: revamp hbm state machine
    Revert "drivers/scsi: use module_pcmcia_driver() in pcmcia drivers"
    Revert "scsi: pcmcia: nsp_cs: remove module init/exit function prototypes"
    scsi: pcmcia: nsp_cs: remove module init/exit function prototypes
    mei: wd: fix line over 80 characters
    misc: tsl2550: Use dev_pm_ops
    ...

    Linus Torvalds
     

29 Apr, 2013

6 commits

  • Some Asihpi formats are not supported or invalid, and their mapping to
    ALSA format is set to -1.
    Before performing the format conversion into ALSA bitwise formats,
    add a consistency check for the requested format, as done in
    snd_card_asihpi_playback_formats().

    Compile tested only.

    Signed-off-by: Eldad Zack
    Signed-off-by: Takashi Iwai

    Eldad Zack
     
  • Add a function to handle conversion from snd_pcm_format_t
    to bitwise with proper typing.

    Change such conversions to use this function and silence sparse
    warnings.

    Signed-off-by: Eldad Zack
    Signed-off-by: Takashi Iwai

    Eldad Zack
     
  • for reading compressed data, we need to allow when we are paused, draining or
    stopped.

    Signed-off-by: Vinod Koul
    Cc: Charles Keepax
    Cc: Richard Fitzgerald
    Reviewed-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Vinod Koul
     
  • This enables better volume controls than the current model parser.
    Also, because the original quirk for X220 was added to fix
    docking station support, add the TP410 fixup instead.

    Reported-by: Willian Jon McCann
    Signed-off-by: David Henningsson
    Signed-off-by: Takashi Iwai

    David Henningsson
     
  • The recent changes in the USB API ("implement new semantics for
    URB_ISO_ASAP") made the former meaning of the URB_ISO_ASAP flag the
    default, and changed this flag to mean that URBs can be delayed.
    This is not the behaviour wanted by any of the audio drivers because
    it leads to discontinuous playback with very small period sizes.
    Therefore, our URBs need to be submitted without this flag.

    Reported-by: Joe Rayhawk
    Cc: # 3.8 only
    Signed-off-by: Clemens Ladisch
    Signed-off-by: Takashi Iwai

    Clemens Ladisch
     
  • Merging in fixes since there's a conflict in the omap4 clock tables caused by
    it.

    * fixes: (245 commits)
    ARM: highbank: fix cache flush ordering for cpu hotplug
    ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
    arm: mvebu: Fix the irq map function in SMP mode
    Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
    ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
    ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
    ARM i.MX6: Fix ldb_di clock selection
    ARM: imx: provide twd clock lookup from device tree
    ARM: imx35 Bugfix admux clock
    ARM: clk-imx35: Bugfix iomux clock
    + Linux 3.9-rc6

    Signed-off-by: Olof Johansson

    Conflicts:
    arch/arm/mach-omap2/cclock44xx_data.c

    Olof Johansson
     

26 Apr, 2013

3 commits

  • The Scarlett 2i2 seems to take almost 500 ms to set the sample rate,
    even if the clock is currently set to that value. This patch speeds
    up prepare of the device, by avoiding setting the clock to something
    it already is.

    Signed-off-by: David Henningsson
    Signed-off-by: Takashi Iwai

    David Henningsson
     
  • The virt_to_bus/bus_to_virt functions have been deprecated
    for as long as I can remember, and they are used in very
    few remaining instances, usually in obscure ISA device
    drivers. The OSS sound drivers are the only ones that are
    still used on the ARM architecture, and only on some of
    the earliest StrongARM machines.

    The problem for converting the OSS subsystem to use
    dma_map_single instead is that the caller of virt_to_bus
    does not have a device pointer, since the subsystem has
    never been ported to use the common device infrastructure.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Takashi Iwai

    Arnd Bergmann
     
  • ARM cannot handle udelay for more than 2 miliseconds, so we
    should use mdelay instead for those.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Takashi Iwai

    Arnd Bergmann
     

25 Apr, 2013

1 commit