From 863e79f8d5544a8a884375d7e867f350fddca9b9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 Feb 2017 15:52:41 +0100 Subject: lantiq: add support for kernel 4.9 The following patches were dropped because they are already applied upstream: 0012-pinctrl-lantiq-fix-up-pinmux.patch 0013-MTD-lantiq-xway-fix-invalid-operator.patch 0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch 0015-MTD-lantiq-xway-remove-endless-loop.patch 0016-MTD-lantiq-xway-add-missing-write_buf-and-read_buf-t.patch 0017-MTD-xway-fix-nand-locking.patch 0044-pinctrl-lantiq-introduce-new-dedicated-devicetree-bi.patch 0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch 0046-pinctrl-lantiq-2-pins-have-the-wrong-mux-list.patch 0047-irq-fixes.patch 0047-mtd-plat-nand-pass-of-node.patch 0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch 0120-MIPS-lantiq-add-support-for-device-tree-file-from-bo.patch 0121-MIPS-lantiq-make-it-possible-to-build-in-no-device-t.patch 122-MIPS-store-the-appended-dtb-address-in-a-variable.patch The PHY driver was reduced to the code adding the LED configuration, the rest is already upstream: 0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch The SPI driver was replaced with the version pending for upstream inclusion: New driver: 0090-spi-add-transfer_status-callback.patch 0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch Old driver: 0100-spi-add-support-for-Lantiq-SPI-controller.patch Signed-off-by: Hauke Mehrtens --- .../0090-spi-add-transfer_status-callback.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch (limited to 'target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch') diff --git a/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch b/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch new file mode 100644 index 0000000000..de50e228b2 --- /dev/null +++ b/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch @@ -0,0 +1,42 @@ +--- a/drivers/spi/spi.c ++++ b/drivers/spi/spi.c +@@ -1013,6 +1013,20 @@ static int spi_transfer_one_message(stru + msecs_to_jiffies(ms)); + } + ++ if (master->transfer_status) { ++ ret = master->transfer_status(master, ms); ++ if (ret) { ++ SPI_STATISTICS_INCREMENT_FIELD(statm, ++ errors); ++ SPI_STATISTICS_INCREMENT_FIELD(stats, ++ errors); ++ dev_err(&msg->spi->dev, ++ "SPI transfer status: %d\n", ++ ret); ++ goto out; ++ } ++ } ++ + if (ms == 0) { + SPI_STATISTICS_INCREMENT_FIELD(statm, + timedout); +--- a/include/linux/spi/spi.h ++++ b/include/linux/spi/spi.h +@@ -370,6 +370,8 @@ static inline void spi_unregister_driver + * transfer_one_message are mutually exclusive; when both + * are set, the generic subsystem does not call your + * transfer_one callback. ++ * @transfer_status: This callback allows the driver to return an error code ++ * in case the scheduled single spi transfer failed. + * @handle_err: the subsystem calls the driver to handle an error that occurs + * in the generic implementation of transfer_one_message(). + * @unprepare_message: undo any work done by prepare_message(). +@@ -546,6 +548,7 @@ struct spi_master { + void (*set_cs)(struct spi_device *spi, bool enable); + int (*transfer_one)(struct spi_master *master, struct spi_device *spi, + struct spi_transfer *transfer); ++ int (*transfer_status)(struct spi_master *master, unsigned long timeout); + void (*handle_err)(struct spi_master *master, + struct spi_message *message); + -- cgit v1.2.3