[GIT PULL] spi fixes for v3.15
From: Mark Brown
Date: Fri Apr 11 2014 - 06:56:29 EST
The following changes since commit 455c6fdbd219161bd09b1165f11699d6d73de11c:
Linux 3.14 (2014-03-30 20:40:15 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-v3.15-fixes
for you to fetch changes up to 6eadd8463101830d50e381185701d58f4ac3abb9:
Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus (2014-04-10 23:39:52 +0100)
Same issue as on the regulator pull request with the entire diffstat for
the original pull request for this merge window has appeared - like I
say I will try to fix the scripts as it's annoying and unclear.
----------------------------------------------------------------
spi: Fixes for v3.15
A few driver specific fixes, the main one being the fix for handling of
complete callbacks that are open coded in individual drivers to allow
callers to omit the completion. As we move things into the core that
sort of issue should become less and less common.
----------------------------------------------------------------
Axel Lin (3):
spi: Always check complete callback before calling it
spi: omap2-mcspi: Convert to use devm_kcalloc
spi: efm32: Update binding document to make "efm32,location" property optional
Mark Brown (2):
Merge tag 'spi-v3.15' into spi-linus
Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus
Paul Bolle (1):
spi: qup: Depend on ARCH_QCOM
.../devicetree/bindings/spi/efm32-spi.txt | 14 +-
.../devicetree/bindings/spi/qcom,spi-qup.txt | 85 +++
Documentation/devicetree/bindings/spi/sh-hspi.txt | 28 +-
Documentation/devicetree/bindings/spi/sh-msiof.txt | 42 +-
.../devicetree/bindings/spi/spi-fsl-dspi.txt | 2 +
Documentation/devicetree/bindings/spi/spi-rspi.txt | 61 ++
.../devicetree/bindings/spi/spi-sun4i.txt | 24 +
.../devicetree/bindings/spi/spi-sun6i.txt | 24 +
.../devicetree/bindings/spi/spi-xtensa-xtfpga.txt | 9 +
Documentation/spi/spidev | 6 +
Documentation/spi/spidev_fdx.c | 8 +-
Documentation/spi/spidev_test.c | 45 +-
MAINTAINERS | 6 +
drivers/base/power/Makefile | 3 +-
drivers/base/power/runtime.c | 162 +++-
drivers/spi/Kconfig | 55 +-
drivers/spi/Makefile | 5 +-
drivers/spi/spi-altera.c | 7 +-
drivers/spi/spi-ath79.c | 1 -
drivers/spi/spi-atmel.c | 34 +-
drivers/spi/spi-au1550.c | 30 +-
drivers/spi/spi-bcm2835.c | 1 -
drivers/spi/spi-bcm63xx-hsspi.c | 8 +-
drivers/spi/spi-bcm63xx.c | 6 +-
drivers/spi/spi-bfin-sport.c | 1 -
drivers/spi/spi-bfin-v3.c | 3 +-
drivers/spi/spi-bfin5xx.c | 8 -
drivers/spi/spi-bitbang.c | 5 +-
drivers/spi/spi-butterfly.c | 3 +-
drivers/spi/spi-clps711x.c | 227 +++---
drivers/spi/spi-coldfire-qspi.c | 112 ++-
drivers/spi/spi-davinci.c | 14 +-
drivers/spi/spi-dw-mmio.c | 2 +-
drivers/spi/spi-dw.c | 17 +-
drivers/spi/spi-efm32.c | 46 +-
drivers/spi/spi-ep93xx.c | 21 +-
drivers/spi/spi-falcon.c | 5 -
drivers/spi/spi-fsl-dspi.c | 94 ++-
drivers/spi/spi-fsl-espi.c | 8 +-
drivers/spi/spi-fsl-lib.c | 14 +-
drivers/spi/spi-fsl-spi.c | 33 +-
drivers/spi/spi-gpio.c | 8 +-
drivers/spi/spi-imx.c | 7 +-
drivers/spi/spi-mpc512x-psc.c | 20 +-
drivers/spi/spi-mpc52xx-psc.c | 4 +-
drivers/spi/spi-mpc52xx.c | 23 +-
drivers/spi/spi-mxs.c | 7 +-
drivers/spi/spi-nuc900.c | 28 +-
drivers/spi/spi-oc-tiny.c | 3 -
drivers/spi/spi-octeon.c | 80 +-
drivers/spi/spi-omap-100k.c | 52 +-
drivers/spi/spi-omap-uwire.c | 34 +-
drivers/spi/spi-omap2-mcspi.c | 91 ++-
drivers/spi/spi-orion.c | 80 +-
drivers/spi/spi-pl022.c | 80 +-
drivers/spi/spi-ppc4xx.c | 1 -
drivers/spi/spi-pxa2xx-dma.c | 1 -
drivers/spi/spi-pxa2xx-pxadma.c | 1 -
drivers/spi/spi-pxa2xx.c | 3 +-
drivers/spi/spi-qup.c | 779 +++++++++++++++++++
drivers/spi/spi-rspi.c | 842 ++++++++++++++-------
drivers/spi/spi-s3c24xx.c | 19 +-
drivers/spi/spi-s3c64xx.c | 424 +++--------
drivers/spi/spi-sc18is602.c | 29 +-
drivers/spi/spi-sh-hspi.c | 43 +-
drivers/spi/spi-sh-msiof.c | 385 +++++-----
drivers/spi/spi-sh-sci.c | 8 +-
drivers/spi/spi-sh.c | 6 +-
drivers/spi/spi-sirf.c | 116 +--
drivers/spi/spi-sun4i.c | 478 ++++++++++++
drivers/spi/spi-sun6i.c | 484 ++++++++++++
drivers/spi/spi-tegra114.c | 27 +-
drivers/spi/spi-tegra20-sflash.c | 26 +-
drivers/spi/spi-tegra20-slink.c | 20 +-
drivers/spi/spi-ti-qspi.c | 5 +-
drivers/spi/spi-ti-ssp.c | 378 ---------
drivers/spi/spi-topcliff-pch.c | 47 +-
drivers/spi/spi-txx9.c | 28 +-
drivers/spi/spi-xcomm.c | 13 +-
drivers/spi/spi-xilinx.c | 27 +-
drivers/spi/spi-xtensa-xtfpga.c | 170 +++++
drivers/spi/spi.c | 247 +++++-
drivers/spi/spidev.c | 23 +-
include/linux/platform_data/spi-s3c64xx.h | 9 +-
include/linux/pm_runtime.h | 4 +
include/linux/spi/spi.h | 31 +
include/linux/spi/spi_bitbang.h | 2 +-
include/uapi/linux/spi/spidev.h | 14 +-
88 files changed, 4162 insertions(+), 2324 deletions(-)
create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
create mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt
create mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt
create mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt
create mode 100644 Documentation/devicetree/bindings/spi/spi-xtensa-xtfpga.txt
create mode 100644 drivers/spi/spi-qup.c
create mode 100644 drivers/spi/spi-sun4i.c
create mode 100644 drivers/spi/spi-sun6i.c
delete mode 100644 drivers/spi/spi-ti-ssp.c
create mode 100644 drivers/spi/spi-xtensa-xtfpga.c
Attachment:
signature.asc
Description: Digital signature