1. 18 7月, 2015 5 次提交
    • L
      Merge tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eb254374
      Linus Torvalds 提交于
      Pull staging and IIO driver fixes from Greg KH:
       "Here's some staging and IIO driver fixes for 4.2-rc3.
      
        Nothing major, the majority are IIO issues that were reported, with a
        few other minor staging driver fixes.  All have been in linux-next for
        a while with no reported issues"
      
      * tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (25 commits)
        staging: vt6656: check ieee80211_bss_conf bssid not NULL
        staging: vt6655: check ieee80211_bss_conf bssid not NULL
        staging:lustre: remove irq.h from socklnd.h
        staging: make board support depend on OF_IRQ and CLKDEV_LOOKUP
        iio: tmp006: Check channel info on write
        iio: sx9500: Add missing init in sx9500_buffer_pre{en,dis}able()
        iio:light:ltr501: fix regmap dependency
        iio:light:ltr501: fix variable in ltr501_init
        iio: sx9500: fix bug in compensation code
        iio: sx9500: rework error handling of raw readings
        iio: magnetometer: mmc35240: fix available sampling frequencies
        iio:light:stk3310: Fix REGMAP_I2C dependency
        iio: light: STK3310: un-invert proximity values
        iio:adc:cc10001_adc: fix Kconfig dependency
        iio: light: tcs3414: Fix bug preventing to set integration time
        iio:accel:bmc150-accel: fix counting direction
        iio:light:cm3323: clear bitmask before set
        iio: adc: at91_adc: allow to use full range of startup time
        iio: DAC: ad5624r_spi: fix bit shift of output data value
        iio: proximity: sx9500: Fix proximity value
        ...
      eb254374
    • L
      Merge tag 'usb-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 2b3eb6e3
      Linus Torvalds 提交于
      Pull USB driver fixes from Greg KH:
       "Here's some USB driver fixes for 4.2-rc3.
      
        The ususal number of gadget driver fixes are in here, along with some
        new device ids and a build fix for the mn10300 arch which required
        some symbols to be renamed in the mos7720 driver.
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'usb-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: serial: Destroy serial_minors IDR on module exit
        usb: gadget: f_midi: fix error recovery path
        usb: phy: mxs: suspend to RAM causes NULL pointer dereference
        usb: gadget: udc: fix free_irq() after request_irq() failed
        usb: gadget: composite: Fix NULL pointer dereference
        usb: gadget: f_fs: do not set cancel function on synchronous {read,write}
        usb: f_mass_storage: limit number of reported LUNs
        usb: dwc3: core: avoid NULL pointer dereference
        usb: dwc2: embed storage for reg backup in struct dwc2_hsotg
        usb: dwc2: host: allocate qtd before atomic enqueue
        usb: dwc2: host: allocate qh before atomic enqueue
        usb: musb: host: rely on port_mode to call musb_start()
        USB: cp210x: add ID for Aruba Networks controllers
        USB: mos7720: rename registers
        USB: option: add 2020:4000 ID
      2b3eb6e3
    • L
      Merge tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1ea2a01c
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "There are two small fixes for HD-audio and USB LINE6, and the rest are
        a few new quirks and device ID addition that are good enough to get
        into 4.2"
      
      * tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3]
        ALSA: line6: Fix -EBUSY error during active monitoring
        ALSA: hda - Fix a wrong busy check in alt PCM open
        ALSA: hda - add codec ID for Broxton display audio codec
        ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
      1ea2a01c
    • L
      Merge tag 'gpio-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 9bca4df2
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       "This is a first set of GPIO fixes for the v4.2 series, all hitting
        individual drivers and nothing else (except for a documentation
        oneliner.  I intended to send a request earlier but life intervened)"
      
      * tag 'gpio-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: pca953x: fix nested irqs rescheduling
        gpio: omap: prevent module from being unloaded while in use
        gpio: max732x: Add missing dev reference to gpiochip
        gpio/xilinx: Use correct address when setting initial values.
        gpio: zynq: Fix problem with unbalanced pm_runtime_enable
        gpio: omap: add missed spin_unlock_irqrestore in omap_gpio_irq_type
        gpio: brcmstb: fix null ptr dereference in driver remove
        gpio: Remove double "base" in comment
      9bca4df2
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · e05bf4f3
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Fixes all over the place.
      
        The rockchip and imx fixes I missed while on holidays, so I've queued
        them now which makes this a bit bigger.
      
        The rest is misc amdgpu, radeon, i915 and armada.
      
        I think the most important thing is the ioctl fix, we dropped the
        avoid compat ball, so we get to add a compat wrapper.
      
        There is also an i915 revert to avoid a regression with existing
        userspace"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (43 commits)
        drm/ttm: improve uncached page deallocation.
        drm/ttm: fix uncached page deallocation to properly fill page pool v3.
        drm/amdgpu/dce8: Re-set VBLANK interrupt state when enabling a CRTC
        drm/radeon/ci: silence a harmless PCC warning
        drm/amdgpu/cz: silence some dpm debug output
        drm/amdgpu/cz: store the forced dpm level
        drm/amdgpu/cz: unforce dpm levels before forcing to low/high
        drm/amdgpu: remove bogus check in gfx8 rb setup
        drm/amdgpu: set proper index/data pair for smc regs on CZ (v2)
        drm/amdgpu: disable the IP module if early_init returns -ENOENT (v2)
        drm/amdgpu: stop context leak in the error path
        drm/amdgpu: validate the context id in the dependencies
        drm/radeon: fix user ptr race condition
        drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL
        drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5
        drm/armada: avoid saving the adjusted mode to crtc->mode
        drm/armada: fix overlay when partially off-screen
        drm/armada: convert overlay to use drm_plane_helper_check_update()
        drm/armada: fix gem object free after failed prime import
        drm/armada: fix incorrect overlay plane cleanup
        ...
      e05bf4f3
  2. 17 7月, 2015 27 次提交
  3. 16 7月, 2015 8 次提交
    • M
      blk-mq: set default timeout as 30 seconds · e56f698b
      Ming Lei 提交于
      It is reasonable to set default timeout of request as 30 seconds instead of
      30000 ticks, which may be 300 seconds if HZ is 100, for example, some arm64
      based systems may choose 100 HZ.
      Signed-off-by: NMing Lei <ming.lei@canonical.com>
      Fixes: c76cbbcf ("blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue()"
      Signed-off-by: NJens Axboe <axboe@fb.com>
      e56f698b
    • G
      gpio: pca953x: fix nested irqs rescheduling · fdd50409
      Grygorii Strashko 提交于
      pca953x interrupt controller functionality is implemented using
      nested threaded IRQs which require parent_irq to be configured
      properly otherwise below warning can be seen if IRQ core
      will try re-schedule nested IRQ:
      
      ------------[ cut here ]------------
      WARNING: CPU: 1 PID: 12 at kernel/irq/manage.c:696 irq_nested_primary_handler+0x30/0x38()
      Primary handler called for nested irq 301
      Modules linked in: uinput ipv6 smsc95xx usbnet mii imx2_wdt etnaviv(C) matrix_keypad matrix_keymap ar1021_i2c
      CPU: 1 PID: 12 Comm: ksoftirqd/1 Tainted: G        WC    4.1.1 #9
      Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
      Backtrace:
      [<c0013298>] (dump_backtrace) from [<c0013488>] (show_stack+0x20/0x24)
      [<c0013468>] (show_stack) from [<c05743c4>] (dump_stack+0x70/0xc0)
      [<c0574354>] (dump_stack) from [<c002b7b8>] (warn_slowpath_common+0x88/0xc0)
      [<c002b730>] (warn_slowpath_common) from [<c002b8ac>] (warn_slowpath_fmt+0x40/0x48)
      [<c002b870>] (warn_slowpath_fmt) from [<c0075798>] (irq_nested_primary_handler+0x30/0x38)
      [<c0075768>] (irq_nested_primary_handler) from [<c0075200>] (handle_irq_event_percpu+0x70/0x2d0)
      [<c0075190>] (handle_irq_event_percpu) from [<c00754ac>] (handle_irq_event+0x4c/0x6c)
      [<c0075460>] (handle_irq_event) from [<c0078204>] (handle_simple_irq+0xa4/0xc8)
      [<c0078160>] (handle_simple_irq) from [<c0077cd4>] (resend_irqs+0x50/0x7c)
      [<c0077c84>] (resend_irqs) from [<c002f99c>] (tasklet_action+0x94/0x140)
      [<c002f908>] (tasklet_action) from [<c002eea8>] (__do_softirq+0xa0/0x3c8)
      [<c002ee08>] (__do_softirq) from [<c002f208>] (run_ksoftirqd+0x38/0x54)
      [<c002f1d0>] (run_ksoftirqd) from [<c004b1e4>] (smpboot_thread_fn+0x1f8/0x2f0)
      [<c004afec>] (smpboot_thread_fn) from [<c0047744>] (kthread+0xe8/0x104)
      [<c004765c>] (kthread) from [<c000fac8>] (ret_from_fork+0x14/0x2c)
      ---[ end trace 96052cda48865769 ]---
      
      The issue was reported and described in details by Lothar Waßmann and
      Christian Gmeiner in https://lkml.org/lkml/2014/9/9/123.
      
      Fix it by adding missed call of gpiochip_set_chained_irqchip()
      so GPIO IRQ chip helpers will set parent_irq for nested IRQs
      properly.
      Reported-by: NLothar Waßmann <LW@KARO-electronics.de>
      Tested-by: NChristian Gmeiner <christian.gmeiner@gmail.com>
      Signed-off-by: NGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      fdd50409
    • G
      gpio: omap: prevent module from being unloaded while in use · c23837ce
      Grygorii Strashko 提交于
      OMAP GPIO driver allowed to be built as loadable module, but it
      doesn't set owner field in GPIO chip structure. As result,
      module_get/put() API is not working and it's possible to unload
      OMAP driver while in use:
      
        omap_gpio 48051000.gpio: REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED
      
      Hence, add missing configuration.
      
      Cc: Tony Lindgren <tony@atomide.com>
      Fixes: cac089f9 ('gpio: omap: Allow building as a loadable module')
      Signed-off-by: NGrygorii Strashko <grygorii.strashko@ti.com>
      Acked-by: NAlexandre Courbot <acourbot@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      c23837ce
    • M
      gpio: max732x: Add missing dev reference to gpiochip · 34ab54ed
      Marek Vasut 提交于
      In case the gpiochip doesn't have the .dev field set, as is the case
      in here, it is not possible to reference this device in DT as a GPIO
      controller. A good example of this problem is that gpio-leds can not
      be used when connected to this chip, the gpio-leds driver bails out
      with -EPROBE_DEFER.
      
      Fix this problem by setting the .dev field of the gpio_chip to the
      parent i2c device.
      Signed-off-by: NMarek Vasut <marex@denx.de>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Mans Rullgard <mans@mansr.com>
      Cc: Olaf Mandel <o.mandel@menlosystems.com>
      Cc: Semen Protsenko <semen.protsenko@globallogic.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      34ab54ed
    • R
      gpio/xilinx: Use correct address when setting initial values. · 5b2c9121
      Raphaël Teysseyre 提交于
      xgpio_save_regs() is used in this driver to setup the initial
      values of the registers in the hardware.
      
      The relevant registers at that time are:
      0x0 -> channel 0 data (32 bits, one for each GPIO on this channel).
      0x4 -> channel 0 tri, controls in/out status for each GPIO of this channel.
      0x8 -> channel 1 data
      0xC -> channel 1 tri
      
      gpio-xilinx.c defines these:
      XGPIO_DATA_OFFSET   (0x0)
      XGPIO_TRI_OFFSET    (0x4)
      XGPIO_CHANNEL_OFFSET	0x8
      
      Before this patch, the "data" register value of channel 1 was written
      at 0x4 intead of 0x8 (overwriting the channel 0 "tri" register),
      and the "tri" register value for channel 1 was written at 0x8 instead of 0xC.
      Signed-off-by: NRaphaël Teysseyre <rteysseyre@gmail.com>
      Reviewed-by: NMichal Simek <michal.simek@xilinx.com>
      Reviewed-by: NAlexandre Courbot <acourbot@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      5b2c9121
    • M
      gpio: zynq: Fix problem with unbalanced pm_runtime_enable · 6b956af0
      Michal Simek 提交于
      Add missing pm_runtime_disabled to remove().
      
      Error log:
      root@zynqmp:~# modprobe gpio_zynq
      root@zynqmp:~# lsmod
          Not tainted
      gpio_zynq 7086 0 - Live 0xffffffbffc00a000
      root@zynqmp:~# rmmod gpio_zynq
      root@zynqmp:~# lsmod
          Not tainted
      root@zynqmp:~# modprobe gpio_zynq
      [  246.924438] zynq-gpio ff0a0000.gpio: Unbalanced pm_runtime_enable!
      root@zynqmp:~# rmmod gpio_zynq
      root@zynqmp:~# lsmod
          Not tainted
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      Reviewed-by: NAlexandre Courbot <acourbot@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      6b956af0
    • K
      ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3] · 98973f2f
      Keith Packard 提交于
      This laptop needs GPIO4 pulled high to enable the headphone amplifier,
      and has a mute LED on GPIO3. I modelled the patch on the existing
      GPIO4 code which pulls the line low for the same purpose; this time,
      the HP amp line is pulled high.
      
      v2: Disable the headphone amplifier when no headphone is connected.
          Don't disable power savings to preserve the LED state.
      
      v3: Remove headset-specific hooks and code; this is just a headphone.
      Signed-off-by: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      98973f2f
    • G
      gpio: omap: add missed spin_unlock_irqrestore in omap_gpio_irq_type · 977bd8a9
      Grygorii Strashko 提交于
      Add missed spin_unlock_irqrestore in omap_gpio_irq_type when
      omap_set_gpio_triggering() is failed.
      
      It fixes static checker warning:
      
      	drivers/gpio/gpio-omap.c:523 omap_gpio_irq_type()
      	warn: inconsistent returns 'spin_lock:&bank->lock'.
      
      This fixes commit:
      1562e461 ('gpio: omap: fix error handling in omap_gpio_irq_type')
      Reported-by: NJavier Martinez Canillas <javier@dowhile0.org>
      Signed-off-by: NGrygorii Strashko <grygorii.strashko@linaro.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      977bd8a9