ar71xx: add initial support for 3.6

[openwrt.git] / target / linux / ar71xx / patches-3.6 / 203-spi-ath79-use-gpio_request_one.patch

diff --git a/target/linux/ar71xx/patches-3.6/203-spi-ath79-use-gpio_request_one.patch b/target/linux/ar71xx/patches-3.6/203-spi-ath79-use-gpio_request_one.patch
new file mode 100644 (file)
index 0000000..12559bc
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.6/203-spi-ath79-use-gpio_request_one.patch
@@ -0,0 +1,56 @@
+From 6bd876a46b977643f27d2cc63f49e1bc84b78134 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Mon, 9 Jan 2012 15:04:21 +0100
+Subject: [PATCH 31/34] spi/ath79: use gpio_request_one
+
+Use gpio_request_one() instead of multiple gpiolib calls.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/spi/spi-ath79.c |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+--- a/drivers/spi/spi-ath79.c
++++ b/drivers/spi/spi-ath79.c
+@@ -100,6 +100,7 @@ static int ath79_spi_setup_cs(struct spi
+ {
+       struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+       struct ath79_spi_controller_data *cdata;
++      int status;
+ 
+       cdata = spi->controller_data;
+       if (spi->chip_select && !cdata)
+@@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi
+       /* TODO: setup speed? */
+       ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
+ 
++      status = 0;
+       if (spi->chip_select) {
+-              int status = 0;
++              unsigned long flags;
+ 
+-              status = gpio_request(cdata->gpio, dev_name(&spi->dev));
+-              if (status)
+-                      return status;
+-
+-              status = gpio_direction_output(cdata->gpio,
+-                                             spi->mode & SPI_CS_HIGH);
+-              if (status) {
+-                      gpio_free(cdata->gpio);
+-                      return status;
+-              }
++              flags = GPIOF_DIR_OUT;
++              if (spi->mode & SPI_CS_HIGH)
++                      flags |= GPIOF_INIT_HIGH;
++              else
++                      flags |= GPIOF_INIT_LOW;
++
++              status = gpio_request_one(cdata->gpio, flags,
++                                        dev_name(&spi->dev));
+       }
+ 
+-      return 0;
++      return status;
+ }
+ 
+ static void ath79_spi_cleanup_cs(struct spi_device *spi)