aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-02-22 16:17:28 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-02-22 16:17:28 +0000
commitb7539ab109fc2cb9ab8ad7a2fa82f4a856e03df7 (patch)
treed08ef2b98ddaf8a19e750e5f8e6dcef4d7e93aa0
parent3e6c7ed4f2cc7bcaa3ef20eaa30185863fe6e379 (diff)
downloadupstream-b7539ab109fc2cb9ab8ad7a2fa82f4a856e03df7.tar.gz
upstream-b7539ab109fc2cb9ab8ad7a2fa82f4a856e03df7.tar.bz2
upstream-b7539ab109fc2cb9ab8ad7a2fa82f4a856e03df7.zip
ar71xx: spi-ath79: fix initial GPIO CS line setup
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 39695
-rw-r--r--target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch37
-rw-r--r--target/linux/ar71xx/patches-3.10/206-spi-ath79-make-chipselect-logic-more-flexible.patch4
2 files changed, 39 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch b/target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch
new file mode 100644
index 0000000000..46657940b8
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.10/200-spi-ath79-fix-initial-GPIO-CS-line-setup.patch
@@ -0,0 +1,37 @@
+From 3a7853f0dd24e81dc920c98a5c7e8cfdde81bb45 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Thu, 16 Jan 2014 16:58:58 +0100
+Subject: [PATCH] spi-ath79: fix initial GPIO CS line setup
+
+The 'ath79_spi_setup_cs' function initializes the chip
+select line of a given SPI device in order to make sure
+that the device is inactive.
+
+If the SPI_CS_HIGH bit is set for a given device, it
+means that the CS line of that device is active HIGH
+so it must be set to LOW initially. In case of GPIO
+CS lines, the 'ath79_spi_setup_cs' function does the
+opposite of that due to the wrong GPIO flags.
+
+Fix the code to use the correct GPIO flags.
+
+Reported-by: Ronald Wahl <ronald.wahl@raritan.com>
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/spi/spi-ath79.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/spi-ath79.c
++++ b/drivers/spi/spi-ath79.c
+@@ -132,9 +132,9 @@ static int ath79_spi_setup_cs(struct spi
+
+ flags = GPIOF_DIR_OUT;
+ if (spi->mode & SPI_CS_HIGH)
+- flags |= GPIOF_INIT_HIGH;
+- else
+ flags |= GPIOF_INIT_LOW;
++ else
++ flags |= GPIOF_INIT_HIGH;
+
+ status = gpio_request_one(cdata->gpio, flags,
+ dev_name(&spi->dev));
diff --git a/target/linux/ar71xx/patches-3.10/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.10/206-spi-ath79-make-chipselect-logic-more-flexible.patch
index 93df466fdf..b57dd5d5ba 100644
--- a/target/linux/ar71xx/patches-3.10/206-spi-ath79-make-chipselect-logic-more-flexible.patch
+++ b/target/linux/ar71xx/patches-3.10/206-spi-ath79-make-chipselect-logic-more-flexible.patch
@@ -236,9 +236,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ case ATH79_SPI_CS_TYPE_GPIO:
flags = GPIOF_DIR_OUT;
if (spi->mode & SPI_CS_HIGH)
- flags |= GPIOF_INIT_HIGH;
- else
flags |= GPIOF_INIT_LOW;
+ else
+ flags |= GPIOF_INIT_HIGH;
- status = gpio_request_one(cdata->gpio, flags,
+ status = gpio_request_one(cdata->cs_line, flags,