ipq806x: clean up patches, port missing patches from 4.4

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.9 / 0068-spi-add-gpio-cs-support.patch

diff --git a/target/linux/ipq806x/patches-4.9/0068-spi-add-gpio-cs-support.patch b/target/linux/ipq806x/patches-4.9/0068-spi-add-gpio-cs-support.patch
new file mode 100644 (file)
index 0000000..0c03bc9
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.9/0068-spi-add-gpio-cs-support.patch
@@ -0,0 +1,71 @@
+From b9c998eb7735df8000cf48d77f9271823e8e73da Mon Sep 17 00:00:00 2001
+From: Ram Chandra Jangir <rjangi@codeaurora.org>
+Date: Thu, 9 Mar 2017 09:39:05 +0100
+Subject: [PATCH 68/69] spi: add gpio cs support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ drivers/spi/spi-qup.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+--- a/drivers/spi/spi-qup.c
++++ b/drivers/spi/spi-qup.c
+@@ -24,6 +24,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dma-mapping.h>
++#include <linux/gpio.h>
+ 
+ #define QUP_CONFIG                    0x0000
+ #define QUP_STATE                     0x0004
+@@ -1019,6 +1020,38 @@ err_tx:
+       return ret;
+ }
+ 
++static void spi_qup_set_cs(struct spi_device *spi, bool val)
++{
++      struct spi_qup *controller;
++      u32 spi_ioc;
++      u32 spi_ioc_orig;
++
++      controller = spi_master_get_devdata(spi->master);
++      spi_ioc = readl_relaxed(controller->base + SPI_IO_CONTROL);
++      spi_ioc_orig = spi_ioc;
++      if (!val)
++              spi_ioc |= SPI_IO_C_FORCE_CS;
++      else
++              spi_ioc &= ~SPI_IO_C_FORCE_CS;
++
++      if (spi_ioc != spi_ioc_orig)
++              writel_relaxed(spi_ioc, controller->base + SPI_IO_CONTROL);
++}
++
++static int spi_qup_setup(struct spi_device *spi)
++{
++      if (spi->cs_gpio >= 0) {
++              if (spi->mode & SPI_CS_HIGH)
++                      gpio_set_value(spi->cs_gpio, 0);
++              else
++                      gpio_set_value(spi->cs_gpio, 1);
++
++              udelay(10);
++      }
++
++      return 0;
++}
++
+ static int spi_qup_probe(struct platform_device *pdev)
+ {
+       struct spi_master *master;
+@@ -1115,6 +1148,11 @@ static int spi_qup_probe(struct platform
+       if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1"))
+               controller->qup_v1 = 1;
+ 
++      if (!controller->qup_v1)
++              master->set_cs = spi_qup_set_cs;
++      else
++              master->setup = spi_qup_setup;
++
+       spin_lock_init(&controller->lock);
+       init_completion(&controller->done);
+       init_completion(&controller->dma_tx_done);