[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-137-gc086375

[Fabien M <fa...@us...>]

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  c086375319881a6942eeedf3bcd8e06d93af0d84 (commit)
      from  64ca04193068d944f35ae2b1f55a2245fbbb8f0c (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 c086375319881a6942eeedf3bcd8e06d93af0d84
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Jan 28 14:04:39 2013 +0100

    [linux][imx28] adding_spi3

-----------------------------------------------------------------------

Summary of changes:
 .../2.6.35/461-armadeus-adding_spi3_on_apf28.patch |   97 ++++++++++++++++++++
 1 files changed, 97 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/2.6.35/461-armadeus-adding_spi3_on_apf28.patch

diff --git a/patches/linux/2.6.35/461-armadeus-adding_spi3_on_apf28.patch b/patches/linux/2.6.35/461-armadeus-adding_spi3_on_apf28.patch
new file mode 100644
index 0000000..2f7df9f
--- /dev/null
+++ b/patches/linux/2.6.35/461-armadeus-adding_spi3_on_apf28.patch
@@ -0,0 +1,97 @@
+Adding spi3 master on imx28 platform
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+---
+Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c	2013-01-28 13:52:20.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/device.c	2013-01-28 13:59:31.000000000 +0100
+@@ -662,10 +662,16 @@
+ #endif
+ 
+ #if defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE)
+-static struct mxs_spi_platform_data spi_data = {
++static struct mxs_spi_platform_data spi_data2 = {
+ 	.clk = "ssp.2",
+ 	.slave_mode = 0,
+ };
++
++static struct mxs_spi_platform_data spi_data3 = {
++	.clk = "ssp.3",
++	.slave_mode = 0,
++};
++
+ static struct resource ssp2_resources[] = {
+ 	{
+ 		.start	= SSP2_PHYS_ADDR,
+@@ -686,18 +692,48 @@
+ 	},
+ };
+ 
++static struct resource ssp3_resources[] = {
++	{
++		.start	= SSP3_PHYS_ADDR,
++		.end	= SSP3_PHYS_ADDR + 0x2000 - 1,
++		.flags	= IORESOURCE_MEM,
++	}, {
++		.start	= MXS_DMA_CHANNEL_AHB_APBH_SSP3,
++		.end	= MXS_DMA_CHANNEL_AHB_APBH_SSP3,
++		.flags	= IORESOURCE_DMA,
++	}, {
++		.start	= IRQ_SSP3_DMA,
++		.end	= IRQ_SSP3_DMA,
++		.flags	= IORESOURCE_IRQ,
++	}, {
++		.start	= IRQ_SSP3,
++		.end	= IRQ_SSP3,
++		.flags	= IORESOURCE_IRQ,
++	},
++};
++
+ static void __init mx28_init_spi(void)
+ {
+ 	struct platform_device *pdev;
++	struct platform_device *pdev2;
+ 
+ 	pdev = mxs_get_device("mxs-spi", 0);
+ 	if (pdev == NULL || IS_ERR(pdev))
+ 		return;
+ 	pdev->resource = ssp2_resources;
+ 	pdev->num_resources = ARRAY_SIZE(ssp2_resources);
+-	pdev->dev.platform_data = &spi_data;
++	pdev->dev.platform_data = &spi_data2;
+ 
+ 	mxs_add_device(pdev, 3);
++
++	pdev2 = mxs_get_device("mxs-spi", 1);
++	if (pdev2 == NULL || IS_ERR(pdev2))
++		return;
++	pdev2->resource = ssp3_resources;
++	pdev2->num_resources = ARRAY_SIZE(ssp3_resources);
++	pdev2->dev.platform_data = &spi_data3;
++
++	mxs_add_device(pdev2, 3);
+ }
+ #else
+ static void mx28_init_spi(void)
+Index: linux-2.6.35.3/arch/arm/plat-mxs/device.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/plat-mxs/device.c	2013-01-28 11:45:01.000000000 +0100
++++ linux-2.6.35.3/arch/arm/plat-mxs/device.c	2013-01-28 11:48:51.000000000 +0100
+@@ -187,6 +187,16 @@
+ 		.release = mxs_nop_release,
+ 		},
+ 	 },
++	{
++	 .name	= "mxs-spi",
++	 .id	= 1,
++	 .dev = {
++		.dma_mask	       = &common_dmamask,
++		.coherent_dma_mask      = DMA_BIT_MASK(32),
++		.release = mxs_nop_release,
++		},
++	 },
++
+ };
+ #endif
+ 


hooks/post-receive
-- 
armadeus