From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Sep 2017 18:40:38 +0000 (-0700)
Subject: Merge tag 'spi-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b88f55774f20c0c306e0a95d22ca9ab5f08187c7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'spi-v4.14' of git://git./linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "A fairly quiet release for the SPI subsystem:

   - Move to using IDR for allocating bus numbers

   - Modernisation of the ep93xx driver, removing a lot of open coding
     and using the framework more

   - The tools have been moved to use the standard tools build system
     and an install target added (there will be a fairly trivial
     conflict with tip resulting from the changes in the main tools
     Makefile)

   - A refactoring of the Qualcomm QUP driver which enables new variants
     to be supported

   - Explicit support for the Freescale i.MX53 and i.MX6 SPI, Renesas
     R-Car H3 and Rockchip RV1108 controllers"

* tag 'spi-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (71 commits)
  spi: spi-falcon: drop check of boot select
  spi: imx: fix use of native chip-selects with devicetree
  spi: pl022: constify amba_id
  spi: imx: fix little-endian build
  spi: omap: Allocate bus number from spi framework
  spi: Kernel coding style fixes
  spi: imx: dynamic burst length adjust for PIO mode
  spi: Pick spi bus number from Linux idr or spi alias
  spi: rockchip: configure CTRLR1 according to size and data frame
  spi: altera: Consolidate TX/RX data register access
  spi: altera: Switch to SPI core transfer queue management
  spi: rockchip: add compatible string for rv1108 spi
  spi: qup: fix 64-bit build warning
  spi: qup: hide warning for uninitialized variable
  spi: spi-ep93xx: use the default master transfer queueing mechanism
  spi: spi-ep93xx: remove private data 'current_msg'
  spi: spi-ep93xx: pass the spi_master pointer around
  spi: spi-ep93xx: absorb the interrupt enable/disable helpers
  spi: spi-ep93xx: add spi master prepare_transfer_hardware()
  spi: spi-ep93xx: use 32-bit read/write for all registers
  ...
---

b88f55774f20c0c306e0a95d22ca9ab5f08187c7
diff --cc tools/Makefile
index 658f8adcf896,616e7722b327..9dfede37c8ff
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -89,10 -90,10 +89,10 @@@ freefall: FORC
  kvm_stat: FORCE
  	$(call descend,kvm/$@)
  
 -all: acpi cgroup cpupower gpio hv firewire lguest liblockdep \
 +all: acpi cgroup cpupower gpio hv firewire liblockdep \
- 		perf selftests turbostat usb \
+ 		perf selftests spi turbostat usb \
  		virtio vm net x86_energy_perf_policy \
 -		tmon freefall objtool kvm_stat
 +		tmon freefall iio objtool kvm_stat
  
  acpi_install:
  	$(call descend,power/$(@:_install=),install)
@@@ -100,7 -101,7 +100,7 @@@
  cpupower_install:
  	$(call descend,power/$(@:_install=),install)
  
- cgroup_install firewire_install gpio_install hv_install iio_install perf_install usb_install virtio_install vm_install net_install objtool_install:
 -cgroup_install firewire_install gpio_install hv_install lguest_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:
++cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:
  	$(call descend,$(@:_install=),install)
  
  liblockdep_install: