[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-92-gbb2a7f8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-92-gbb2a7f8
|
From: Fabien M <fa...@us...> - 2010-01-06 13:30:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bb2a7f88d7ce450b0d80a55bea7a96fd22e147f7 (commit)
via 67e7ad40360149c5a5209dd6e97b9e19f0925a83 (commit)
from 0dcd22374ef572db5b7e21fb62d792d3b72cb5a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb2a7f88d7ce450b0d80a55bea7a96fd22e147f7
Merge: 67e7ad40360149c5a5209dd6e97b9e19f0925a83 0dcd22374ef572db5b7e21fb62d792d3b72cb5a5
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 6 14:29:28 2010 +0100
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 67e7ad40360149c5a5209dd6e97b9e19f0925a83
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 6 10:55:01 2010 +0100
[LINUX] Fix spi_gpio patch
-----------------------------------------------------------------------
Summary of changes:
...-spi-improve_spi_gpio_for_single_data_pin.patch | 31 +++++++++++++++++--
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/350-armadeus-spi-improve_spi_gpio_for_single_data_pin.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/350-armadeus-spi-improve_spi_gpio_for_single_data_pin.patch
index 34bc4d6..9715809 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/350-armadeus-spi-improve_spi_gpio_for_single_data_pin.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/350-armadeus-spi-improve_spi_gpio_for_single_data_pin.patch
@@ -7,8 +7,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/spi/spi_bitbang.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spi_bitbang.c 2010-01-05 16:09:08.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spi_bitbang.c 2010-01-05 16:09:28.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spi_bitbang.c 2010-01-06 10:50:36.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spi_bitbang.c 2010-01-06 10:50:57.000000000 +0100
@@ -396,6 +396,22 @@
unsigned long flags;
int status = 0;
@@ -34,8 +34,8 @@ Index: linux-2.6.29.6/drivers/spi/spi_bitbang.c
Index: linux-2.6.29.6/drivers/spi/spi_gpio.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spi_gpio.c 2010-01-05 16:12:12.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spi_gpio.c 2010-01-05 16:13:51.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spi_gpio.c 2010-01-06 10:50:36.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spi_gpio.c 2010-01-06 10:50:57.000000000 +0100
@@ -109,12 +109,19 @@
static inline void setmosi(const struct spi_device *spi, int is_on)
@@ -167,3 +167,26 @@ Index: linux-2.6.29.6/drivers/spi/spi_gpio.c
gpio_free(SPI_SCK_GPIO);
return status;
+Index: linux-2.6.29.6/include/linux/spi/spi_gpio.h
+===================================================================
+--- linux-2.6.29.6.orig/include/linux/spi/spi_gpio.h 2010-01-06 10:51:04.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spi_gpio.h 2010-01-06 10:52:21.000000000 +0100
+@@ -29,11 +29,18 @@
+ * SPI_GPIO_NO_CHIPSELECT to the controller_data:
+ * .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT;
+ *
++ * If the MISO or MOSI pin is not available then it should be set to
++ * SPI_GPIO_NO_MISO or SPI_GPIO_NO_MOSI.
++ *
++
+ * If the bitbanged bus is later switched to a "native" controller,
+ * that platform_device and controller_data should be removed.
+ */
+
+ #define SPI_GPIO_NO_CHIPSELECT ((unsigned long)-1l)
++#define SPI_GPIO_NO_MISO ((unsigned long)-1l)
++#define SPI_GPIO_NO_MOSI ((unsigned long)-1l)
++
+
+ /**
+ * struct spi_gpio_platform_data - parameter for bitbanged SPI master
hooks/post-receive
--
armadeus
|
