1. 14 Jul, 2016 2 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'extcon-next-for-4.8' of... · 7f96a82f
      Greg Kroah-Hartman authored
      Merge tag 'extcon-next-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing
      
      Chanwoo writes:
      
      Update
      extcot://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
      tags/extcon-next-for-4.8
      n for 4.8
      
      Detailed description for patchset:
      1. Update the extcon-gpio.c driver
      - Use PM wakeirq APIs and support to check the state of external connector
        when wake-up from suspend state if the interrupt of external connector is
        not used as wakeup source.
      - Support for ACPI gpio interface
      
      2. Remove deprecated extcon APIs using the legacy cable name
      - The extcon framework handle the external connector only by unique id
        instead of legacy cable name to prevent the problem.
      - Removed functions
        : extcon_get_cable_state()
        : extcon_set_cable_state()
        : extcon_register_interest()
        : extcon_unregister_interest()
      - It has the dependency on the axp288_charger.c driver.
        So, this pull request includes the 'ib-extcon-powersupply-4.8'
        immutable branch to protect the merge conflict.
      
      3. Support the resource-managed function for extcon_register_notifier
      - Add the devm_extcon_register/unregister_notifier() funticon to handle
        the resource automatically by resource managed functions and split out
        the resource-managed function from extcon core to seprate file(devres.c).
      
      4. Supprot the suspend/resume for extcon-adc-jack.c driver
      - Add the support the suspend/resume function to use extcon-adc-jack.c
        as wakeup source.
      
      5. Fix the minor issue
      - Check the return value of find_cable_index_by_id()
      - Move the struct extcon_cable to extcon core from header file
        because it should be only handled on extcon core.
      - Add the missing of_node_put() after calling of_parse_phandle()
        to decrement the reference count.
      7f96a82f
    • Greg Kroah-Hartman's avatar
      Merge tag 'lkdtm-next' of... · 2a7fbcec
      Greg Kroah-Hartman authored
      Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing
      
      Kees writes:
      
      refactoring for multiple source files and better layout
      2a7fbcec
  2. 07 Jul, 2016 12 commits
  3. 02 Jul, 2016 2 commits
  4. 30 Jun, 2016 1 commit
    • Arnd Bergmann's avatar
      extcon: link devres into core module · af61f961
      Arnd Bergmann authored
      Splitting the resource-managed functions into a separate module
      means that the extcon core now fails to build because the internal
      "extcon_dev_allocate" symbol is not exported:
      
      ERROR: extcon_dev_allocate [drivers/extcon/devres.ko] undefined!
      
      My guess is that the intention was not to have two separate
      modules (which could be fixed by adding an export, plus the
      normal MODULE_AUTHOR/MODULE_LICENSE/... fields), but have two
      source files in the same module.
      
      This fixes the Makefile accordingly, making the name of the
      module extcon_core.ko, which is created from building both
      extcon.c and devres.c.
      
      Fixes: b225d00f ("extcon: Split out the resource-managed functions from extcon core")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
      af61f961
  5. 29 Jun, 2016 1 commit
  6. 27 Jun, 2016 3 commits
  7. 25 Jun, 2016 7 commits
  8. 23 Jun, 2016 1 commit
  9. 21 Jun, 2016 6 commits
  10. 20 Jun, 2016 1 commit
  11. 19 Jun, 2016 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · c3695331
      Linus Torvalds authored
      Pull UDF fixes and a reiserfs fix from Jan Kara:
       "A couple of udf fixes (most notably a bug in parsing UDF partitions
        which led to inability to mount recent Windows installation media) and
        a reiserfs fix for handling kstrdup failure"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        reiserfs: check kstrdup failure
        udf: Use correct partition reference number for metadata
        udf: Use IS_ERR when loading metadata mirror file entry
        udf: Don't BUG on missing metadata partition descriptor
      c3695331
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma · 9af1f5d8
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "Some fixes has piled up, so time to send them upstream.
      
        These fixes include:
         - at_xdmac fixes for residue and other stuff
         - update MAINTAINERS for dma dt bindings
         - mv_xor fix for incorrect offset"
      
      * tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: mv_xor: Fix incorrect offset in dma_map_page()
        dmaengine: at_xdmac: double FIFO flush needed to compute residue
        dmaengine: at_xdmac: fix residue corruption
        dmaengine: at_xdmac: align descriptors on 64 bits
        MAINTAINERS: Add file patterns for dma device tree bindings
      9af1f5d8
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 049a40c0
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Another batch of fixes for ARM SoC platforms.  Most are smaller fixes.
      
        Two areas that are worth pointing out are:
      
         - OMAP had a handful of changes to voltage specs that caused a bit of
           churn, most of volume of change in this branch is due to this.
      
         - There are a couple of _rcuidle fixes from Paul that touch common
           code and came in through the OMAP tree since they were the ones who
           saw the problems.
      
       The rest is smaller changes across a handful of platforms"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
        ARM: dts: STi: stih407-family: Disable reserved-memory co-processor nodes
        ARM: dts: am437x-sk-evm: Reduce i2c0 bus speed for tps65218
        ARM: OMAP2+: timer: add probe for clocksources
        ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ
        memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
        arm: Use _rcuidle for smp_cross_call() tracepoints
        MAINTAINERS: Add myself as reviewer of ARM FSL/NXP
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_mem_ret
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_logic_ret
        ARM: OMAP: DRA7: powerdomain data: Set L3init and L4per to ON
        ARM: imx6ul: Fix Micrel PHY mask
        ARM: OMAP2+: Select OMAP_INTERCONNECT for SOC_AM43XX
        ARM: dts: DRA74x: fix DSS PLL2 addresses
        ARM: OMAP2: Enable Errata 430973 for OMAP3
        ARM: dts: socfpga: Add missing PHY phandle
        ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board
        ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board
        ARM: dts: sun6i: yones-toptech-bs1078-v2: Drop constraints on dc1sw regulator
        ARM: dts: sun6i: primo81: Drop constraints on dc1sw regulator
        ARM: dts: sunxi: Add OLinuXino Lime2 eMMC to the Makefile
        ...
      049a40c0
    • Olof Johansson's avatar
      Merge tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux into fixes · 8fd09767
      Olof Johansson authored
      OMAP-GPMC: Fixes for for v4.7-rc cycle:
      
      - Fix omap gpmc EXTRADELAY timing. The DT provided timings
      were wrongly used causing devices requiring extra delay timing
      to fail.
      
      * tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux:
        memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
        + Linux 4.7-rc3
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      8fd09767