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

@@@ -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,
@@@ -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,
@@@ -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
@@@ -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,
@@@ -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,
@@@ -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
@@@ -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
@@@ -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
@@@ -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