mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 20:43:55 +02:00
414e59d258
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19358 3c298f89-4303-0410-b956-a3cf2f4a3e73
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From df07ed6a52d9f6027ff1753c00b3128fa18dde31 Mon Sep 17 00:00:00 2001
|
|
From: Lars-Peter Clausen <lars@metafoo.de>
|
|
Date: Mon, 11 Jan 2010 04:29:48 +0100
|
|
Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/400-spi-gpio-3wire.patch
|
|
|
|
---
|
|
drivers/spi/spi_gpio.c | 14 +++++++++-----
|
|
1 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/spi/spi_gpio.c
|
|
+++ b/drivers/spi/spi_gpio.c
|
|
@@ -254,9 +254,11 @@ spi_gpio_request(struct spi_gpio_platfor
|
|
if (value)
|
|
goto done;
|
|
|
|
- value = spi_gpio_alloc(SPI_MISO_GPIO, label, true);
|
|
- if (value)
|
|
- goto free_mosi;
|
|
+ if (SPI_MISO_GPIO != SPI_MOSI_GPIO) {
|
|
+ value = spi_gpio_alloc(SPI_MISO_GPIO, label, true);
|
|
+ if (value)
|
|
+ goto free_mosi;
|
|
+ }
|
|
|
|
value = spi_gpio_alloc(SPI_SCK_GPIO, label, false);
|
|
if (value)
|
|
@@ -319,7 +321,8 @@ static int __devinit spi_gpio_probe(stru
|
|
if (status < 0) {
|
|
spi_master_put(spi_gpio->bitbang.master);
|
|
gpio_free:
|
|
- gpio_free(SPI_MISO_GPIO);
|
|
+ if (SPI_MISO_GPIO != SPI_MOSI_GPIO)
|
|
+ gpio_free(SPI_MISO_GPIO);
|
|
gpio_free(SPI_MOSI_GPIO);
|
|
gpio_free(SPI_SCK_GPIO);
|
|
spi_master_put(master);
|
|
@@ -343,7 +346,8 @@ static int __devexit spi_gpio_remove(str
|
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
- gpio_free(SPI_MISO_GPIO);
|
|
+ if (SPI_MISO_GPIO != SPI_MOSI_GPIO)
|
|
+ gpio_free(SPI_MISO_GPIO);
|
|
gpio_free(SPI_MOSI_GPIO);
|
|
gpio_free(SPI_SCK_GPIO);
|
|
|