[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2620-g845f1ef

[Nicolas <th...@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  845f1efd1b3466330ab97be2c4a7bdf293739fa4 (commit)
      from  e3dfbb7d381fa1affcf6ca78030d111ddd0513d9 (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 845f1efd1b3466330ab97be2c4a7bdf293739fa4
Author: Nicolas Colombain <nic...@ar...>
Date:   Tue Dec 6 18:18:16 2011 +0100

    [LINUX] fix 442 ecspi patch

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

Summary of changes:
 .../442-armadeus-fix_mx5_ecspi_chipselect.patch    |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
 copy patches/linux/{2.6.38 => 3.0}/442-armadeus-fix_mx5_ecspi_chipselect.patch (82%)

diff --git a/patches/linux/2.6.38/442-armadeus-fix_mx5_ecspi_chipselect.patch b/patches/linux/3.0/442-armadeus-fix_mx5_ecspi_chipselect.patch
similarity index 82%
copy from patches/linux/2.6.38/442-armadeus-fix_mx5_ecspi_chipselect.patch
copy to patches/linux/3.0/442-armadeus-fix_mx5_ecspi_chipselect.patch
index 4bffc01..79a272b 100644
--- a/patches/linux/2.6.38/442-armadeus-fix_mx5_ecspi_chipselect.patch
+++ b/patches/linux/3.0/442-armadeus-fix_mx5_ecspi_chipselect.patch
@@ -7,12 +7,8 @@ Index: linux-2.6.38.1/drivers/spi/spi_imx.c
 ===================================================================
 --- linux-2.6.38.1.orig/drivers/spi/spi_imx.c	2011-11-30 15:54:07.000000000 +0100
 +++ linux-2.6.38.1/drivers/spi/spi_imx.c	2011-12-01 11:53:08.000000000 +0100
-@@ -177,17 +177,17 @@ static unsigned int spi_imx_clkdiv_2(uns
- #define SPI_IMX2_3_CTRL		0x08
- #define SPI_IMX2_3_CTRL_ENABLE		(1 <<  0)
- #define SPI_IMX2_3_CTRL_XCH		(1 <<  2)
--#define SPI_IMX2_3_CTRL_MODE(cs)	(1 << ((cs) +  4))
-+#define SPI_IMX2_3_CTRL_MODE(cs)	(1 << ((cs & 0x03) +  4))
+@@ -177,14 +177,14 @@ static unsigned int spi_imx_clkdiv_2(uns
+ #define SPI_IMX2_3_CTRL_MODE_MASK	(0xf << 4)
  #define SPI_IMX2_3_CTRL_POSTDIV_OFFSET	8
  #define SPI_IMX2_3_CTRL_PREDIV_OFFSET	12
 -#define SPI_IMX2_3_CTRL_CS(cs)		((cs) << 18)


hooks/post-receive
-- 
armadeus