1. 03 Nov, 2015 33 commits
  2. 02 Nov, 2015 7 commits
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · e86328c4
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "Here is the bulk of GPIO changes for the v4.4 development cycle.
      
        The only changes hitting outside drivers/gpio are in the pin control
        subsystem and these seem to have settled nicely in linux-next.
      
        Development mistakes and catfights are nicely documented in the
        reverts as you can see.  The outcome of the ABI fight is that we're
        working on a chardev ABI for GPIO now, where hope to show results for
        the v4.5 kernel.
      
        Summary of changes:
      
        GPIO core:
         - Define and handle flags for open drain/open collector and open
           source/open emitter, also know as "single-ended" configurations.
         - Generic request/free operations that handle calling out to the
           (optional) pin control backend.
         - Some refactoring related to an ABI change that did not happen, yet
           provide useful.
         - Added a real-time compliance checklist.  Many GPIO chips have
           irqchips, and need to think this over with the RT patches going
           upstream.
         - Restructure, fix and clean up Kconfig menus a bit.
      
        New drivers:
         - New driver for AMD Promony.
         - New driver for ACCES 104-IDIO-16, a port-mapped I/O card,
           ISA-style.  Very retro.
      
        Subdriver changes:
         - OMAP changes to handle real time requirements.
         - Handle trigger types for edge and level IRQs on PL061 properly.  As
           this hardware is very common it needs to set a proper example for
           others to follow.
         - Some container_of() cleanups.
         - Delete the unused MSM driver in favor of the driver that is
           embedded inside the pin control driver.
         - Cleanup of the ath79 GPIO driver used by many, many OpenWRT router
           targets.
         - A consolidated IT87xx driver replacing the earlier very specific
           IT8761e driver.
         - Handle the TI TCA9539 in the PCA953x driver.  Also handle ACPI
           devices in this subdriver.
         - Drop xilinx arch dependencies as these FPGAs seem to profilate over
           a few different architectures.  MIPS and ARM come to mind"
      
      * tag 'gpio-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (57 commits)
        gpio: fix up SPI submenu
        gpio: drop surplus I2C dependencies
        gpio: drop surplus X86 dependencies
        gpio: dt-bindings: document the official use of "ngpios"
        gpio: MAINTAINERS: Add an entry for the ATH79 GPIO driver
        gpio / ACPI: Allow shared GPIO event to be read via operation region
        gpio: group port-mapped I/O drivers in a menu
        gpio: Add ACCES 104-IDIO-16 driver maintainer entry
        gpio: zynq: Document interrupt-controller DT binding
        gpio: xilinx: Drop architecture dependencies
        gpio: generic: Revert to old error handling in bgpio_map
        gpio: add a real time compliance notes
        Revert "gpio: add a real time compliance checklist"
        gpio: Add GPIO support for the ACCES 104-IDIO-16
        gpio: driver for AMD Promontory
        gpio: xlp: Convert to use gpiolib irqchip helpers
        gpio: add a real time compliance checklist
        gpio/xilinx: enable for MIPS
        gpiolib: Add and use OF_GPIO_SINGLE_ENDED flag
        gpiolib: Split GPIO flags parsing and GPIO configuration
        ...
      e86328c4
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · bc9d8c20
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "This is the big bulk of pin control changes for the v4.4 kernel
        development cycle.  Development pace is high in pin control again this
        merge window.  28 contributors, 83 patches.
      
        It hits a few sites outside the pin control subsystem:
      
         - Device tree bindings in Documentation (as usual)
         - MAINTAINERS
         - drivers/base/* for the "init" state handling by Doug Anderson.
           This has been ACKed by Greg.
         - drivers/usb/renesas_usbhs/rcar2.c, for a dependent Renesas change
           in the USB subsystem.  This has been ACKed by both Greg and Felipe.
         - arch/arm/boot/dts/sama5d2.dtsi - this should ideally have gone
           through the ARM SoC tree but ended up here.
      
        This time I am using Geert Uytterhoeven as submaintainer for SH PFC
        since the are three-four people working in parallel with new Renesas
        ASICs.
      
        Summary of changes:
      
        Infrastructure:
      
         - Doug Anderson wrote a patch adding an "init" state different from
           the "default" state for pin control state handling in the core
           framework.  This is applied before the driver's probe() call if
           defined and takes precedence over "default".  If both are defined,
           "init" will be applied *before* probe() and "default" will be
           applied *after* probe().
      
        Significant subdriver improvements:
      
         - SH PFC is switched to getting GPIO ranges from the device tree
           ranges property on DT platforms.
         - Got rid of CONFIG_ARCH_SHMOBILE_LEGACY, we are all modernized.
         - Got rid of SH PFC hardcoded IRQ numbers.
         - Allwinner sunxi external interrupt through the "r" controller.
         - Moved the Cygnus driver to use DT-provided GPIO ranges.
      
        New drivers:
      
         - Atmel PIO4 pin controller for the SAMA4D2 family
      
        New subdrivers:
      
         - Rockchip RK3036 subdriver
         - Renesas SH PFC R8A7795 subdriver
         - Allwinner sunxi A83T PIO subdriver
         - Freescale i.MX7d iomux lpsr subdriver
         - Marvell Berlin BG4CT subdriver
         - SiRF Atlas 7 step B SoC subdriver
         - Intel Broxton SoC subdriver
      
        Apart from this, the usual slew if syntactic and semantic fixes"
      
      * tag 'pinctrl-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (81 commits)
        pinctrl: pinconf: remove needless loop
        pinctrl: uniphier: guard uniphier directory with CONFIG_PINCTRL_UNIPHIER
        pinctrl: zynq: fix UTF-8 errors
        pinctrl: zynq: Initialize early
        pinctrl: at91: add missing of_node_put
        pinctrl: tegra-xusb: Correct lane mux options
        pinctrl: intel: Add Intel Broxton pin controller support
        pinctrl: intel: Allow requesting pins which are in ACPI mode as GPIOs
        pinctrl: intel: Add support for multiple GPIO chips sharing the interrupt
        drivers/pinctrl: Add the concept of an "init" state
        pinctrl: uniphier: set input-enable before pin-muxing
        pinctrl: cygnus: Add new compatible string for gpio controller driver
        pinctrl: cygnus: Remove GPIO to Pinctrl pin mapping from driver
        pinctrl: cygnus: Optional DT property to support pin mappings
        pinctrl: sunxi: Add irq pinmuxing to sun6i "r" pincontroller
        pinctrl: sunxi: Fix irq_of_xlate for the r_pio pinctrl block
        pinctrl: sh-pfc: Remove obsolete r8a7778 platform_device_id entry
        pinctrl: sh-pfc: Remove obsolete r8a7779 platform_device_id entry
        pinctrl: sh-pfc: Stop including <linux/platform_data/gpio-rcar.h>
        usb: renesas_usbhs: Remove unneeded #include <linux/platform_data/gpio-rcar.h>
        ...
      bc9d8c20
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 9ff3ca58
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "A bunch of fixes all over the place and some hw enablement this time.
      
         - Convert EDAC to debugfs wrappers and make drivers use those
           (Borislav Petkov)
      
         - L3 and SoC support for xgene_edac (Loc Ho)
      
         - AMD F15h, models 0x60-6f support to amd64_edac (Aravind
           Gopalakrishnan)
      
         - Fixes and cleanups all over the place"
      
      * tag 'edac_for_4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (22 commits)
        EDAC: Fix PAGES_TO_MiB macro misuse
        EDAC, altera: SoCFPGA EDAC should not look for ECC_CORR_EN
        EDAC: Use edac_debugfs_remove_recursive()
        EDAC, ppc4xx_edac: Fix module autoload for OF platform driver
        Documentation/EDAC: Add reference documents section for amd64_edac
        EDAC, amd64_edac: Update copyright and remove changelog
        EDAC, amd64_edac: Extend scrub rate support to F15hM60h
        EDAC: Don't allow empty DIMM labels
        EDAC: Fix sysfs dimm_label store operation
        EDAC: Fix sysfs dimm_label show operation
        arm64, EDAC: Add L3/SoC DT subnodes to the APM X-Gene SoC EDAC node
        EDAC, xgene: Add SoC support
        EDAC, xgene: Fix possible sprintf() overflow issue
        EDAC, xgene: Add L3 support
        EDAC, Documentation: Update X-Gene EDAC binding for L3/SoC subnodes
        EDAC, sb_edac: Fix TAD presence check for sbridge_mci_bind_devs()
        EDAC, ghes_edac: Remove redundant memory_type array
        EDAC, xgene: Convert to debugfs wrappers
        EDAC, i5100: Convert to debugfs wrappers
        EDAC, altera: Convert to debugfs wrappers
        ...
      9ff3ca58
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.4' of git://git.linaro.org/people/ulf.hansson/mmc · 17a13590
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add new API to set VCCQ voltage - mmc_regulator_set_vqmmc()
         - Add new ioctl to allow userspace to send multi commands
         - Wait for card busy signalling before starting SDIO requests
         - Remove MMC_CLKGATE
         - Enable tuning for DDR50 mode
         - Some code clean-up/improvements to mmc pwrseq
         - Use highest priority for eMMC restart handler
         - Add DT bindings for eMMC hardware reset support
         - Extend the mmc_send_tuning() API
         - Improve ios show for debugfs
         - A couple of code optimizations
      
        MMC host:
         - Some generic OF improvements
         - Various code clean-ups
         - sirf: Add support for DDR50
         - sunxi: Add support for card busy detection
         - mediatek: Use MMC_CAP_RUNTIME_RESUME
         - mediatek: Add support for eMMC HW-reset
         - mediatek: Add support for HS400
         - dw_mmc: Convert to use the new mmc_regulator_set_vqmmc() API
         - dw_mmc: Add external DMA interface support
         - dw_mmc: Some various improvements
         - dw_mmc-rockchip: MMC tuning with the clock phase framework
         - sdhci: Properly clear IRQs during resume
         - sdhci: Enable tuning for DDR50 mode
         - sdhci-of-esdhc: Use IRQ mode for card detection
         - sdhci-of-esdhc: Support both BE and LE host controller
         - sdhci-pci: Build o2micro support in the same module
         - sdhci-pci: Support for new Intel host controllers
         - sdhci-acpi: Support for new Intel host controllers"
      
      * tag 'mmc-v4.4' of git://git.linaro.org/people/ulf.hansson/mmc: (73 commits)
        mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode
        mmc: dw_mmc: fix the CardThreshold boundary at CardThrCtl register
        mmc: dw_mmc: NULL dereference in error message
        mmc: pwrseq: Use highest priority for eMMC restart handler
        mmc: mediatek: add HS400 support
        mmc: mmc: extend the mmc_send_tuning()
        mmc: mediatek: add implement of ops->hw_reset()
        mmc: mediatek: fix got GPD checksum error interrupt when data transfer
        mmc: mediatek: change the argument "ddr" to "timing"
        mmc: mediatek: make cmd_ints_mask to const
        mmc: dt-bindings: update Mediatek MMC bindings
        mmc: core: Add DT bindings for eMMC hardware reset support
        mmc: omap_hsmmc: Enable omap_hsmmc for Keystone 2
        mmc: sdhci-acpi: Add more ACPI HIDs for Intel controllers
        mmc: sdhci-pci: Add more PCI IDs for Intel controllers
        arm: lpc18xx_defconfig: remove CONFIG_MMC_DW_IDMAC
        arm: hisi_defconfig: remove CONFIG_MMC_DW_IDMAC
        arm: exynos_defconfig: remove CONFIG_MMC_DW_IDMAC
        arc: axs10x_defconfig: remove CONFIG_MMC_DW_IDMAC
        mips: pistachio_defconfig: remove CONFIG_MMC_DW_IDMAC
        ...
      17a13590
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.4' of... · 66b01996
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
       "New driver for MAX31790, added support for TMP75C, as well as cleanups
        and minor improvements in various drivers"
      
      * tag 'hwmon-for-linus-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (fam15h_power) Add max compute unit accumulated power
        hwmon: (fam15h_power) Enable power1_input on AMD Carrizo
        hwmon: (fam15h_power) Refactor attributes for dynamically added
        hwmon: (ina2xx) remove no longer used variable 'kind'
        hwmon: (nct6775) Introduce separate temperature labels for NCT6792 and NCT6793
        hwmon: (nct6775) NCT6791D and NCT6792D have an additional temperature source
        hwmon: (ina2xx) give precedence to DT over checking for platform data.
        hwmon: (ina2xx) convert driver to using regmap
        hwmon: (coretemp) Increase limit of maximum core ID from 32 to 128.
        hwmon: (lm75) Add support for TMP75C
        hwmon: (ibmpowernv) Add OF compatibility table entry
        hwmon: (abx500) drop the use of IRQF_NO_SUSPEND
        hwmon: (max31790) Fix dereference of ERR_PTR
        hwmon: Driver for Maxim MAX31790
      66b01996
    • Guenter Roeck's avatar
      cris: Drop reference to get_cmos_time() · 4247896f
      Guenter Roeck authored
      Function get_cmos_time() was removed with commit 657926a83df9 ("cris:
      time: Cleanup of persistent clock stuff"). The remaining reference to
      it may cause the following build error.
      
      arch/cris/kernel/built-in.o:(___ksymtab+get_cmos_time+0x0):
      	undefined reference to `get_cmos_time'
      Makefile:946: recipe for target 'vmlinux' failed
      
      Fixes: 657926a83df9 ("cris: time: Cleanup of persistent clock stuff")
      Cc: Xunlei Pang <pang.xunlei@linaro.org>
      Cc: Rabin Vincent <rabin@rab.in>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
      4247896f
    • Jesper Nilsson's avatar
      CRIS: Drop code related to obsolete or unused kconfigs · e301a08b
      Jesper Nilsson authored
      Drop all code related to Kconfigs that don't exist.
      Fix one Kconfig where it was actually typo:ed (ETRAX_KGB_PORT2)
      Drop content related to CRIS v32 SoCs from etraxgpio.h headerfile,
      all use of GPIO for both ETRAX FS and ARTPEC-3 should now be through
      standard gpiolib instead.
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      e301a08b