Skip to content
  1. Apr 25, 2016
    • Arnd Bergmann's avatar
      Merge tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt · 9744426e
      Arnd Bergmann authored
      Merge "Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski:
      
      1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards.
      2. Enable HDMI CEC on Exynos4412-based Odroid.
      3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4.
      4. Fix DTC unit name warnings.
      5. Merge topic branch of new Artik5 board.
      
      * tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
        ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos5440
        ARM: dts: exynos: Fix DTC unit name warnings in SMDK5420
        ARM: dts: exynos: Fix DTC unit name warnings in Peach Pit
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos542x
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos4x12
        ARM: dts: exynos: Fix DTC unit name warnings in Trats2 board
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos4
        ARM: dts: exynos: Fix DTC unit name warnings in Exynos3250
        ARM: dts: exynos: Fix DTC unit name warnings in cros-adc-thermistors
        ARM: dts: exynos: Add eMMC and SD regulator supplies to Odroid XU3/XU4
        ARM: dts: exynos: Enable the HDMI CEC device on Exynos4412 Odroid boards
        ARM: dts: exynos: Add node for the HDMI CEC device to exynos4
        ARM: dts: exynos: Add HDMI CEC pin definition to exynos4 pinctrl
        ARM: dts: exynos: Enable SSS on Odroid X/X2/U3 family
        ARM: dts: exynos: Enable SSS on Trats2
        ARM: dts: exynos: Add Security SubSystem node to Exynos4
      9744426e
    • Arnd Bergmann's avatar
      Merge tag 'samsung-dt-exynos3250-artik5-4.7' of... · 036f8d06
      Arnd Bergmann authored
      Merge tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
      
      Merge "Topic branch for Device Tree changes for Exynos 3250 for v4.7" from Krzysztof Kozlowski:
      
      Merge necessary new clocks from Sylwester (used by new board) and add support
      for Exynos3250-based Artik5 board.
      
      * tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
        ARM: dts: exynos: Add MSHC2 DT node for SD card for exynos3250-artik5-eval board
        ARM: dts: exynos: Add exynos3250-artik5 dtsi file for ARTIK5 module
        ARM: dts: exynos: Add MSHC2 DT node for Exynos3250 SoC
        ARM: dts: exynos: Add UART2 DT node for Exynos3250 SoC
        ARM: dts: exynos: Add initial gpio setting of MMC2 device for exynos3250-monk
        ARM: dts: exynos: Add initial pin configuration for exynos3250-rinato
        clk: samsung: exynos3250: Add MMC2 clock
        clk: samsung: exynos3250: Add UART2 clock
        dt-bindings: Add the clock id of UART2 and MMC2 for Exynos3250
      036f8d06
  2. Apr 14, 2016
    • Olof Johansson's avatar
      Merge tag 'v4.7-rockchip-dts32-1' of... · 8bd641ff
      Olof Johansson authored
      Merge tag 'v4.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      A lot display-controller nodes for DSI and the Analogix DP on rk3288
      as well as general display+hdmi support on rk3036. With the Analogix
      DP support, Veyron Chromeboks can now finally use their internal
      display.
      
      Other than this big improvement we have thermal support on the rk3228,
      a long time missing binding document for the General Register Files
      block, better operating points for Veyron devices and a bunch of fixes
      with parts stemming from warnings that new dtc version can generate.
      
      * tag 'v4.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip
      
      : (27 commits)
        ARM: dts: rockchip: move rk3036 memory definition to board files
        ARM: dts: rockchip: enable the eDP on rk3288 veyron devices
        ARM: dts: rockchip: simple panel and backlight supplies on veyron boards
        ARM: dts: rockchip: override edp hpd handling on veyron-pinky and speedy
        ARM: dts: rockchip: add rk3288-veyron-minnie backlight and panel settings
        ARM: dts: rockchip: add rk3288-veyron-jaq backlight and panel overrides
        ARM: dts: rockchip: add core rk3288-veyron backlight and panel nodes
        ARM: dts: rockchip: add startup delay to rk3288-veyron panel-regulators
        ARM: dts: rockchip: move edp-hpd pin definition into common location
        ARM: dts: rockchip: add rk3288 displayport controller node
        ARM: dts: rockchip: add rk3288 edp-phy node
        ARM: dts: rockchip: add missing unitname to cpu_leakage efuse
        ARM: dts: rockchip: drop unneeded properties from mipi node
        ARM: dts: rockchip: clean up gpio-keys nodes
        ARM: dts: rockchip: fix missing usbphy unit-names
        ARM: dts: rockchip: fix rk3288 power-domain unit names
        ARM: dts: rockchip: update rk3288-veyron cpu operating points
        ARM: dts: rockchip: remove broken-cd from emmc and sdio
        ARM: dts: rockchip: enable the tsadc for rk3228 evb
        ARM: dts: rockchip: add the thermal main info found on rk3228
        ...
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      8bd641ff
    • Olof Johansson's avatar
      Merge tag 'socfpga_dts_for_v4.7' of... · ed53ecbe
      Olof Johansson authored
      Merge tag 'socfpga_dts_for_v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
      
      SoCFPGA DTS updates for v4.7
      - Update SD/MMC node for Arria10
      - Update Arria10 with clock and interrupt fields for DMA
      - Remove 'phy-addr' from stmmac node
      - Remove ethernet node from Cyclone5 DTSI
      - Add LEDs/KEYs/SWs support on Sockit
      - Add L2 and OCRAM EDAC dts entries
      - Add reset control for USB
      
      * tag 'socfpga_dts_for_v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
      
      :
        ARM: dts: socfpga: add reset control for USB
        ARM: dts: socfpga: Add Altera Arria10 OCRAM EDAC devicetree entry
        ARM: dts: socfpga: Add Altera Arria10 L2 Cache EDAC devicetree entry
        ARM: dts: socfpga: Add support for HPS KEYs/SWs on SoCKit
        ARM: dts: socfpga: Add support for HPS LEDs on SoCKit
        ARM: dts: socfpga: Drop gmac0 from CV dtsi
        ARM: dts: socfpga: Drop phy-addr OF property from CV dtsi
        ARM: dts: socfpga: Add missing clock and interrupt fields for Arria10 DMA
        ARM: dts: socfpga: add the clk-phase property for sd/mmc clock
        ARM: dts: socfpga: add cap-sd-highspeed for SD/MMC node
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ed53ecbe
    • Olof Johansson's avatar
      Merge tag 'lpc18xx_dts_for_4.7' of https://github.com/manabian/linux-lpc into next/dt · 60cf1d99
      Olof Johansson authored
      Device Tree additions for LPC18xx platform
       - CREG clock controller
       - Real Time Clock (RTC)
       - Analog peripherals (ADC/DAC)
       - Warning fixes for the new dtc compiler
      
      With the CREG clock controller in place it is now possible
      to enable the internal RTC on LPC18xx/43xx platforms. The
      analog peripherals (ADC/DAC) has also been added here and
      enabled on both the EA4357 dev kit and Hitex eval board.
      
      In addition to the new entries there are a fixes for the
      DT warnings generated by the new dtc.
      
      * tag 'lpc18xx_dts_for_4.7' of https://github.com/manabian/linux-lpc
      
      :
        dt-bindings: phy-lpc18xx-usb-otg: remove unit address from binding
        ARM: dts: lpc4350-hitex-eval: fix unit name warnings from dtc
        ARM: dts: lpc4357-ea4357: fix unit name warnings from dtc
        ARM: dts: lpc18xx: remove unit addresses from creg childs
        ARM: dts: armv7-m: add unit name to interrupt-controller
        ARM: dts: lpc4350-hitex-eval: add adc1
        ARM: dts: lpc4357-ea4357: add dac
        ARM: dts: lpc4357-ea4357: add adc0
        ARM: dts: lpc18xx: add dac node
        ARM: dts: lpc18xx: add adc nodes
        ARM: dts: lpc18xx: add rtc node
        ARM: dts: lpc18xx: add creg-clk node
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      60cf1d99
    • Olof Johansson's avatar
      Merge tag 'versatile-dts-1' of... · 390dc69e
      Olof Johansson authored
      Merge tag 'versatile-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt
      
      Versatile DTS changes, baseline for the v4.7 series:
      - Add CLCD panel nodes to PB1176 and PB11MPCore
      - Add a DT binding blurb for the Versatile IB2 syscon
      - Add DTS files for the (QEMU supported) RealView EB
        boards in all variants.
      - Add DTS files for the (QEMU supported) RealView PBA8
        and PBX-A9 board variants.
      
      * tag 'versatile-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator
      
      :
        ARM: dts: realview: DT support for the PBA8 and PBX-A9
        ARM: dts: realview: support all the RealView EB board variants
        ARM: dts: realview: PB1176: define a standard VGA panel
        ARM: dts: realview: PB11MPCore: define a standard VGA panel
        Documentation/DT: add blurb for IB2 syscon to Versatile
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      390dc69e
    • Olof Johansson's avatar
      Merge tag 'renesas-cleanup-for-v4.7' of... · 16757cbc
      Olof Johansson authored
      Merge tag 'renesas-cleanup-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Renesas ARM Based SoC Cleanup for v4.7
      
      * Remove unnecessary clock-output-names properties from DT
      * Use generic pinctrl properties in DT
      
      * tag 'renesas-cleanup-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      : (26 commits)
        ARM: dts: sh73a0: Remove unnecessary clock-output-names properties
        ARM: dts: r8a73a4: Remove unnecessary clock-output-names properties
        ARM: dts: lager: Remove unnecessary clock-output-names properties
        ARM: dts: porter: Remove unnecessary clock-output-names properties
        ARM: dts: koelsch: Remove unnecessary clock-output-names properties
        ARM: dts: gose: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7794: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7793: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7791: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7779: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7778: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7740: Remove unnecessary clock-output-names properties
        ARM: dts: r7s72100: Remove unnecessary clock-output-names properties
        ARM: dts: r8a7790: Remove unnecessary clock-output-names properties
        ARM: dts: kzm9d: use generic pinctrl properties
        ARM: dts: kzm9g: use generic pinctrl properties
        ARM: dts: silk: use generic pinctrl properties
        ARM: dts: alt: use generic pinctrl properties
        ARM: dts: gose: use generic pinctrl properties
        ARM: dts: porter: use generic pinctrl properties
        ...
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      16757cbc
    • Olof Johansson's avatar
      Merge tag 'renesas-arm64-dt-for-v4.7' of... · e43b7bef
      Olof Johansson authored
      Merge tag 'renesas-arm64-dt-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Renesas ARM64 Based SoC DT Updates for v4.7
      
      * Use USB3.0 fallback compatibility string in DT for r8a7795 SoC
      * Add CAN support to DT for r8a7795 SoC
      
      * tag 'renesas-arm64-dt-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      :
        arm64: dts: r8a7795: Use USB3.0 fallback compatibility string
        arm64: dts: r8a7795: Add CAN support
        arm64: dts: r8a7795: Add CAN external clock support
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      e43b7bef
    • Olof Johansson's avatar
      Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt · 0bab7359
      Olof Johansson authored
      First DT batch for 4.7, additions for sama5d2 SoC:
      - chipid node to identify the SoC
      - SFR node (Special Function Registers)
      - LCD controller's node
      
      * tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91
      
      :
        ARM: dts: at91: sama5d2: add LCD controller
        ARM: dts: at91: sama5d2: add chipid node
        ARM: dts: at91: sama5d2: add SFR node
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0bab7359
  3. Apr 13, 2016
  4. Apr 12, 2016
  5. Apr 11, 2016
    • Linus Torvalds's avatar
      Linux 4.6-rc3 · bf162006
      Linus Torvalds authored
      bf162006
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 08b15d13
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A couple of small fixes, and wiring up the new syscalls which appeared
        during the merge window"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8550/1: protect idiv patching against undefined gcc behavior
        ARM: wire up preadv2 and pwritev2 syscalls
        ARM: SMP enable of cache maintanence broadcast
      08b15d13
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 2f422f94
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are a couple of mmc fixes intended for v4.6 rc3:
      
        MMC host:
         - sdhci: Fix regression setting power on Trats2 board
         - sdhci-pci: Add support and PCI IDs for more Broxton host controllers"
      
      * tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
        mmc: sdhci: Fix regression setting power on Trats2 board
      2f422f94
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 6a7c9243
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Some bugfixes from I2C:
      
         - fix a uevent triggered boot problem by removing a useless debug
           print
      
         - fix sysfs-attributes of the new i2c-demux-pinctrl driver to follow
           standard kernel behaviour
      
         - fix a potential division-by-zero error (needed two takes)"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: jz4780: really prevent potential division by zero
        Revert "i2c: jz4780: prevent potential division by zero"
        i2c: jz4780: prevent potential division by zero
        i2c: mux: demux-pinctrl: Update docs to new sysfs-attributes
        i2c: mux: demux-pinctrl: Clean up sysfs attributes
        i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE
      6a7c9243
    • Linus Torvalds's avatar
      Revert "ext4: allow readdir()'s of large empty directories to be interrupted" · 9f2394c9
      Linus Torvalds authored
      This reverts commit 1028b55b
      
      .
      
      It's broken: it makes ext4 return an error at an invalid point, causing
      the readdir wrappers to write the the position of the last successful
      directory entry into the position field, which means that the next
      readdir will now return that last successful entry _again_.
      
      You can only return fatal errors (that terminate the readdir directory
      walk) from within the filesystem readdir functions, the "normal" errors
      (that happen when the readdir buffer fills up, for example) happen in
      the iterorator where we know the position of the actual failing entry.
      
      I do have a very different patch that does the "signal_pending()"
      handling inside the iterator function where it is allowable, but while
      that one passes all the sanity checks, I screwed up something like four
      times while emailing it out, so I'm not going to commit it today.
      
      So my track record is not good enough, and the stars will have to align
      better before that one gets committed.  And it would be good to get some
      review too, of course, since celestial alignments are always an iffy
      debugging model.
      
      IOW, let's just revert the commit that caused the problem for now.
      
      Reported-by: default avatarGreg Thelen <gthelen@google.com>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9f2394c9
  6. Apr 10, 2016
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 5b5b7fd1
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "Since commit 0de79858 ("parisc: Use generic extable search and
        sort routines") module loading is boken on parisc, because the parisc
        module loader wasn't prepared for the new R_PARISC_PCREL32 relocations.
      
        In addition, due to that breakage, Mikulas Patocka noticed that
        handling exceptions from modules probably never worked on parisc.  It
        was just masked by the fact that exceptions from modules don't happen
        during normal use.
      
        This patch series fixes those issues and survives the tests of the
        lib/test_user_copy kernel module test.  Some patches are tagged for
        stable"
      
      * 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Update comment regarding relative extable support
        parisc: Unbreak handling exceptions from kernel modules
        parisc: Fix kernel crash with reversed copy_from_user()
        parisc: Avoid function pointers for kernel exception routines
        parisc: Handle R_PARISC_PCREL32 relocations in kernel modules
      5b5b7fd1
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 239467e8
      Linus Torvalds authored
      Pull libnvdimm fixes from Dan Williams:
       "Three fixes, the first two are tagged for -stable:
      
         - The ndctl utility/library gained expanded unit tests illuminating a
           long standing bug in the libnvdimm SMART data retrieval
           implementation.
      
           It has been broken since its initial implementation, now fixed.
      
         - Another one line fix for the detection of stale info blocks.
      
           Without this change userspace can get into a situation where it is
           unable to reconfigure a namespace.
      
         - Fix the badblock initialization path in the presence of the new (in
           v4.6-rc1) section alignment workarounds.
      
           Without this change badblocks will be reported at the wrong offset.
      
        These have received a build success report from the kbuild robot and
        have appeared in -next with no reported issues"
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment
        libnvdimm, pfn: fix uuid validation
        libnvdimm: fix smart data retrieval
      239467e8
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 289b7bfd
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "Here is a set of four GPIO fixes.  The two fixes to the core are
        serious as they are regressing minor architectures.
      
        Core fixes:
      
         - Defer GPIO device setup until after gpiolib is initialized.
      
           It turns out that a few very tightly integrated GPIO platform
           drivers initialize so early (befor core_initcall()) so that the
           gpiolib isn't even initialized itself.  That limits what the
           library can do, and we cannot reference uninitialized fields until
           later.
      
           Defer some of the initialization until right after the gpiolib is
           initialized in these (rare) cases.
      
         - As a consequence: do not use devm_* resources when allocating the
           states in the initial set-up of the gpiochip.
      
        Driver fixes:
      
         - In ACPI retrieveal: ignore GpioInt when looking for output GPIOs.
      
         - Fix legacy builds on the PXA without a backing pin controller.
      
         - Use correct datatype on pca953x register writes"
      
      * tag 'gpio-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: pca953x: Use correct u16 value for register word write
        gpiolib: Defer gpio device setup until after gpiolib initialization
        gpiolib: Do not use devm functions when registering gpio chip
        gpio: pxa: fix legacy non pinctrl aware builds
        gpio / ACPI: ignore GpioInt() GPIOs when requesting GPIO_OUT_*
      289b7bfd