1. 11 1月, 2013 1 次提交
  2. 10 1月, 2013 19 次提交
  3. 09 1月, 2013 9 次提交
    • A
      ALSA: hdspm - Fix wordclock status on AES32 · 56bde0f3
      Andre Schramm 提交于
      Use correct bitmask for AES32 cards to determine wordclock lock state,
      add missing bitmask for sync check and make output of the corresponding
      control and /proc coherent.
      Signed-off-by: NAndre Schramm <andre.schramm@iosono-sound.com>
      Signed-off-by: NAdrian Knoth <adi@drcomp.erfurt.thur.de>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      56bde0f3
    • D
      Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs" · 7ed4165e
      David Henningsson 提交于
      This reverts commit 697c373e.
      
      The original patch was meant to remove clicking, but in fact caused even
      more clicking instead.
      
      Thanks to c4pp4 for doing most of the work with this bug.
      
      BugLink: https://bugs.launchpad.net/bugs/886975Signed-off-by: NDavid Henningsson <david.henningsson@canonical.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      7ed4165e
    • T
      ALSA: hda - Disable runtime D3 for Intel CPT & co · d7dab4db
      Takashi Iwai 提交于
      We've got a few bug reports that the runtime D3 results in the dead
      HD-audio controller.  It seems that the problem is in a deeper level
      than the sound driver itself, so as a temporal solution, disable the
      feature for these controllers again.
      Reported-and-tested-by: NVincent Blut <vincent.debian@free.fr>
      Reported-and-tested-by: NMaurizio Avogadro <mavoga@gmail.com>
      Cc: <stable@vger.kernel.org> [v3.7]
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d7dab4db
    • L
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 974b3358
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "People are back from the holiday breaks, and it shows.  Here are a
        bunch of fixes for a number of platforms:
         - A couple of small fixes for Nomadik
         - A larger set of changes for kirkwood/mvebu
           - uart driver selection, dt clocks, gpio-poweroff fixups, a few
             __init annotation fixes and some error handling improvement in
             their xor dma driver.
         - i.MX had a couple of minor fixes (and a critical one for flexcan2
           clock setup)
         - MXS has a small board fix and a framebuffer bugfix
         - A set of fixes for Samsung Exynos, fixing default bootargs and some
           Exynos5440 clock issues
         - A set of OMAP changes including PM fixes and a few sparse warning
           fixups
      
        All in all a bit more positive code delta than we'd ideally want to
        see here, mostly from the OMAP PM changes, but nothing overly crazy."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: clps711x: Fix bad merge of clockevents setup
        ARM: highbank: save and restore L2 cache and GIC on suspend
        ARM: highbank: add a power request clear
        ARM: highbank: fix secondary boot and hotplug
        ARM: highbank: fix typos with hignbank in power request functions
        ARM: dts: fix highbank cpu mpidr values
        ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        ...
      974b3358
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ca5c8a4c
      Linus Torvalds 提交于
      Pull drm update from Dave Airlie:
       "Exynos and Radeon mostly, with a dma-buf and ttm fix thrown in.
      
        It's a bit big but its mostly exynos license fix ups and I'd rather
        not hold those up since its legally stuff.
      
        Radeon has a couple of fixes from dma engine work, TTM is just a
        locking fix, and dma-buf fix has been hanging around and I finally got
        a chance to review it."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/ttm: fix fence locking in ttm_buffer_object_transfer
        drm/prime: drop reference on imported dma-buf come from gem
        drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
        drm/exynos: move finish page flip to a common place
        drm/exynos: fimd: modify condition in fimd resume
        drm/radeon: fix DMA CS parser for r6xx linear copy packet
        drm/radeon: split r6xx and r7xx copy_dma functions
        drm/exynos: Use devm_clk_get in exynos_drm_gsc.c
        drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c
        drm/exynos: Use devm_clk_get in exynos_drm_rotator.c
        drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c
        drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c
        drm/exynos: Use devm_clk_get in exynos_drm_fimc.c
        drm/exynos: Remove redundant NULL check
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c
        drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c
        drm/exynos: fix gem buffer allocation type checking
        drm/exynos: remove needless parenthesis.
        drm/exynos: fix incorrect interrupt induced by m2m operation.
        ...
      ca5c8a4c
    • O
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of... · 434fec16
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      The biggest change is a fix to deal with different power state
      on omap2 registers that causes issues trying to use common PM code.
      Also fix few incorrect registers, and an issue for omap1 USB, and
      few sparse fixes for issues that sneaked in with all the clean-up.
      
      * tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        ARM: OMAP1: fix USB configuration use-after-release
        ARM: OMAP2/3: PRM: fix bogus OMAP2xxx powerstate return values
        ARM: OMAP3: clock data: Add missing enable/disable for EMU clock
        ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
        ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets
        ARM: OMAP4: PRM: Correct reset source map
        ARM: OMAP: SRAM: resolve sparse warnings
        ARM: OMAP AM33xx: hwmod data: resolve sparse warnings
        ARM: OMAP: 32k counter: resolve sparse warnings
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      434fec16
    • O
      Merge branch 'v3.8-samsung-fixes-2' of... · 2f64a8d7
      Olof Johansson 提交于
      Merge branch 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      Most of them are EXYNOS5440 fixes which are for changing uart console,
      cpu id (typo)  and silent complaining gpio error in kernel boot.
      
      * 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: skip the clock initialization for exynos5440
        ARM: EXYNOS: enable PINCTRL for EXYNOS5440
        ARM: dts: use uart port1 for console on exynos4210-smdkv310
        ARM: dts: use uart port0 for console on exynos5440-ssdk5440
        ARM: SAMSUNG: fix the cpu id for EXYNOS5440
        ARM: EXYNOS: Revise HDMI resource size
      2f64a8d7
    • O
      Merge tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 5595e755
      Olof Johansson 提交于
      From Shawn Guo:
      I have to send one critical mxsfb fix through arm-soc, as FB maintainer
      is unresponsive for quite a while.  People start complaining the missing
      of such an important fix.
      
      * tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        video: mxsfb: fix crash when unblanking the display
        ARM: dts: imx23-olinuxino: Fix IOMUX settings
      5595e755
    • O
      Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 2d9e02ca
      Olof Johansson 提交于
      From Shawn Guo:
      
      It includes one critical fix - wrong flexcan2 clock will hang system
      when the port gets brought up.  The other two are non-critical fixes,
      which are sent together here, since it's still early -rc stage.
      
      * tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: dts: imx31-bug: Fix manufacturer compatible string
        clk: imx: Remove 'clock-output-names' from the examples
      2d9e02ca
  4. 08 1月, 2013 11 次提交
    • L
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ed2c8911
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Nothing too exciting here, just a few regression and trivial fixes,
        and new quirks for HD-audio and USB-audio.
      
         - HD-audio mute LED mode enum fix
         - Fix kernel panic of Digidesign Mbox2 usb-audio quirk (which was new
           in 3.8-rc1)
         - Creative BT-D1 usb-audio quirk
         - mute LED fixup for HP Pavillion 17 laptop"
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
        ALSA: au88x0: fix incorrect left shift
        sound: oss/pas2: Fix possible access out of array
        ALSA: usb-audio: Fix kernel panic of Digidesign Mbox2 quirk
        ALSA: usb-audio: Add support for Creative BT-D1 via usb sound quirks
        ALSA: hda - Switch "On" and "Off" for "Mute-LED Mode" kcontrol
      ed2c8911
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5c33d9b2
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) New sysctl ndisc_notify needs some documentation, from Hanns
          Frederic Sowa.
      
       2) Netfilter REJECT target doesn't set transport header of SKB
          correctly, from Mukund Jampala.
      
       3) Forcedeth driver needs to check for DMA mapping failures, from Larry
          Finger.
      
       4) brcmsmac driver can't use usleep_range while holding locks, use
          udelay instead.  From Niels Ole Salscheider.
      
       5) Fix unregister of netlink bridge multicast database handlers, from
          Vlad Yasevich and Rami Rosen.
      
       6) Fix checksum calculations in netfilter's ipv6 network prefix
          translation module.
      
       7) Fix high order page allocation failures in netfilter xt_recent, from
          Eric Dumazet.
      
       8) mac802154 needs to use netif_rx_ni() instead of netif_rx() because
          mac802154_process_data() can execute in process rather than
          interrupt context.  From Alexander Aring.
      
       9) Fix splice handling of MSG_SENDPAGE_NOTLAST, otherwise we elide one
          tcp_push() too many.  From Eric Dumazet and Willy Tarreau.
      
      10) Fix skb->truesize tracking in XEN netfront driver, from Ian
          Campbell.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
        xen/netfront: improve truesize tracking
        ipv4: fix NULL checking in devinet_ioctl()
        tcp: fix MSG_SENDPAGE_NOTLAST logic
        net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.
        ip-sysctl: fix spelling errors
        mac802154: fix NOHZ local_softirq_pending 08 warning
        ipv6: document ndisc_notify in networking/ip-sysctl.txt
        ath9k: Fix Kconfig for ATH9K_HTC
        netfilter: xt_recent: avoid high order page allocations
        netfilter: fix missing dependencies for the NOTRACK target
        netfilter: ip6t_NPT: fix IPv6 NTP checksum calculation
        bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.
        vxlan: allow live mac address change
        bridge: Correctly unregister MDB rtnetlink handlers
        brcmfmac: fix parsing rsn ie for ap mode.
        brcmsmac: add copyright information for Canonical
        rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call
        ...
      5c33d9b2
    • M
      ALSA: pxa27x: fix ac97 warm reset · 3b4bc7bc
      Mike Dunn 提交于
      This patch fixes some code that implements a work-around to a hardware bug in
      the ac97 controller on the pxa27x.  A bug in the controller's warm reset
      functionality requires that the mfp used by the controller as the AC97_nRESET
      line be temporarily reconfigured as a generic output gpio (AF0) and manually
      held high for the duration of the warm reset cycle.  This is what was done in
      the original code, but it was broken long ago by commit fb1bf8cd
          ([ARM] pxa: introduce processor specific pxa27x_assert_ac97reset())
      which changed the mfp to a GPIO input instead of a high output.
      
      The fix requires the ac97 controller to obtain the gpio via gpio_request_one(),
      with arguments that configure the gpio as an output initially driven high.
      
      Tested on a palm treo 680 machine.  Reportedly, this broken code only prevents a
      warm reset on hardware that lacks a pull-up on the line, which appears to be the
      case for me.
      Signed-off-by: NMike Dunn <mikedunn@newsguy.com>
      Signed-off-by: NIgor Grinberg <grinberg@compulab.co.il>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: stable@vger.kernel.org
      3b4bc7bc
    • M
      ALSA: pxa27x: fix ac97 cold reset · 41b645c8
      Mike Dunn 提交于
      Cold reset on the pxa27x currently fails and
      
           pxa2xx_ac97_try_cold_reset: cold reset timeout (GSR=0x44)
      
      appears in the kernel log.  Through trial-and-error (the pxa270 developer's
      manual is mostly incoherent on the topic of ac97 reset), I got cold reset to
      complete by setting the WARM_RST bit in the GCR register (and later noticed that
      pxa3xx does this for cold reset as well).  Also, a timeout loop is needed to
      wait for the reset to complete.
      
      Tested on a palm treo 680 machine.
      Signed-off-by: NMike Dunn <mikedunn@newsguy.com>
      Acked-by: NIgor Grinberg <grinberg@compulab.co.il>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: stable@vger.kernel.org
      41b645c8
    • D
      drm/ttm: fix fence locking in ttm_buffer_object_transfer · e8e89622
      Daniel Vetter 提交于
      Noticed while reviewing the fence locking in the radeon pageflip
      handler.
      
      v2: Instead of grabbing the bdev->fence_lock in object_transfer just
      move the single callsite of that function a few lines, so that it is
      protected by the fence_lock. Suggested by Jerome Glisse.
      
      v3: Fix typo in commit message.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e8e89622
    • O
      Merge tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux into fixes · 5cf87a12
      Olof Johansson 提交于
      From Jason Cooper:
      
      fixes for mvebu/kirkwood v3.8
       - use correct uart driver for mvebu boards
       - add a missing DT clocks
       - gpio-poweroff level vs. edge triggering, use gpio_is_valid()
       - remove an inappropriate __init, modules need to access function.
       - various DT fixes
       - error handling in mv_xor
      
      * tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux:
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        Power: gpio-poweroff: Fix documentation and gpio_is_valid
        ARM: Kirkwood: Fix missing clk for USB device.
        arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      5cf87a12
    • O
      ARM: clps711x: Fix bad merge of clockevents setup · 0e3a4a2e
      Olof Johansson 提交于
      I mismerged a previous branch from Alexander, and accidentally left
      in ARCH_USES_GETTIMEOFFSET. Remove it.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Cc: Alexander Shiyan <shc_work@mail.ru>
      0e3a4a2e
    • O
      Merge tag 'nomadik-fixes-for-arm-soc' of... · daaeec93
      Olof Johansson 提交于
      Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
      
      From Linus Walleij:
      Two fixes to the Nomadik:
      - Delete a dangling include
      - Bump IRQ numbers to offset at 32
      
      * tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
        ARM: nomadik: bump the IRQ numbers again
        ARM: nomadik: delete dangling include
      daaeec93
    • R
      ARM: highbank: save and restore L2 cache and GIC on suspend · 1ddda1cd
      Rob Herring 提交于
      This fixes suspend to RAM adding necessary save and restore of L2 and GIC.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1ddda1cd
    • R
      ARM: highbank: add a power request clear · 9852910a
      Rob Herring 提交于
      When we fail to power down, we need to clear out the power request.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      9852910a
    • R
      ARM: highbank: fix secondary boot and hotplug · 0b3455a7
      Rob Herring 提交于
      With commit 384a2902 (ARM: gic: use a private mapping for CPU target
      interfaces), wake-up IPIs now go to all cores as the gic cpu interface
      numbering may not follow core numbering. This broke secondary boot on
      highbank since the boot address was already set for all secondary cores,
      this caused all cores to boot before the kernel was ready.
      
      Fix this by moving the setting of the jump address to
      highbank_boot_secondary instead of highbank_smp_prepare_cpus and
      highbank_cpu_die. Also, clear the address when we boot. This prevents
      cores from booting before they are actually triggered and is also necessary
      to get suspend/resume to work.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      0b3455a7