Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 21:15:12 +0000 (13:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 21:15:12 +0000 (13:15 -0800)
Pull spi updates from Mark Brown:
 "Quite a lot of activity in SPI this cycle, almost all of it in drivers
  with a few minor improvements and tweaks in the core.

   - Updates to pxa2xx to support Intel Broxton and multiple chip selects.
   - Support for big endian in the bcm63xx driver.
   - Multiple slave support for the mt8173
   - New driver for the auxiliary SPI controller in bcm2835 SoCs.
   - Support for Layerscale SoCs in the Freescale DSPI driver"

* tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (87 commits)
  spi: pxa2xx: Rework self-initiated platform data creation for non-ACPI
  spi: pxa2xx: Add support for Intel Broxton
  spi: pxa2xx: Detect number of enabled Intel LPSS SPI chip select signals
  spi: pxa2xx: Add output control for multiple Intel LPSS chip selects
  spi: pxa2xx: Use LPSS prefix for defines that are Intel LPSS specific
  spi: Add DSPI support for layerscape family
  spi: ti-qspi: improve ->remove() callback
  spi/spi-xilinx: Fix race condition on last word read
  spi: Drop owner assignment from spi_drivers
  spi: Add THIS_MODULE to spi_driver in SPI core
  spi: Setup the master controller driver before setting the chipselect
  spi: dw: replace magic constant by DW_SPI_DR
  spi: mediatek: mt8173 spi multiple devices support
  spi: mediatek: handle controller_data in mtk_spi_setup
  spi: mediatek: remove mtk_spi_config
  spi: mediatek: Update document devicetree bindings to support multiple devices
  spi: fix kernel-doc warnings about missing return desc in spi.c
  spi: fix kernel-doc warnings about missing return desc in spi.h
  spi: pxa2xx: Align a few defines
  spi: pxa2xx: Save other reg_cs_ctrl bits when configuring chip select
  ...

35 files changed:
1  2 
drivers/iio/adc/max1027.c
drivers/iio/adc/mcp320x.c
drivers/iio/adc/ti-adc128s052.c
drivers/iio/amplifiers/ad8366.c
drivers/iio/dac/ad5504.c
drivers/iio/dac/ad7303.c
drivers/iio/frequency/adf4350.c
drivers/iio/proximity/as3935.c
drivers/media/i2c/s5c73m3/s5c73m3-spi.c
drivers/mmc/host/mmc_spi.c
drivers/net/ieee802154/at86rf230.c
drivers/net/ieee802154/mrf24j40.c
drivers/nfc/st-nci/spi.c
drivers/nfc/trf7970a.c
drivers/staging/fbtft/fbtft.h
drivers/staging/fbtft/flexfb.c
drivers/staging/iio/accel/lis3l02dq_core.c
drivers/staging/iio/accel/sca3000_core.c
drivers/staging/iio/adc/ad7192.c
drivers/staging/iio/adc/ad7280a.c
drivers/staging/iio/adc/ad7606_spi.c
drivers/staging/iio/adc/ad7780.c
drivers/staging/iio/adc/ad7816.c
drivers/staging/iio/frequency/ad9834.c
drivers/staging/iio/gyro/adis16060_core.c
drivers/staging/iio/magnetometer/hmc5843_spi.c
drivers/staging/iio/meter/ade7753.c
drivers/staging/iio/meter/ade7754.c
drivers/staging/iio/meter/ade7758_core.c
drivers/staging/iio/meter/ade7759.c
drivers/staging/iio/meter/ade7854-spi.c
drivers/staging/iio/resolver/ad2s1210.c
drivers/staging/iio/resolver/ad2s90.c
drivers/staging/mt29f_spinand/mt29f_spinand.c
drivers/tty/serial/sc16is7xx.c

index 54a8302aaacec518c46fb8d603b4da62e28d505d,3bc059c698241a46908c9b5047082f0262cdae26..41d495c6035e1a882e03b17ca8066224e767cde6
@@@ -508,8 -508,6 +508,7 @@@ static int max1027_remove(struct spi_de
  static struct spi_driver max1027_driver = {
        .driver = {
                .name   = "max1027",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(max1027_adc_dt_ids),
        },
        .probe          = max1027_probe,
        .remove         = max1027_remove,
index 41a21e986c1a326593a4864d53f2d33882342a98,d5d8b4180914d873a673072c5c377e68cd2e603e..8569c8e1f4b276db3e968356626c67fab9b60c16
@@@ -404,8 -404,6 +404,7 @@@ MODULE_DEVICE_TABLE(spi, mcp320x_id)
  static struct spi_driver mcp320x_driver = {
        .driver = {
                .name = "mcp320x",
-               .owner = THIS_MODULE,
 +              .of_match_table = of_match_ptr(mcp320x_dt_ids),
        },
        .probe = mcp320x_probe,
        .remove = mcp320x_remove,
index 98c0d2b444bff46048fac8c03979661f7a922a95,76b619649409a43329719e17668b851b427e3c84..ff6f7f63c8d9b8c2c7e758ce932912663b7fbc3f
@@@ -191,8 -184,6 +191,7 @@@ MODULE_DEVICE_TABLE(spi, adc128_id)
  static struct spi_driver adc128_driver = {
        .driver = {
                .name = "adc128s052",
-               .owner = THIS_MODULE,
 +              .of_match_table = of_match_ptr(adc128_of_match),
        },
        .probe = adc128_probe,
        .remove = adc128_remove,
Simple merge
Simple merge
index 18a4ad5ff8c50ccfb87bd4a31ce2ec6ca6dbe79d,399de2cfeb16b52c75180c88f8435e4102a53be5..e690dd11e99f64fa1270da8132010f34d94d7241
@@@ -296,8 -290,6 +296,7 @@@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids
  static struct spi_driver ad7303_driver = {
        .driver = {
                .name = "ad7303",
-               .owner = THIS_MODULE,
 +              .of_match_table = of_match_ptr(ad7303_spi_of_match),
        },
        .probe = ad7303_probe,
        .remove = ad7303_remove,
index 73f27e0a08dd3e1313a1160004aae56c1da246af,b83534cc2ab14bde5fb25819e9a6d854275f2895..d2d824b446f5242c09fe8bb9ac276ab8f2fe746f
@@@ -633,8 -625,6 +633,7 @@@ MODULE_DEVICE_TABLE(spi, adf4350_id)
  static struct spi_driver adf4350_driver = {
        .driver = {
                .name   = "adf4350",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(adf4350_of_match),
        },
        .probe          = adf4350_probe,
        .remove         = adf4350_remove,
index e95035136889342a88f398d33738fe67055e8c1b,2865aa63f4f1de9cf4900700663bbbf617c49e2c..f4d29d5dbd5f88d6e5edffef142e86db30076d44
@@@ -449,8 -443,6 +449,7 @@@ MODULE_DEVICE_TABLE(spi, as3935_id)
  static struct spi_driver as3935_driver = {
        .driver = {
                .name   = "as3935",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(as3935_of_match),
                .pm     = AS3935_PM_OPS,
        },
        .probe          = as3935_probe,
Simple merge
Simple merge
index aca0fb3cccbf5f294e689daae6722638356badab,e4c37d48add16a40c67c8cc36e7288054b7efa85..4cdf51638972095644204eebccf46c8c77421ef2
@@@ -1380,9 -811,7 +1380,8 @@@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids)
  
  static struct spi_driver mrf24j40_driver = {
        .driver = {
 +              .of_match_table = of_match_ptr(mrf24j40_of_match),
                .name = "mrf24j40",
-               .owner = THIS_MODULE,
        },
        .id_table = mrf24j40_ids,
        .probe = mrf24j40_probe,
Simple merge
index 123aa981c9d87844932b769cd3949ef6a1416a4c,4036788c78b6edda97d00e83240b77d82958d8c2..f857feb2b573e7bb98e008f44527ed762d82b7a8
@@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d
        .id_table       = trf7970a_id_table,
        .driver         = {
                .name   = "trf7970a",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(trf7970a_of_match),
                .pm     = &trf7970a_pm_ops,
        },
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c57a29616223ba54b8335691d6b122c7a6553f30,cfeedfb7c774e1177a546c370a2ff1747e9dd2cf..5b1c0db33e7f2dfe4ddbebdc48c117b01f146e5b
@@@ -100,9 -107,9 +100,8 @@@ MODULE_DEVICE_TABLE(spi, ad2s90_id)
  static struct spi_driver ad2s90_driver = {
        .driver = {
                .name = "ad2s90",
-               .owner = THIS_MODULE,
        },
        .probe = ad2s90_probe,
 -      .remove = ad2s90_remove,
        .id_table = ad2s90_id,
  };
  module_spi_driver(ad2s90_driver);
Simple merge