[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-115-gda244a8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-115-gda244a8
|
From: Julien B a. A. <ar...@us...> - 2010-01-19 14:04:27
|
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 da244a88a15320f284436e773f28635a99cee61d (commit)
via 667fa5c300117328b3efba2a35b76ba30026ffa9 (commit)
via 256baee8564c9d4a29f72cf8686c12e35eb4c3c9 (commit)
via 26579b3d24a3c9c41eafbc789fa91b6ccf6b6894 (commit)
via 509a098dfc155a1fce47d18ad2fd692a20a41be9 (commit)
from 5c1180606de171d5aeafcc83ca1f7a3a2c1763e0 (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 da244a88a15320f284436e773f28635a99cee61d
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 14:57:36 2010 +0100
[LINUX] Cleanup 339-apf27-armadeus-spidev.patch
commit 667fa5c300117328b3efba2a35b76ba30026ffa9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 14:35:46 2010 +0100
[LINUX] Previous changes on SPI (for spidev) broke the modprobing of tsc210x module. Corrects that...
commit 256baee8564c9d4a29f72cf8686c12e35eb4c3c9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 14:25:30 2010 +0100
[LINUX] tsc210x/ALSA: increase ALSA PCM buffer
commit 26579b3d24a3c9c41eafbc789fa91b6ccf6b6894
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 14:22:54 2010 +0100
[LINUX] tsc210x: improve error messages
commit 509a098dfc155a1fce47d18ad2fd692a20a41be9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 19 14:21:31 2010 +0100
Indentation...
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/073-armadeus-tsc2102.patch | 12 +++--
...-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch | 31 ++++++-----
.../2.6.29/339-apf27-armadeus-spidev.patch | 55 +++++++++----------
...s-spi_imx-update_for_2.6.32_compatibility.patch | 39 ++++++++++++++
4 files changed, 88 insertions(+), 49 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/351-armadeus-spi_imx-update_for_2.6.32_compatibility.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
index 086542e..d6d83b7 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
@@ -4,7 +4,7 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
Index: linux-2.6.29.6/include/linux/spi/tsc2102.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/spi/tsc2102.h 2009-12-23 10:01:01.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/tsc2102.h 2010-01-19 10:25:41.000000000 +0100
@@ -0,0 +1,302 @@
+/*
+ * include/linux/spi/tsc2102.h
@@ -311,8 +311,8 @@ Index: linux-2.6.29.6/include/linux/spi/tsc2102.h
Index: linux-2.6.29.6/drivers/spi/tsc2102.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/spi/tsc2102.c 2009-12-23 10:06:02.000000000 +0100
-@@ -0,0 +1,1186 @@
++++ linux-2.6.29.6/drivers/spi/tsc2102.c 2010-01-19 11:19:57.000000000 +0100
+@@ -0,0 +1,1188 @@
+/*
+ * drivers/spi/tsc2102.c
+ *
@@ -1319,7 +1319,7 @@ Index: linux-2.6.29.6/drivers/spi/tsc2102.c
+ tsc.mclk = 16000000; /* 16 MHz by default */
+#endif /* CONFIG_TSC_SLAVE */
+
-+ if (request_irq(spi->irq, tsc2102_handler, IRQF_DISABLED | IRQF_SHARED | IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
++ if (request_irq(spi->irq, tsc2102_handler, IRQF_DISABLED /*| IRQF_SHARED*/ | IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
+ printk(KERN_ERR "Couldn't allocate touchscreen IRQ (%d)\n", spi->irq);
+ err = -EINVAL;
+ goto err_clk;
@@ -1336,8 +1336,10 @@ Index: linux-2.6.29.6/drivers/spi/tsc2102.c
+ spi->mode = SPI_MODE_1;
+ spi->bits_per_word = 16;
+ err = spi_setup(spi);
-+ if (err)
++ if (err) {
++ dev_err(&spi->dev, "unable to setup SPI\n");
+ goto err_timer;
++ }
+
+ /* Now try to detect the chip, make first contact */
+ tsc210x_reset(); /* Seems like TSC can be messed up and needs a reset even to get revision */
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
index 6ecdcea..66ecf6e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
@@ -1,11 +1,11 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
-Index: linux-2.6.29.6.mod/sound/arm/imx-alsa.c
+Index: linux-2.6.29.6/sound/arm/imx-alsa.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6.mod/sound/arm/imx-alsa.c 2009-12-30 12:01:39.000000000 +0100
-@@ -0,0 +1,665 @@
++++ linux-2.6.29.6/sound/arm/imx-alsa.c 2010-01-19 10:32:20.000000000 +0100
+@@ -0,0 +1,666 @@
+/*
+ * sound/arm/imx-alsa.c
+ *
@@ -85,6 +85,7 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa.c
+
+ runtime = substream->runtime;
+
++ pr_debug("DMA ");
+ if (sg) {
+/* channel_info->offset = (unsigned long)sg->dma_address -
+ (unsigned long)channel_info->base;*/
@@ -522,8 +523,8 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa.c
+ snd_pcm_lib_preallocate_pages_for_all(pcm,
+ SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_dma_continuous_data(GFP_KERNEL),
-+ 8 * 1024,
-+ 8 * 1024);
++ 32 * 1024,
++ 32 * 1024);
+
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_card_imx_ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_card_imx_ops);
@@ -671,10 +672,10 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa.c
+
+ return 0;
+}
-Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-dma.h
+Index: linux-2.6.29.6/sound/arm/imx-alsa-dma.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6.mod/sound/arm/imx-alsa-dma.h 2009-12-29 18:38:46.000000000 +0100
++++ linux-2.6.29.6/sound/arm/imx-alsa-dma.h 2010-01-19 10:25:41.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * linux/sound/arm/imx/imx-alsa-dma.h
@@ -722,10 +723,10 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-dma.h
+
+#endif
+
-Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.c
+Index: linux-2.6.29.6/sound/arm/imx-alsa-tsc2102.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.c 2009-12-29 23:12:27.000000000 +0100
++++ linux-2.6.29.6/sound/arm/imx-alsa-tsc2102.c 2010-01-19 10:30:18.000000000 +0100
@@ -0,0 +1,441 @@
+/*
+ * sound/arm/imx-alsa-tsc2102.c
@@ -798,7 +799,7 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.c
+ .channels_max = 2,
+ .buffer_bytes_max = 32 * 1024,
+ .period_bytes_min = 64,
-+ .period_bytes_max = 8 * 1024, /* test */
++ .period_bytes_max = 8 * 1024,
+ .periods_min = 2,
+ .periods_max = 255,
+ .fifo_size = 0,
@@ -817,7 +818,7 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.c
+ .channels_max = 2,
+ .buffer_bytes_max = 32 * 1024,
+ .period_bytes_min = 64,
-+ .period_bytes_max = 8 * 1024, /* test */
++ .period_bytes_max = 8 * 1024,
+ .periods_min = 2,
+ .periods_max = 255,
+ .fifo_size = 0,
@@ -1168,10 +1169,10 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.c
+module_init(imx_alsa_tsc210x_init);
+module_exit(imx_alsa_tsc210x_exit);
+
-Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.h
+Index: linux-2.6.29.6/sound/arm/imx-alsa-tsc2102.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.h 2009-12-29 18:38:46.000000000 +0100
++++ linux-2.6.29.6/sound/arm/imx-alsa-tsc2102.h 2010-01-19 10:25:41.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * sound/arm/imx-alsa-tsc2102.h
@@ -1221,10 +1222,10 @@ Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102.h
+
+#endif /* IMX_ALSA_TSC2102_H_ */
+
-Index: linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102-mixer.c
+Index: linux-2.6.29.6/sound/arm/imx-alsa-tsc2102-mixer.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6.mod/sound/arm/imx-alsa-tsc2102-mixer.c 2009-12-29 18:38:46.000000000 +0100
++++ linux-2.6.29.6/sound/arm/imx-alsa-tsc2102-mixer.c 2010-01-19 10:25:41.000000000 +0100
@@ -0,0 +1,425 @@
+/*
+ * sound/arm/imx-alsa-tsc2102-mixer.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index 5b47e20..0937459 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -1,4 +1,5 @@
-Correct some bugs in spidev devices, and adjust number of chipselect for apf27Dev spi1
+Add platform init call to spidev + spidev support for APF27Dev on
+SPI2 (spi1 for Linux).
Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
@@ -6,8 +7,8 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 09:41:42.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 17:06:13.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 14:37:17.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 14:53:32.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/mtd/physmap.h>
#include <asm/mach/flash.h>
@@ -26,7 +27,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#ifdef CONFIG_IMX_BACKLIGHT_MODULE
#define CONFIG_IMX_BACKLIGHT
#endif
-@@ -417,7 +421,7 @@
+@@ -443,7 +447,7 @@
};
static struct spi_imx_master imx_spi1_master_info = {
@@ -35,12 +36,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
.enable_dma = 0,
.init = gpio_spi1_active,
.exit = gpio_spi1_inactive,
-@@ -561,6 +565,38 @@
- };
+@@ -590,6 +594,38 @@
#endif /* CONFIG_CAN_MCP251X */
+
++/* SPI2 can be used as userspace general SPI bus (CS 2) */
+#ifdef CONFIG_SPI_SPIDEV
-+
+#define SPIDEV_CS (GPIO_PORTB | 17)
+
+static int spidev_pins[] = {
@@ -69,31 +70,30 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct spidev_platform_data apf27_spidev_config = {
+ .init = spidev_init_gpio,
+};
-+
+#endif /* CONFIG_SPI_SPIDEV */
-
++
static struct spi_board_info spi_board_info[] __initdata = {
#ifdef CONFIG_ARMADEUS_MAX1027
-@@ -599,6 +635,18 @@
+ {
+@@ -627,6 +663,17 @@
.platform_data = &apf27_mcp251x_config,
},
#endif /* CONFIG_CAN_MCP251X */
+#ifdef CONFIG_SPI_SPIDEV
+ {
-+ .modalias = "spidev",
-+ .controller_data = &spidev_hw,
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
-+ .platform_data = &apf27_spidev_config,
++ .modalias = "spidev",
++ .controller_data = &spidev_hw,
++ .max_speed_hz = 8000000, /* 8MHz */
++ .bus_num = 1, /* SPI2 */
++ .mode = SPI_MODE_1,
++ .chip_select = 2,
++ .platform_data = &apf27_spidev_config,
+ },
+#endif /* CONFIG_SPI_SPIDEV */
-+
};
-@@ -1015,7 +1063,7 @@
+@@ -1044,7 +1091,7 @@
/* Reserve "fixed" GPIOs */
tsc2101_init_fixed_gpio();
#endif
@@ -104,19 +104,16 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#endif
Index: linux-2.6.29.6/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-15 09:20:35.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-15 17:06:13.000000000 +0100
-@@ -558,8 +558,9 @@
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2010-01-19 14:37:18.000000000 +0100
+@@ -558,6 +558,7 @@
static int spidev_probe(struct spi_device *spi)
{
-+ struct spidev_platform_data *pdata = spi->dev.platform_data;
++ struct spidev_platform_data *pdata = spi->dev.platform_data;
struct spidev_data *spidev;
-- int status;
-+ int status;
+ int status;
unsigned long minor;
-
- /* Allocate driver data */
@@ -595,6 +596,10 @@
set_bit(minor, minors);
list_add(&spidev->device_entry, &device_list);
@@ -130,8 +127,8 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
if (status == 0)
Index: linux-2.6.29.6/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-15 09:20:35.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-15 17:06:13.000000000 +0100
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2010-01-19 14:37:18.000000000 +0100
@@ -101,6 +101,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/351-armadeus-spi_imx-update_for_2.6.32_compatibility.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/351-armadeus-spi_imx-update_for_2.6.32_compatibility.patch
new file mode 100644
index 0000000..f9e1dc1
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/351-armadeus-spi_imx-update_for_2.6.32_compatibility.patch
@@ -0,0 +1,39 @@
+Updates drivers/spi/spi_imx.c to 2.6.32 new features.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/drivers/spi/spi_imx.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/spi/spi_imx.c 2010-01-19 14:30:17.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spi_imx.c 2010-01-19 14:33:50.000000000 +0100
+@@ -1275,9 +1275,6 @@
+ return -EINVAL;
+ }
+
+-/* the spi->mode bits understood by this driver: */
+-#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
+-
+ /* On first setup bad values must free chip_data memory since will cause
+ spi_new_device to fail. Bad value setup from protocol driver are simply not
+ applied and notified to the calling driver. */
+@@ -1290,12 +1287,6 @@
+ u32 tmp;
+ int status = 0;
+
+- if (spi->mode & ~MODEBITS) {
+- dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
+- spi->mode & ~MODEBITS);
+- return -EINVAL;
+- }
+-
+ /* Get controller data */
+ chip_info = spi->controller_data;
+
+@@ -1590,6 +1581,7 @@
+ master->cleanup = cleanup;
+ master->setup = setup;
+ master->transfer = transfer;
++ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+
+ drv_data->dummy_dma_buf = SPI_DUMMY_u32;
+
hooks/post-receive
--
armadeus
|
