diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-03-04 09:40:44 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-03-04 09:40:44 +0000 |
commit | 0ad50b0bec02ae964b722eb865d79e80439e066c (patch) | |
tree | 6c20b702b14dd27f685f27b7e92ebe2e3f439fef /target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch | |
parent | c28cdfab314959cfaab46842c62ff86953135462 (diff) | |
download | master-31e0f0ae-0ad50b0bec02ae964b722eb865d79e80439e066c.tar.gz master-31e0f0ae-0ad50b0bec02ae964b722eb865d79e80439e066c.tar.bz2 master-31e0f0ae-0ad50b0bec02ae964b722eb865d79e80439e066c.zip |
ar71xx: use backported SPI patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35873
Diffstat (limited to 'target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch b/target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch new file mode 100644 index 0000000000..ee81ecd7fd --- /dev/null +++ b/target/linux/ar71xx/patches-3.8/004-spi-ath79-use-gpio_request_one.patch @@ -0,0 +1,59 @@ +From f0b166c931c9971f2ae9614881565d23f58b3178 Mon Sep 17 00:00:00 2001 +From: Gabor Juhos <juhosg@openwrt.org> +Date: Thu, 27 Dec 2012 10:42:27 +0100 +Subject: [PATCH] spi/ath79: use gpio_request_one + +commit 95d79419feffb326a3d5cb50e2248129dec06bb0 upstream. + +Use gpio_request_one() instead of multiple gpiolib calls. + +Signed-off-by: Gabor Juhos <juhosg@openwrt.org> +Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +--- + drivers/spi/spi-ath79.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 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) |