[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-19-g47ca879

[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  47ca87996c374279a7becce56ab2790c3e219e1f (commit)
       via  a8f5cf1a24d8f8d0735a59d64a38bd65beebad47 (commit)
       via  7dc73205d7dadde4b963d78a4ff791cb12878f5f (commit)
      from  f2ffce2439c6700fa26f3b83f6119e8b217b375e (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 47ca87996c374279a7becce56ab2790c3e219e1f
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Mar 25 16:57:09 2011 +0100

    [linux] 409 patch fixed

commit a8f5cf1a24d8f8d0735a59d64a38bd65beebad47
Merge: 7dc73205d7dadde4b963d78a4ff791cb12878f5f f2ffce2439c6700fa26f3b83f6119e8b217b375e
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Mar 25 16:54:51 2011 +0100

    merge

commit 7dc73205d7dadde4b963d78a4ff791cb12878f5f
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Mar 25 16:51:52 2011 +0100

    [linux] Fix 409 patch to compile linux for apf51

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

Summary of changes:
 ...madeus-gpio_select_dr_register_on_output.patch} |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
 rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/{409-armadeus-gpio_select_dr_register_on_output.to_fix => 409-armadeus-gpio_select_dr_register_on_output.patch} (75%)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
similarity index 75%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
index d4e6d8e..689d329 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.to_fix
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-gpio_select_dr_register_on_output.patch
@@ -1,27 +1,26 @@
-Do not work on i.MX51... -> TO FIX !
+Select DR register on output direction for imx27.
 
-Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
-===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/gpio.c	2011-02-02 11:35:55.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/gpio.c	2011-02-02 11:35:55.000000000 +0100
-@@ -39,6 +39,13 @@
+Signed-off-by: Fabien Marteau <fab...@ar...>
+----
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/gpio.c	2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/gpio.c	2011-03-25 16:49:39.000000000 +0100
+@@ -40,6 +40,11 @@
  #define GPIO_IMR	(cpu_is_mx1_mx2() ? 0x30 : 0x14)
  #define GPIO_ISR	(cpu_is_mx1_mx2() ? 0x34 : 0x18)
  
 +#if cpu_is_mx1_mx2()
 +#	define GPIO_OCR1	0x04
 +#	define GPIO_OCR2	0x08
-+#else
-+/* TODO */
 +#endif
 +
  #define GPIO_INT_LOW_LEV	(cpu_is_mx1_mx2() ? 0x3 : 0x0)
  #define GPIO_INT_HIGH_LEV	(cpu_is_mx1_mx2() ? 0x2 : 0x1)
  #define GPIO_INT_RISE_EDGE	(cpu_is_mx1_mx2() ? 0x0 : 0x2)
-@@ -257,6 +264,26 @@
+@@ -289,6 +294,27 @@
  static int mxc_gpio_direction_output(struct gpio_chip *chip,
  				     unsigned offset, int value)
  {
++#if cpu_is_mx1_mx2()
 +	struct mxc_gpio_port *port =
 +		container_of(chip, struct mxc_gpio_port, chip);
 +	void __iomem *reg_ocr1 = port->base + GPIO_OCR1;
@@ -41,7 +40,7 @@ Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
 +		__raw_writel(ocr2, reg_ocr2);
 +	}
 +	spin_unlock_irqrestore(&port->lock, flags);
-+
++#endif
  	mxc_gpio_set(chip, offset, value);
  	_set_gpio_direction(chip, offset, 1);
  	return 0;


hooks/post-receive
-- 
armadeus