[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1425655578-22400-2-git-send-email-iivanov@mm-sol.com>
Date: Fri, 6 Mar 2015 17:26:18 +0200
From: "Ivan T. Ivanov" <iivanov@...sol.com>
To: Mark Brown <broonie@...nel.org>
Cc: linux-spi@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org
Subject: [PATCH 2/2] spi: qup: Request CS GPIO's during probe
Ensure that driver is owner of the GPIO's used for CS signals.
Signed-off-by: Ivan T. Ivanov <iivanov@...sol.com>
---
drivers/spi/spi-qup.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 2b2c359..a07ba46 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -14,11 +14,13 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/err.h>
+#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/spi/spi.h>
@@ -499,7 +501,7 @@ static int spi_qup_probe(struct platform_device *pdev)
struct device *dev;
void __iomem *base;
u32 max_freq, iomode, num_cs;
- int ret, irq, size;
+ int ret, irq, size, cs, cs_gpio;
dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -556,6 +558,19 @@ static int spi_qup_probe(struct platform_device *pdev)
else
master->num_chipselect = num_cs;
+ for (cs = 0; cs < master->num_chipselect; cs++) {
+ cs_gpio = of_get_named_gpio(dev->of_node, "cs-gpios", cs);
+
+ if (!gpio_is_valid(cs_gpio))
+ continue;
+
+ ret = devm_gpio_request(&pdev->dev, cs_gpio, "spi-qup-cs");
+ if (ret) {
+ dev_err(&pdev->dev, "can't get cs gpios\n");
+ goto error;
+ }
+ }
+
master->bus_num = pdev->id;
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists