[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-23-g948aef1

[jorasse <jo...@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  948aef1e66036d068c1a9956000592bf4c2ca1aa (commit)
      from  bbfee3d147e08029defab26e752a2fcc1f6a04cb (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 948aef1e66036d068c1a9956000592bf4c2ca1aa
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Sep 17 17:08:29 2012 +0200

    [LINUX] apf27: linux 2.6.38: Apply patch 344 from kernel 2.6.29 - fix potential UART hang up on shutdown (Thx Gael)

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

Summary of changes:
 .../344-armadeus-uart_hang_up.patch                |   21 ++++++++++---------
 1 files changed, 11 insertions(+), 10 deletions(-)
 copy patches/linux/{2.6.29 => 2.6.38}/344-armadeus-uart_hang_up.patch (60%)

diff --git a/patches/linux/2.6.29/344-armadeus-uart_hang_up.patch b/patches/linux/2.6.38/344-armadeus-uart_hang_up.patch
similarity index 60%
copy from patches/linux/2.6.29/344-armadeus-uart_hang_up.patch
copy to patches/linux/2.6.38/344-armadeus-uart_hang_up.patch
index 9d1b1e9..248a134 100644
--- a/patches/linux/2.6.29/344-armadeus-uart_hang_up.patch
+++ b/patches/linux/2.6.38/344-armadeus-uart_hang_up.patch
@@ -2,25 +2,26 @@ UART receive may hang up after a shutdown while receiving data
 Perform a complete uart reset instead of a simple uart disable
 
 Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
  
 Index: linux-2.6.29/drivers/serial/imx.c
 ===================================================================
---- linux-2.6.29.orig/drivers/serial/imx.c	2012-02-06 10:24:51.000000000 +0100
-+++ linux-2.6.29/drivers/serial/imx.c	2012-02-06 10:25:28.000000000 +0100
-@@ -652,12 +652,12 @@ static void imx_shutdown(struct uart_por
- 		free_irq(sport->port.irq, sport);
- 
- 	/*
--	 * Disable all interrupts, port and break condition.
-+	 * reset uart
+--- linux-2.6.38.8/drivers/tty/serial/imx.c
++++ linux-2.6.38.8/drivers/tty/serial/imx.c
+@@ -778,12 +778,10 @@ static void imx_shutdown(struct uart_por
+ 	 * Disable all interrupts, port and break condition.
  	 */
  
 -	temp = readl(sport->port.membase + UCR1);
 -	temp &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
--	writel(temp, sport->port.membase + UCR1);
+-	if (USE_IRDA(sport))
+-		temp &= ~(UCR1_IREN);
 +	temp = readl(sport->port.membase + UCR2);
 +	temp &= ~(UCR2_SRST);
+ 
+-	writel(temp, sport->port.membase + UCR1);
 +	writel(temp, sport->port.membase + UCR2);
  }
  
- static void imx_serial_dump_registers(struct imx_port *sport)
+ static void
+


hooks/post-receive
-- 
armadeus