From: Linus Torvalds Date: Thu, 5 Nov 2015 21:15:12 +0000 (-0800) Subject: Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75f5db39ff14ed95056f2cca3ad98c3cae97170c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'spi-v4.4' of git://git./linux/kernel/git/broonie/spi 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 ... --- 75f5db39ff14ed95056f2cca3ad98c3cae97170c diff --cc drivers/iio/adc/max1027.c index 54a8302aaace,3bc059c69824..41d495c6035e --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c @@@ -508,8 -508,6 +508,7 @@@ static int max1027_remove(struct spi_de static struct spi_driver max1027_driver = { .driver = { .name = "max1027", + .of_match_table = of_match_ptr(max1027_adc_dt_ids), - .owner = THIS_MODULE, }, .probe = max1027_probe, .remove = max1027_remove, diff --cc drivers/iio/adc/mcp320x.c index 41a21e986c1a,d5d8b4180914..8569c8e1f4b2 --- a/drivers/iio/adc/mcp320x.c +++ b/drivers/iio/adc/mcp320x.c @@@ -404,8 -404,6 +404,7 @@@ MODULE_DEVICE_TABLE(spi, mcp320x_id) static struct spi_driver mcp320x_driver = { .driver = { .name = "mcp320x", + .of_match_table = of_match_ptr(mcp320x_dt_ids), - .owner = THIS_MODULE, }, .probe = mcp320x_probe, .remove = mcp320x_remove, diff --cc drivers/iio/adc/ti-adc128s052.c index 98c0d2b444bf,76b619649409..ff6f7f63c8d9 --- a/drivers/iio/adc/ti-adc128s052.c +++ b/drivers/iio/adc/ti-adc128s052.c @@@ -191,8 -184,6 +191,7 @@@ MODULE_DEVICE_TABLE(spi, adc128_id) static struct spi_driver adc128_driver = { .driver = { .name = "adc128s052", + .of_match_table = of_match_ptr(adc128_of_match), - .owner = THIS_MODULE, }, .probe = adc128_probe, .remove = adc128_remove, diff --cc drivers/iio/dac/ad7303.c index 18a4ad5ff8c5,399de2cfeb16..e690dd11e99f --- a/drivers/iio/dac/ad7303.c +++ b/drivers/iio/dac/ad7303.c @@@ -296,8 -290,6 +296,7 @@@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids static struct spi_driver ad7303_driver = { .driver = { .name = "ad7303", + .of_match_table = of_match_ptr(ad7303_spi_of_match), - .owner = THIS_MODULE, }, .probe = ad7303_probe, .remove = ad7303_remove, diff --cc drivers/iio/frequency/adf4350.c index 73f27e0a08dd,b83534cc2ab1..d2d824b446f5 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c @@@ -633,8 -625,6 +633,7 @@@ MODULE_DEVICE_TABLE(spi, adf4350_id) static struct spi_driver adf4350_driver = { .driver = { .name = "adf4350", + .of_match_table = of_match_ptr(adf4350_of_match), - .owner = THIS_MODULE, }, .probe = adf4350_probe, .remove = adf4350_remove, diff --cc drivers/iio/proximity/as3935.c index e95035136889,2865aa63f4f1..f4d29d5dbd5f --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c @@@ -449,8 -443,6 +449,7 @@@ MODULE_DEVICE_TABLE(spi, as3935_id) static struct spi_driver as3935_driver = { .driver = { .name = "as3935", + .of_match_table = of_match_ptr(as3935_of_match), - .owner = THIS_MODULE, .pm = AS3935_PM_OPS, }, .probe = as3935_probe, diff --cc drivers/net/ieee802154/mrf24j40.c index aca0fb3cccbf,e4c37d48add1..4cdf51638972 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@@ -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, diff --cc drivers/nfc/trf7970a.c index 123aa981c9d8,4036788c78b6..f857feb2b573 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d .id_table = trf7970a_id_table, .driver = { .name = "trf7970a", + .of_match_table = of_match_ptr(trf7970a_of_match), - .owner = THIS_MODULE, .pm = &trf7970a_pm_ops, }, }; diff --cc drivers/staging/iio/resolver/ad2s90.c index c57a29616223,cfeedfb7c774..5b1c0db33e7f --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@@ -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);