11 Oct, 2014

1 commit

  • …it/groeck/linux-staging

    Pull hwmon updates from Guenter Roeck:
    - new driver for menf21bmc.
    - convert k10temp, smsc47b397, da9052, da9055 to new hwmon API.
    - register ntc_thermistor driver with thermal subsystem.
    - add support for F15h M60h to k10temp driver.
    - add driver for MEN14F021P00 BMC HWMON driver; this required a merge
    with tag mfd-hwmon-leds-watchdog-v3.18

    * tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
    hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver
    leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver
    watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog driver
    mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver
    hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor.
    hwmon: (smsc47b397) Convert to devm_hwmon_device_register_with_groups
    MAINTAINERS: add entry for the PWM fan driver
    hwmon: (k10temp) Convert to devm_hwmon_device_register_with_groups
    hwmon: (k10temp) Add support for F15h M60h
    hwmon: (da9052) Convert to devm_hwmon_device_register_with_groups
    hwmon: (da9055) Convert to devm_hwmon_device_register_with_groups
    hwmon: (ads1015) Use of_property_read_u32 at appropriate places

    Linus Torvalds
     

10 Oct, 2014

1 commit

  • Pull GPIO changes from Linus Walleij:
    "This is the bulk of GPIO changes for the v3.18 development cycle:

    - Increase the default ARCH_NR_GPIO from 256 to 512. This was done
    to avoid having a custom header for the x86
    architecture - GPIO is custom and complicated enough as it is
    already! We want to move to a radix to store the descriptors going
    forward, and finally get rid of this fixed array size altogether.

    - Endgame patching of the gpio_remove() semantics initiated by
    Abdoulaye Berthe. It is not accepted by the system that the
    removal of a GPIO chip fails during eg reboot or shutdown, and
    therefore the return value has now painfully been refactored away.
    For special cases like GPIO expanders on a hot-pluggable bus like
    USB, we may later add some gpiochip_try_remove() call, but for the
    cases we have now, return values are moot.

    - Some incremental refactoring of the gpiolib core and ACPI GPIO
    library for more descriptor usage.

    - Refactor the chained IRQ handler set-up method to handle also
    threaded, nested interrupts and set up the parent IRQ correctly.
    Switch STMPE and TC3589x drivers to use this registration method.

    - Add a .irq_not_threaded flag to the struct gpio_chip, so that also
    GPIO expanders that block but are still not using threaded IRQ
    handlers.

    - New drivers for the ARM64 X-Gene SoC GPIO controller.

    - The syscon GPIO driver has been improved to handle the "DSP GPIO"
    found on the TI Keystone 2 SoC:s.

    - ADNP driver switched to use gpiolib irqchip helpers.

    - Refactor the DWAPB driver to support being instantiated from and
    MFD cell (platform device).

    - Incremental feature improvement in the Zynq, MCP23S08, DWAPB, OMAP,
    Xilinx and Crystalcove drivers.

    - Various minor fixes"

    * tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (52 commits)
    gpio: pch: Build context save/restore only for PM
    pinctrl: abx500: get rid of unused variable
    gpio: ks8695: fix 'else should follow close brace '}''
    gpio: stmpe: add verbose debug code
    gpio: stmpe: fix up interrupt enable logic
    gpio: staticize xway_stp_init()
    gpio: handle also nested irqchips in the chained handler set-up
    gpio: set parent irq on chained handlers
    gpiolib: irqchip: use irq_find_mapping while removing irqchip
    gpio: crystalcove: support virtual GPIO
    pinctrl: bcm281xx: make Kconfig dependency more strict
    gpio: kona: enable only on BCM_MOBILE or for compile testing
    gpio, bcm-kona, LLVMLinux: Remove use of __initconst
    gpio: Fix ngpio in gpio-xilinx driver
    gpio: dwapb: fix pointer to integer cast
    gpio: xgene: Remove unneeded #ifdef CONFIG_OF guard
    gpio: xgene: Remove unneeded forward declation for struct xgene_gpio
    gpio: xgene: Fix missing spin_lock_init()
    gpio: ks8695: fix switch case indentation
    gpiolib: add irq_not_threaded flag to gpio_chip
    ...

    Linus Torvalds
     

09 Oct, 2014

2 commits

  • Pull ARM SoC driver updates from Arnd Bergmann:
    "These are changes for drivers that are intimately tied to some SoC and
    for some reason could not get merged through the respective subsystem
    maintainer tree.

    Most of the new code is for the Keystone Navigator driver, which is
    new base support that is going to be needed for their hardware
    accelerated network driver and other units.

    Most of the commits are for moving old code around from at91 and omap
    for things that are done in device drivers nowadays.

    - at91: move reset, poweroff, memory and clocksource code into
    drivers directories
    - socfpga: add edac driver (through arm-soc, as requested by Boris)
    - omap: move omap-intc code to drivers/irqchip
    - sunxi: added an RTC driver for sun6i
    - omap: mailbox driver related changes
    - keystone: support for the "Navigator" component
    - versatile: new reboot, led and soc drivers"

    * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
    bus: arm-ccn: Fix spurious warning message
    leds: add device tree bindings for register bit LEDs
    soc: add driver for the ARM RealView
    power: reset: driver for the Versatile syscon reboot
    leds: add a driver for syscon-based LEDs
    drivers/soc: ti: fix build break with modules
    MAINTAINERS: Add Keystone Multicore Navigator drivers entry
    soc: ti: add Keystone Navigator DMA support
    Documentation: dt: soc: add Keystone Navigator DMA bindings
    soc: ti: add Keystone Navigator QMSS driver
    Documentation: dt: soc: add Keystone Navigator QMSS bindings
    rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
    rtc: sun6i: Add sun6i RTC driver
    irqchip: omap-intc: remove unnecessary comments
    irqchip: omap-intc: correct maximum number or MIR registers
    irqchip: omap-intc: enable TURBO idle mode
    irqchip: omap-intc: enable IP protection
    irqchip: omap-intc: remove unnecesary of_address_to_resource() call
    irqchip: omap-intc: comment style cleanup
    irqchip: omap-intc: minor improvement to omap_irq_pending()
    ...

    Linus Torvalds
     
  • Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
    "These are bug fixes for harmless problems that were not important
    enough to get fixed in 3.17. The majority of these are OMAP specific,
    but there are also a couple for Marvell mvebu, cns3xxx, and others, as
    well as some updates for the MAINTAINERS file.

    In particular, Robert Jarzmik and Daniel Mack now volunteered to help
    out maintaining the PXA platform, Krzysztof Halasa took over the
    cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
    meson platform, and Matthias Brugger is now listed for the mediatek
    platform he recently contributed"

    * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
    MAINTAINERS: update Shawn's email address
    MAINTAINERS: condense some Tegra related entries
    MAINTAINERS: add Alexandre Courbot for Tegra
    MAINTAINERS: CNS3xxx and IXP4xx update.
    MAINTAINERS: Add maintainers entry for Mediatek SoCs
    arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
    MAINTAINERS: add a third maintainer to mach-bcm
    CNS3xxx: Fix PCIe read size limit.
    CNS3xxx: Fix logical PCIe topology.
    CNS3xxx: Fix debug UART.
    MAINTAINERS: Add entry for the Amlogic MesonX SoCs
    MAINTAINERS: update ARM pxa maintainers
    ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
    ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
    ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
    ARM: Kirkwood: Fix DT based DSA.
    ARM: OMAP2+: make of_device_ids const
    ARM: omap2: make arrays containing machine compatible strings const
    ARM: LPC32xx: Fix reset function
    ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
    ...

    Linus Torvalds
     

26 Sep, 2014

1 commit

  • This makes it possible to create a set of LEDs from a syscon
    MFD instance, which is lean mean and clean on the ARM
    reference designs and can replace the Versatile LEDs driver
    in the long run, as well as other custom syscon LEDs drivers.

    Cc: Bryan Wu
    Cc: Richard Purdie
    [Fixed cocinelle warnings]
    Signed-off-by: Fengguang Wu
    Signed-off-by: Linus Walleij
    Signed-off-by: Arnd Bergmann

    Linus Walleij
     

25 Sep, 2014

1 commit


24 Sep, 2014

1 commit


19 Sep, 2014

1 commit


09 Sep, 2014

1 commit

  • mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
    Use MACH_KIRKWOOD which will be set when kirkwood is built as part of
    mach-mvebu.

    Signed-off-by: Andrew Lunn
    Acked-by: Bryan Wu
    Cc: Richard Purdie
    Cc: linux-leds@vger.kernel.org
    Link: https://lkml.kernel.org/r/1409417172-6846-5-git-send-email-andrew@lunn.ch
    Signed-off-by: Jason Cooper

    Andrew Lunn
     

03 Sep, 2014

1 commit

  • This reverts commit 8b37e1bef5a6b60e949e28a4db3006e4b00bd758.

    It's broken as it changes led_blink_set() in a way that it can now sleep
    (while synchronously waiting for workqueue to be cancelled). That's a
    problem, because it's possible that this function gets called from atomic
    context (tpt_trig_timer() takes a readlock and thus disables preemption).

    This has been brought up 3 weeks ago already [1] but no proper fix has
    materialized, and I keep seeing the problem since 3.17-rc1.

    [1] https://lkml.org/lkml/2014/8/16/128

    BUG: sleeping function called from invalid context at kernel/workqueue.c:2650
    in_atomic(): 1, irqs_disabled(): 0, pid: 2335, name: wpa_supplicant
    5 locks held by wpa_supplicant/2335:
    #0: (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x12/0x20
    #1: (&wdev->mtx){+.+.+.}, at: [] cfg80211_mgd_wext_siwessid+0x5c/0x180 [cfg80211]
    #2: (&local->mtx){+.+.+.}, at: [] ieee80211_prep_connection+0x17a/0x9a0 [mac80211]
    #3: (&local->chanctx_mtx){+.+.+.}, at: [] ieee80211_vif_use_channel+0x5d/0x2a0 [mac80211]
    #4: (&trig->leddev_list_lock){.+.+..}, at: [] tpt_trig_timer+0xec/0x170 [mac80211]
    CPU: 0 PID: 2335 Comm: wpa_supplicant Not tainted 3.17.0-rc3 #1
    Hardware name: LENOVO 7470BN2/7470BN2, BIOS 6DET38WW (2.02 ) 12/19/2008
    ffff8800360b5a50 ffff8800751f76d8 ffffffff8159e97f ffff8800360b5a30
    ffff8800751f76e8 ffffffff810739a5 ffff8800751f77b0 ffffffff8106862f
    ffffffff810685d0 0aa2209200000000 ffff880000000004 ffff8800361c59d0
    Call Trace:
    [] dump_stack+0x4d/0x66
    [] __might_sleep+0xe5/0x120
    [] flush_work+0x5f/0x270
    [] ? mod_delayed_work_on+0x80/0x80
    [] ? mark_held_locks+0x6a/0x90
    [] ? __cancel_work_timer+0x6f/0x100
    [] ? trace_hardirqs_on_caller+0xfd/0x1c0
    [] __cancel_work_timer+0x7b/0x100
    [] cancel_delayed_work_sync+0xe/0x10
    [] led_blink_set+0x1b/0x40
    [] tpt_trig_timer+0x110/0x170 [mac80211]
    [] ieee80211_mod_tpt_led_trig+0x9d/0x160 [mac80211]
    [] __ieee80211_recalc_idle+0x98/0x140 [mac80211]
    [] ieee80211_idle_off+0xe/0x10 [mac80211]
    [] ieee80211_add_chanctx+0x3b/0x220 [mac80211]
    [] ieee80211_new_chanctx+0x44/0xf0 [mac80211]
    [] ieee80211_vif_use_channel+0x1fa/0x2a0 [mac80211]
    [] ieee80211_prep_connection+0x188/0x9a0 [mac80211]
    [] ieee80211_mgd_auth+0x256/0x2e0 [mac80211]
    [] ieee80211_auth+0x13/0x20 [mac80211]
    [] cfg80211_mlme_auth+0x106/0x270 [cfg80211]
    [] cfg80211_conn_do_work+0x155/0x3b0 [cfg80211]
    [] cfg80211_connect+0x3f0/0x540 [cfg80211]
    [] cfg80211_mgd_wext_connect+0x158/0x1f0 [cfg80211]
    [] cfg80211_mgd_wext_siwessid+0xde/0x180 [cfg80211]
    [] ? cfg80211_wext_giwessid+0x50/0x50 [cfg80211]
    [] cfg80211_wext_siwessid+0x1d/0x40 [cfg80211]
    [] ioctl_standard_iw_point+0x14c/0x3e0
    [] ? trace_hardirqs_on_caller+0xfd/0x1c0
    [] ioctl_standard_call+0x8a/0xd0
    [] ? ioctl_standard_iw_point+0x3e0/0x3e0
    [] wireless_process_ioctl.constprop.10+0xb6/0x100
    [] wext_handle_ioctl+0x5d/0xb0
    [] dev_ioctl+0x329/0x620
    [] ? trace_hardirqs_on_caller+0xfd/0x1c0
    [] sock_ioctl+0x142/0x2e0
    [] do_vfs_ioctl+0x300/0x520
    [] ? sysret_check+0x1b/0x56
    [] ? trace_hardirqs_on_caller+0xfd/0x1c0
    [] SyS_ioctl+0x81/0xa0
    [] system_call_fastpath+0x1a/0x1f
    wlan0: send auth to 00:0b:6b:3c:8c:e4 (try 1/3)
    wlan0: authenticated
    wlan0: associate with 00:0b:6b:3c:8c:e4 (try 1/3)
    wlan0: RX AssocResp from 00:0b:6b:3c:8c:e4 (capab=0x431 status=0 aid=2)
    wlan0: associated
    IPv6: ADDRCONF(NETDEV_CHANGE): wlan0: link becomes ready
    cfg80211: Calling CRDA for country: NA
    wlan0: Limiting TX power to 27 (27 - 0) dBm as advertised by 00:0b:6b:3c:8c:e4

    =================================
    [ INFO: inconsistent lock state ]
    3.17.0-rc3 #1 Not tainted
    ---------------------------------
    inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
    swapper/0/0 [HC0[0]:SC1[1]:HE1:SE0] takes:
    ((&(&led_cdev->blink_work)->work)){+.?...}, at: [] flush_work+0x0/0x270
    {SOFTIRQ-ON-W} state was registered at:
    [] __lock_acquire+0x30e/0x1a30
    [] lock_acquire+0x91/0x110
    [] flush_work+0x38/0x270
    [] __cancel_work_timer+0x7b/0x100
    [] cancel_delayed_work_sync+0xe/0x10
    [] led_blink_set+0x1b/0x40
    [] tpt_trig_timer+0x110/0x170 [mac80211]
    [] ieee80211_mod_tpt_led_trig+0x9d/0x160 [mac80211]
    [] __ieee80211_recalc_idle+0x98/0x140 [mac80211]
    [] ieee80211_idle_off+0xe/0x10 [mac80211]
    [] ieee80211_add_chanctx+0x3b/0x220 [mac80211]
    [] ieee80211_new_chanctx+0x44/0xf0 [mac80211]
    [] ieee80211_vif_use_channel+0x1fa/0x2a0 [mac80211]
    [] ieee80211_prep_connection+0x188/0x9a0 [mac80211]
    [] ieee80211_mgd_auth+0x256/0x2e0 [mac80211]
    [] ieee80211_auth+0x13/0x20 [mac80211]
    [] cfg80211_mlme_auth+0x106/0x270 [cfg80211]
    [] cfg80211_conn_do_work+0x155/0x3b0 [cfg80211]
    [] cfg80211_connect+0x3f0/0x540 [cfg80211]
    [] cfg80211_mgd_wext_connect+0x158/0x1f0 [cfg80211]
    [] cfg80211_mgd_wext_siwessid+0xde/0x180 [cfg80211]
    [] cfg80211_wext_siwessid+0x1d/0x40 [cfg80211]
    [] ioctl_standard_iw_point+0x14c/0x3e0
    [] ioctl_standard_call+0x8a/0xd0
    [] wireless_process_ioctl.constprop.10+0xb6/0x100
    [] wext_handle_ioctl+0x5d/0xb0
    [] dev_ioctl+0x329/0x620
    [] sock_ioctl+0x142/0x2e0
    [] do_vfs_ioctl+0x300/0x520
    [] SyS_ioctl+0x81/0xa0
    [] system_call_fastpath+0x1a/0x1f
    irq event stamp: 493416
    hardirqs last enabled at (493416): [] __cancel_work_timer+0x6f/0x100
    hardirqs last disabled at (493415): [] try_to_grab_pending+0x1f/0x160
    softirqs last enabled at (493408): [] _local_bh_enable+0x1d/0x50
    softirqs last disabled at (493409): [] irq_exit+0xa5/0xb0

    other info that might help us debug this:
    Possible unsafe locking scenario:

    CPU0
    ----
    lock((&(&led_cdev->blink_work)->work));

    lock((&(&led_cdev->blink_work)->work));

    *** DEADLOCK ***

    2 locks held by swapper/0/0:
    #0: (((&tpt_trig->timer))){+.-...}, at: [] call_timer_fn+0x0/0x180
    #1: (&trig->leddev_list_lock){.+.?..}, at: [] tpt_trig_timer+0xec/0x170 [mac80211]

    stack backtrace:
    CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.17.0-rc3 #1
    Hardware name: LENOVO 7470BN2/7470BN2, BIOS 6DET38WW (2.02 ) 12/19/2008
    ffffffff8246eb30 ffff88007c203b00 ffffffff8159e97f ffffffff81a194c0
    ffff88007c203b50 ffffffff81599c29 0000000000000001 ffffffff00000001
    ffff880000000000 0000000000000006 ffffffff81a194c0 ffffffff81093ad0
    Call Trace:
    [] dump_stack+0x4d/0x66
    [] print_usage_bug+0x1f4/0x205
    [] ? check_usage_backwards+0x140/0x140
    [] mark_lock+0x223/0x2b0
    [] __lock_acquire+0x2b0/0x1a30
    [] lock_acquire+0x91/0x110
    [] ? mod_delayed_work_on+0x80/0x80
    [] ? __ieee80211_get_rx_led_name+0x10/0x10 [mac80211]
    [] flush_work+0x38/0x270
    [] ? mod_delayed_work_on+0x80/0x80
    [] ? mark_held_locks+0x6a/0x90
    [] ? __cancel_work_timer+0x6f/0x100
    [] ? __ieee80211_get_rx_led_name+0x10/0x10 [mac80211]
    [] ? trace_hardirqs_on_caller+0xad/0x1c0
    [] ? __ieee80211_get_rx_led_name+0x10/0x10 [mac80211]
    [] __cancel_work_timer+0x7b/0x100
    [] cancel_delayed_work_sync+0xe/0x10
    [] led_blink_set+0x1b/0x40
    [] tpt_trig_timer+0x110/0x170 [mac80211]
    [] call_timer_fn+0x75/0x180
    [] ? process_timeout+0x10/0x10
    [] ? __ieee80211_get_rx_led_name+0x10/0x10 [mac80211]
    [] run_timer_softirq+0x1fc/0x2f0
    [] __do_softirq+0x115/0x2e0
    [] irq_exit+0xa5/0xb0
    [] do_IRQ+0x53/0xf0
    [] common_interrupt+0x6f/0x6f
    [] ? cpuidle_enter_state+0x6e/0x180
    [] cpuidle_enter+0x12/0x20
    [] cpu_startup_entry+0x330/0x360
    [] rest_init+0xc1/0xd0
    [] ? csum_partial_copy_generic+0x170/0x170
    [] start_kernel+0x44f/0x45a
    [] ? set_init_arg+0x53/0x53
    [] x86_64_start_reservations+0x2a/0x2c
    [] x86_64_start_kernel+0xf1/0xf4

    Cc: Vincent Donnefort
    Cc: Hugh Dickins
    Cc: Tejun Heo
    Signed-off-by: Jiri Kosina
    Signed-off-by: Bryan Wu

    Jiri Kosina
     

09 Aug, 2014

1 commit

  • Pull ARM SoC driver changes from Olof Johansson:
    "A handful of driver-related changes. We've had a bunch of them going
    in through other branches as well, so it's only a part of what we
    really have this release.

    Larger pieces are:

    - Removal of a now unused PWM driver for atmel
    [ This includes AVR32 changes that have been appropriately acked ]
    - Performance counter support for the arm CCN interconnect
    - OMAP mailbox driver cleanups and consolidation
    - PCI and SATA PHY drivers for SPEAr 13xx platforms
    - Redefinition (with backwards compatibility!) of PCI DT bindings for
    Tegra to better model regulators/power"

    Note: this merge also fixes up the semantic conflict with the new
    calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy:
    core: Let node ptr of PHY point to PHY and not of PHY provider") that
    came in through Greg's USB tree.

    Semantic merge patch by Stephen Rothwell through
    the next tree.

    * tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
    bus: arm-ccn: Fix error handling at event allocation
    mailbox/omap: add a parent structure for every IP instance
    mailbox/omap: remove the private mailbox structure
    mailbox/omap: consolidate OMAP mailbox driver
    mailbox/omap: simplify the fifo assignment by using macros
    mailbox/omap: remove omap_mbox_type_t from mailbox ops
    mailbox/omap: remove OMAP1 mailbox driver
    mailbox/omap: use devm_* interfaces
    bus: ARM CCN: add PERF_EVENTS dependency
    bus: ARM CCN PMU driver
    PCI: spear: Remove spear13xx_pcie_remove()
    PCI: spear: Fix Section mismatch compilation warning for probe()
    ARM: tegra: Remove legacy PCIe power supply properties
    PCI: tegra: Remove deprecated power supply properties
    PCI: tegra: Implement accurate power supply scheme
    ARM: SPEAr13xx: Update defconfigs
    ARM: SPEAr13xx: Add pcie and miphy DT nodes
    ARM: SPEAr13xx: Add bindings and dt node for misc block
    ARM: SPEAr13xx: Fix static mapping table
    phy: Add drivers for PCIe and SATA phy on SPEAr13xx
    ...

    Linus Torvalds
     

30 Jul, 2014

1 commit


24 Jul, 2014

1 commit


09 Jul, 2014

1 commit

  • The leds-atmel-pwm driver is now obsolete. It is not used by any mainlined
    boards and is replaced by the generic leds_pwm with the pwm-atmel driver using
    the generic PWM framework.

    Signed-off-by: Alexandre Belloni
    Acked-by: Bryan Wu
    Signed-off-by: Nicolas Ferre

    Alexandre Belloni
     

04 Jul, 2014

3 commits


28 Jun, 2014

2 commits


26 Jun, 2014

10 commits


13 Jun, 2014

1 commit

  • Pull LED updates from Bryan Wu:
    "I just found merge window is open and I'm quite busy and almost forget
    to send out this pull request. Thanks Russell and Alexandre ping me
    about this.

    So basically we got some clean up and leds-pwm fixing patches from
    Russell"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
    leds: Remove duplicated OOM message for individual driver
    drivers/leds: Replace __get_cpu_var use through this_cpu_ptr
    leds: lp55xx: add DT bindings for LP55231
    leds: 88pm860x: Fix missing refcount decrement for parent of_node
    leds: 88pm860x: Use of_get_child_by_name
    leds: leds-pwm: add DT support for LEDs wired to supply
    leds: leds-pwm: implement PWM inversion
    leds: leds-pwm: convert OF parsing code to use led_pwm_add()
    leds: leds-pwm: provide a common function to setup a single led-pwm device
    leds: pca9685: Remove leds-pca9685 driver
    dell-led: add mic mute led interface

    Linus Torvalds
     

12 Jun, 2014

1 commit

  • …ierry.reding/linux-pwm

    Pull pwm changes from Thierry Reding:
    "The majority of these changes are cleanups and fixes across all
    drivers. Redundant error messages are removed and more PWM
    controllers set the .can_sleep flag to signal that they can't be used
    in atomic context.

    Support is added for the Broadcom Kona family of SoCs and the Intel
    LPSS driver can now probe PCI devices in addition to ACPI devices.
    Upon shutdown, the pwm-backlight driver will now power off the
    backlight. It also uses the new descriptor-based GPIO API for more
    concise GPIO handling.

    A large chunk of these changes also converts platforms to use the
    lookup mechanism rather than relying on the global number space to
    reference PWM devices. This is largely in preparation for more
    unification and cleanups in future patches. Eventually it will allow
    the legacy PWM API to be removed"

    * tag 'pwm/for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (38 commits)
    pwm: fsl-ftm: set pwm_chip can_sleep flag
    pwm: ab8500: Fix wrong value shift for disable/enable PWM
    pwm: samsung: do not set manual update bit in pwm_samsung_config
    pwm: lp3943: Set pwm_chip can_sleep flag
    pwm: atmel: set pwm_chip can_sleep flag
    pwm: mxs: set pwm_chip can_sleep flag
    pwm: tiehrpwm: inline accessor functions
    pwm: tiehrpwm: don't build PM related functions when not needed
    pwm-backlight: retrieve configured PWM period
    leds: leds-pwm: retrieve configured PWM period
    ARM: pxa: hx4700: use PWM_LOOKUP to initialize struct pwm_lookup
    ARM: shmobile: armadillo: use PWM_LOOKUP to initialize struct pwm_lookup
    ARM: OMAP3: Beagle: use PWM_LOOKUP to initialize struct pwm_lookup
    pwm: modify PWM_LOOKUP to initialize all struct pwm_lookup members
    ARM: pxa: hx4700: initialize all the struct pwm_lookup members
    ARM: OMAP3: Beagle: initialize all the struct pwm_lookup members
    pwm: renesas-tpu: remove unused struct tpu_pwm_platform_data
    ARM: shmobile: armadillo: initialize all struct pwm_lookup members
    pwm: add period and polarity to struct pwm_lookup
    pwm: twl: Really disable twl6030 PWMs
    ...

    Linus Torvalds
     

04 Jun, 2014

2 commits

  • Pull HID patches from Jiri Kosina:
    - RMI driver for Synaptics touchpads, by Benjamin Tissoires, Andrew
    Duggan and Jiri Kosina
    - cleanup of hid-sony driver and improved support for Sixaxis and
    Dualshock 4, by Frank Praznik
    - other usual small fixes and support for new device IDs

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
    HID: thingm: thingm_fwinfo[] doesn't need to be global
    HID: core: add two new usages for digitizer
    HID: hid-sensor-hub: new device id and quirk for STM Sensor hub
    HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard
    HID: hid-sensor-hub: Set report quirk for Microsoft Surface
    HID: debug: add labels for HID Sensor Usages
    HID: uhid: Use kmemdup instead of kmalloc + memcpy
    HID: rmi: do not handle touchscreens through hid-rmi
    HID: quirk for Saitek RAT7 and MMO7 mices' mode button
    HID: core: fix validation of report id 0
    HID: rmi: fix masks for x and w_x data
    HID: rmi: fix wrong struct field name
    HID: rmi: do not fetch more than 16 bytes in a query
    HID: rmi: check for the existence of some optional queries before reading query 12
    HID: i2c-hid: hid report descriptor retrieval changes
    HID: add missing hid usages
    HID: hid-sony - allow 3rd party INTEC controller to turn off all leds
    HID: sony: Add blink support to the Sixaxis and DualShock 4 LEDs
    HID: sony: Initialize the controller LEDs with a device ID value
    HID: sony: Use the controller Bluetooth MAC address as the unique value in the battery name string
    ...

    Linus Torvalds
     
  • …6/thingm' into for-linus

    Jiri Kosina
     

21 May, 2014

1 commit


11 May, 2014

1 commit

  • I got a build error today, since LEDS_VERSATILE can be built-in while LEDS_CLASS
    is a module:

    drivers/built-in.o: In function `versatile_leds_probe':
    :(.text+0x155020): undefined reference to `led_classdev_register'

    I suggest we turn this option into 'tristate' so that the dependency
    tracking works correctly.

    Signed-off-by: Arnd Bergmann
    Acked-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Arnd Bergmann
     

08 May, 2014

5 commits