diff options
author | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:21 +0100 |
commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/spi | |
parent | 318dacbd049b447a5b45290b39f1c889b9cbde4d (diff) | |
parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) | |
download | linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.bz2 linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-mt7621.c | 7 | ||||
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 7 | ||||
-rw-r--r-- | drivers/spi/spi-rockchip.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi-zynqmp-gqspi.c | 6 | ||||
-rw-r--r-- | drivers/spi/spidev.c | 2 |
5 files changed, 10 insertions, 13 deletions
diff --git a/drivers/spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c index ae836114ee3d..ff85982464d2 100644 --- a/drivers/spi/spi-mt7621.c +++ b/drivers/spi/spi-mt7621.c @@ -57,8 +57,6 @@ struct mt7621_spi { unsigned int speed; struct clk *clk; int pending_write; - - struct mt7621_spi_ops *ops; }; static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi) @@ -306,7 +304,7 @@ static int mt7621_spi_setup(struct spi_device *spi) if ((spi->max_speed_hz == 0) || (spi->max_speed_hz > (rs->sys_freq / 2))) - spi->max_speed_hz = (rs->sys_freq / 2); + spi->max_speed_hz = rs->sys_freq / 2; if (spi->max_speed_hz < (rs->sys_freq / 4097)) { dev_err(&spi->dev, "setup: requested speed is too low %d Hz\n", @@ -332,13 +330,11 @@ static int mt7621_spi_probe(struct platform_device *pdev) struct resource *r; int status = 0; struct clk *clk; - struct mt7621_spi_ops *ops; int ret; match = of_match_device(mt7621_spi_match, &pdev->dev); if (!match) return -EINVAL; - ops = (struct mt7621_spi_ops *)match->data; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_ioremap_resource(&pdev->dev, r); @@ -377,7 +373,6 @@ static int mt7621_spi_probe(struct platform_device *pdev) rs->clk = clk; rs->master = master; rs->sys_freq = clk_get_rate(rs->clk); - rs->ops = ops; rs->pending_write = 0; dev_info(&pdev->dev, "sys_freq: %u\n", rs->sys_freq); diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index e59c8b27b155..298a0bec29d1 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1498,12 +1498,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev) static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param) { - struct device *dev = param; - - if (dev != chan->device->dev->parent) - return false; - - return true; + return param == chan->device->dev; } #endif /* CONFIG_PCI */ diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 19f6a76f1c07..62affd7dc7c1 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -15,6 +15,7 @@ #include <linux/clk.h> #include <linux/dmaengine.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/of.h> #include <linux/pinctrl/consumer.h> diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 9f83e1b17aa1..9850a0efe85a 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/dmaengine.h> +#include <linux/firmware/xlnx-zynqmp.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> @@ -138,6 +139,7 @@ #define SPI_AUTOSUSPEND_TIMEOUT 3000 enum mode_type {GQSPI_MODE_IO, GQSPI_MODE_DMA}; +static const struct zynqmp_eemi_ops *eemi_ops; /** * struct zynqmp_qspi - Defines qspi driver instance @@ -1021,6 +1023,10 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) struct resource *res; struct device *dev = &pdev->dev; + eemi_ops = zynqmp_pm_get_eemi_ops(); + if (IS_ERR(eemi_ops)) + return PTR_ERR(eemi_ops); + master = spi_alloc_master(&pdev->dev, sizeof(*xqspi)); if (!master) return -ENOMEM; diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 70966e10be7e..ce9142d87f41 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -593,7 +593,7 @@ static int spidev_open(struct inode *inode, struct file *filp) spidev->users++; filp->private_data = spidev; - nonseekable_open(inode, filp); + stream_open(inode, filp); mutex_unlock(&device_list_lock); return 0; |