Merge remote-tracking branches 'spi/topic/rspi', 'spi/topic/sc18is602', 'spi/topic...

diff --combined MAINTAINERS
index 01bff8e,20bb1d0,20bb1d0,20bb1d0,67ccef9,20bb1d0..9eaff63
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -798,7 -798,6 -798,6 -798,6 -798,6 -798,6 +798,7 @@@@@@@ M:     Laura Abbott <labbott@redhat.com
      M:        Sumit Semwal <sumit.semwal@linaro.org>
      L:        devel@driverdev.osuosl.org
      S:        Supported
 +++++F:        Documentation/devicetree/bindings/staging/ion/
      F:        drivers/staging/android/ion
      F:        drivers/staging/android/uapi/ion.h
      F:        drivers/staging/android/uapi/ion_test.h
@@@@@@@ -882,15 -881,6 -881,6 -881,6 -881,6 -881,6 +882,15 @@@@@@@ S:   Supporte
      F:        drivers/gpu/drm/arc/
      F:        Documentation/devicetree/bindings/display/snps,arcpgu.txt
      
 +++++ARM ARCHITECTED TIMER DRIVER
 +++++M:        Mark Rutland <mark.rutland@arm.com>
 +++++M:        Marc Zyngier <marc.zyngier@arm.com>
 +++++L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +++++S:        Maintained
 +++++F:        arch/arm/include/asm/arch_timer.h
 +++++F:        arch/arm64/include/asm/arch_timer.h
 +++++F:        drivers/clocksource/arm_arch_timer.c
 +++++
      ARM HDLCD DRM DRIVER
      M:        Liviu Dudau <liviu.dudau@arm.com>
      S:        Supported
@@@@@@@ -1014,7 -1004,6 -1004,6 -1004,6 -1004,6 -1004,6 +1014,7 @@@@@@@ N:      meso
      ARM/Annapurna Labs ALPINE ARCHITECTURE
      M:        Tsahee Zidenberg <tsahee@annapurnalabs.com>
      M:        Antoine Tenart <antoine.tenart@free-electrons.com>
 +++++L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      S:        Maintained
      F:        arch/arm/mach-alpine/
      F:        arch/arm/boot/dts/alpine*
@@@@@@@ -1624,8 -1613,7 -1613,7 -1613,7 -1613,7 -1613,7 +1624,8 @@@@@@@ N:      rockchi
      
      ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
      M:        Kukjin Kim <kgene@kernel.org>
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
 +++++R:        Javier Martinez Canillas <javier@osg.samsung.com>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
      S:        Maintained
@@@@@@@ -1645,6 -1633,7 -1633,7 -1633,7 -1633,7 -1633,7 +1645,6 @@@@@@@ F:      drivers/*/*s3c64xx
      F:        drivers/*/*s5pv210*
      F:        drivers/memory/samsung/*
      F:        drivers/soc/samsung/*
 -----F:        drivers/spi/spi-s3c*
      F:        Documentation/arm/Samsung/
      F:        Documentation/devicetree/bindings/arm/samsung/
      F:        Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@@@@@ -1832,7 -1821,6 -1821,6 -1821,6 -1821,6 -1821,6 +1832,7 @@@@@@@ T:      git git://git.kernel.org/pub/scm/lin
      ARM/UNIPHIER ARCHITECTURE
      M:        Masahiro Yamada <yamada.masahiro@socionext.com>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +++++T:        git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
      S:        Maintained
      F:        arch/arm/boot/dts/uniphier*
      F:        arch/arm/include/asm/hardware/cache-uniphier.h
@@@@@@@ -2486,7 -2474,7 -2474,7 -2474,7 -2474,7 -2474,7 +2486,7 @@@@@@@ F:      include/net/bluetooth
      BONDING DRIVER
      M:        Jay Vosburgh <j.vosburgh@gmail.com>
      M:        Veaceslav Falico <vfalico@gmail.com>
 -----M:        Andy Gospodarek <gospo@cumulusnetworks.com>
 +++++M:        Andy Gospodarek <andy@greyhouse.net>
      L:        netdev@vger.kernel.org
      W:        http://sourceforge.net/projects/bonding/
      S:        Supported
@@@@@@@ -2501,7 -2489,7 -2489,7 -2489,7 -2489,7 -2489,7 +2501,7 @@@@@@@ S:      Supporte
      F:        kernel/bpf/
      
      BROADCOM B44 10/100 ETHERNET DRIVER
 -----M:        Gary Zambrano <zambrano@broadcom.com>
 +++++M:        Michael Chan <michael.chan@broadcom.com>
      L:        netdev@vger.kernel.org
      S:        Supported
      F:        drivers/net/ethernet/broadcom/b44.*
@@@@@@@ -3249,7 -3237,7 -3237,7 -3237,7 -3237,7 -3237,7 +3249,7 @@@@@@@ F:      kernel/cpuset.
      CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
      M:        Johannes Weiner <hannes@cmpxchg.org>
      M:        Michal Hocko <mhocko@kernel.org>
 -----M:        Vladimir Davydov <vdavydov@virtuozzo.com>
 +++++M:        Vladimir Davydov <vdavydov.dev@gmail.com>
      L:        cgroups@vger.kernel.org
      L:        linux-mm@kvack.org
      S:        Maintained
@@@@@@@ -3270,7 -3258,7 -3258,7 -3258,7 -3258,7 -3258,7 +3270,7 @@@@@@@ S:      Maintaine
      F:        drivers/net/wan/cosa*
      
      CPMAC ETHERNET DRIVER
 -----M:        Florian Fainelli <florian@openwrt.org>
 +++++M:        Florian Fainelli <f.fainelli@gmail.com>
      L:        netdev@vger.kernel.org
      S:        Maintained
      F:        drivers/net/ethernet/ti/cpmac.c
@@@@@@@ -4536,12 -4524,6 -4524,6 -4524,6 -4524,6 -4524,6 +4536,12 @@@@@@@ L:    linux-edac@vger.kernel.or
      S:        Maintained
      F:        drivers/edac/sb_edac.c
      
 +++++EDAC-SKYLAKE
 +++++M:        Tony Luck <tony.luck@intel.com>
 +++++L:        linux-edac@vger.kernel.org
 +++++S:        Maintained
 +++++F:        drivers/edac/skx_edac.c
 +++++
      EDAC-XGENE
      APPLIED MICRO (APM) X-GENE SOC EDAC
      M:     Loc Ho <lho@apm.com>
@@@@@@@ -6103,7 -6085,7 -6085,7 -6085,7 -6085,7 -6085,7 +6103,7 @@@@@@@ S:      Supporte
      F:        drivers/cpufreq/intel_pstate.c
      
      INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -----M:        Maik Broemme <mbroemme@plusserver.de>
 +++++M:        Maik Broemme <mbroemme@libmpq.org>
      L:        linux-fbdev@vger.kernel.org
      S:        Maintained
      F:        Documentation/fb/intelfb.txt
@@@@@@@ -7466,8 -7448,7 -7448,7 -7448,7 -7448,7 -7448,7 +7466,8 @@@@@@@ F:      Documentation/devicetree/bindings/so
      F:        sound/soc/codecs/max9860.*
      
      MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
 +++++M:        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      L:        linux-pm@vger.kernel.org
      S:        Supported
      F:        drivers/power/max14577_charger.c
@@@@@@@ -7483,8 -7464,7 -7464,7 -7464,7 -7464,7 -7464,7 +7483,8 @@@@@@@ F:      include/dt-bindings/*/*max77802.
      
      MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
      M:        Chanwoo Choi <cw00.choi@samsung.com>
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
 +++++M:        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      L:        linux-kernel@vger.kernel.org
      S:        Supported
      F:        drivers/*/max14577*.c
@@@@@@@ -7674,7 -7654,7 -7654,7 -7654,7 -7654,7 -7654,7 +7674,7 @@@@@@@ L:      linux-rdma@vger.kernel.or
      S:        Supported
      W:        https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
      Q:        http://patchwork.kernel.org/project/linux-rdma/list/
 -----F:        drivers/infiniband/hw/rxe/
 +++++F:        drivers/infiniband/sw/rxe/
      F:        include/uapi/rdma/rdma_user_rxe.h
      
      MEMBARRIER SUPPORT
@@@@@@@ -8161,15 -8141,6 -8141,6 -8141,6 -8141,6 -8141,6 +8161,15 @@@@@@@ S:    Maintaine
      W:        https://fedorahosted.org/dropwatch/
      F:        net/core/drop_monitor.c
      
 +++++NETWORKING [DSA]
 +++++M:        Andrew Lunn <andrew@lunn.ch>
 +++++M:        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +++++M:        Florian Fainelli <f.fainelli@gmail.com>
 +++++S:        Maintained
 +++++F:        net/dsa/
 +++++F:        include/net/dsa.h
 +++++F:        drivers/net/dsa/
 +++++
      NETWORKING [GENERAL]
      M:        "David S. Miller" <davem@davemloft.net>
      L:        netdev@vger.kernel.org
@@@@@@@ -9259,7 -9230,7 -9230,7 -9230,7 -9230,7 -9230,7 +9259,7 @@@@@@@ F:      drivers/pinctrl/sh-pfc
      
      PIN CONTROLLER - SAMSUNG
      M:        Tomasz Figa <tomasz.figa@gmail.com>
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
      M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@@@@@@ -10192,7 -10163,7 -10163,7 -10163,7 -10163,7 -10163,7 +10192,7 @@@@@@@ S:       Maintaine
      F:        drivers/platform/x86/samsung-laptop.c
      
      SAMSUNG AUDIO (ASoC) DRIVERS
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
      M:        Sangbeom Kim <sbkim73@samsung.com>
      M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
      L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@@@@@ -10207,8 -10178,7 -10178,7 -10178,7 -10178,7 -10178,7 +10207,8 @@@@@@@ F:       drivers/video/fbdev/s3c-fb.
      
      SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
      M:        Sangbeom Kim <sbkim73@samsung.com>
 -----M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
 +++++M:        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      L:        linux-kernel@vger.kernel.org
      L:        linux-samsung-soc@vger.kernel.org
      S:        Supported
@@@@@@@ -10267,17 -10237,6 -10237,6 -10237,6 -10237,6 -10237,6 +10267,17 @@@@@@@ S:     Supporte
      L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
      F:        drivers/clk/samsung/
      
 +++++SAMSUNG SPI DRIVERS
 +++++M:        Kukjin Kim <kgene@kernel.org>
 +++++M:        Krzysztof Kozlowski <krzk@kernel.org>
 +++++M:        Andi Shyti <andi.shyti@samsung.com>
 +++++L:        linux-spi@vger.kernel.org
 +++++L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +++++S:        Maintained
 +++++F:        Documentation/devicetree/bindings/spi/spi-samsung.txt
 +++++F:        drivers/spi/spi-s3c*
 +++++F:        include/linux/platform_data/spi-s3c64xx.h
 +++++
      SAMSUNG SXGBE DRIVERS
      M:        Byungho An <bh74.an@samsung.com>
      M:        Girish K S <ks.giri@samsung.com>
@@@@@@@ -11124,6 -11083,6 -11083,6 -11083,6 -11083,7 -11083,6 +11124,7 @@@@@@@ F:       Documentation/spi
      F:        drivers/spi/
      F:        include/linux/spi/
      F:        include/uapi/linux/spi/
++++ +F:        tools/spi/
      
      SPIDERNET NETWORK DRIVER for CELL
      M:        Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
@@@@@@@ -11257,8 -11216,12 -11216,12 -11216,12 -11217,12 -11216,12 +11258,8 @@@@@@@ S:  Odd Fixe
      F:        drivers/staging/vt665?/
      
      STAGING - WILC1000 WIFI DRIVER
 -----M:        Johnny Kim <johnny.kim@atmel.com>
 -----M:        Austin Shin <austin.shin@atmel.com>
 -----M:        Chris Park <chris.park@atmel.com>
 -----M:        Tony Cho <tony.cho@atmel.com>
 -----M:        Glen Lee <glen.lee@atmel.com>
 -----M:        Leo Kim <leo.kim@atmel.com>
 +++++M:        Aditya Shankar <aditya.shankar@microchip.com>
 +++++M:        Ganesh Krishna <ganesh.krishna@microchip.com>
      L:        linux-wireless@vger.kernel.org
      S:        Supported
      F:        drivers/staging/wilc1000/
@@@@@@@ -12578,7 -12541,7 -12541,7 -12541,7 -12542,7 -12541,7 +12579,7 @@@@@@@ F:       include/linux/if_*vlan.
      F:        net/8021q/
      
      VLYNQ BUS
 -----M:        Florian Fainelli <florian@openwrt.org>
 +++++M:        Florian Fainelli <f.fainelli@gmail.com>
      L:        openwrt-devel@lists.openwrt.org (subscribers-only)
      S:        Maintained
      F:        drivers/vlynq/vlynq.c

diff --combined drivers/spi/Kconfig
index a49343b,d6fb8d4,d6fb8d4,056e3ba,d6fb8d4,d6fb8d4..b799547
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -153,16 -153,6 -153,6 -153,6 -153,6 -153,6 +153,16 @@@@@@@ config SPI_BCM63XX_HSSP
          This enables support for the High Speed SPI controller present on
          newer Broadcom BCM63XX SoCs.
      
 +++++config SPI_BCM_QSPI
 +++++  tristate "Broadcom BSPI and MSPI controller support"
 +++++  depends on ARCH_BRCMSTB || ARCH_BCM || ARCH_BCM_IPROC || COMPILE_TEST
 +++++  default ARCH_BCM_IPROC
 +++++  help
 +++++    Enables support for the Broadcom SPI flash and MSPI controller.
 +++++    Select this option for any one of BRCMSTB, iProc NSP and NS2 SoCs
 +++++    based platforms. This driver works for both SPI master for spi-nor
 +++++    flash device as well as MSPI device.
 +++++
      config SPI_BITBANG
        tristate "Utilities for Bitbanging SPI masters"
        help
@@@@@@@ -295,13 -285,6 -285,6 -285,6 -285,6 -285,6 +295,13 @@@@@@@ config SPI_IM
          This enables using the Freescale i.MX SPI controllers in master
          mode.
      
 +++++config SPI_JCORE
 +++++  tristate "J-Core SPI Master"
 +++++  depends on OF && (SUPERH || COMPILE_TEST)
 +++++  help
 +++++    This enables support for the SPI master controller in the J-Core
 +++++    synthesizable, open source SoC.
 +++++
      config SPI_LM70_LLP
        tristate "Parallel port adapter for LM70 eval board (DEVELOPMENT)"
        depends on PARPORT
@@@@@@@ -566,7 -549,7 -549,7 -549,7 -549,7 -549,7 +566,7 @@@@@@@ config SPI_SC18IS60
      config SPI_SH_MSIOF
        tristate "SuperH MSIOF SPI controller"
        depends on HAVE_CLK && HAS_DMA
--- --  depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
+++ ++  depends on ARCH_SHMOBILE || ARCH_RENESAS || COMPILE_TEST
        help
          SPI driver for SuperH and SH Mobile MSIOF blocks.
      
@@@@@@@ -648,13 -631,6 -631,6 -631,6 -631,6 -631,6 +648,13 @@@@@@@ config SPI_TEGRA20_SLIN
        help
          SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface.
      
 +++++config SPI_THUNDERX
 +++++  tristate "Cavium ThunderX SPI controller"
 +++++  depends on PCI && 64BIT && (ARM64 || COMPILE_TEST)
 +++++  help
 +++++    SPI host driver for the hardware found on Cavium ThunderX
 +++++    SOCs.
 +++++
      config SPI_TOPCLIFF_PCH
        tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"
        depends on PCI && (X86_32 || MIPS || COMPILE_TEST)

diff --combined tools/spi/spidev_test.c
index f3825b6,8a73d81,8a73d81,8a73d81,1eaa4de,8a73d81..f046b77
--- 1/tools/spi/spidev_test.c
--- 2/tools/spi/spidev_test.c
--- 3/tools/spi/spidev_test.c
--- 4/tools/spi/spidev_test.c
--- 5/tools/spi/spidev_test.c
--- 6/tools/spi/spidev_test.c
+++ b/tools/spi/spidev_test.c
@@@@@@@ -19,6 -19,6 -19,6 -19,6 -19,7 -19,6 +19,7 @@@@@@@
      #include <getopt.h>
      #include <fcntl.h>
      #include <sys/ioctl.h>
++++ +#include <linux/ioctl.h>
      #include <sys/stat.h>
      #include <linux/types.h>
      #include <linux/spi/spidev.h>
@@@@@@@ -284,7 -284,7 -284,7 -284,7 -285,7 -284,7 +285,7 @@@@@@@ static void parse_opts(int argc, char *
      
      static void transfer_escaped_string(int fd, char *str)
      {
 -----  size_t size = strlen(str + 1);
 +++++  size_t size = strlen(str);
        uint8_t *tx;
        uint8_t *rx;