[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-180-ge389ee6

[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  e389ee6aa60976a0c46f4cbeb03394ffa2c93a65 (commit)
       via  61b83f7e00ae1bbf36beece2df704821a56343a2 (commit)
      from  2adca3896e79a4ffe437f2a04a8162e51ea87045 (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 e389ee6aa60976a0c46f4cbeb03394ffa2c93a65
Merge: 61b83f7 2adca38
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 20 14:05:14 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 61b83f7e00ae1bbf36beece2df704821a56343a2
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 20 14:04:44 2012 +0100

    [linux] change i2c clock

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

Summary of changes:
 .../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch |   26 ++++++++++---------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
index a524651..551d95a 100644
--- a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
+++ b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
@@ -1,14 +1,16 @@
-Index: linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c
+Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
 ===================================================================
---- linux-2.6.38.8.orig/drivers/i2c/busses/i2c-imx.c	2012-03-19 18:50:33.000000000 +0100
-+++ linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c	2012-03-19 18:51:16.000000000 +0100
-@@ -248,7 +248,8 @@
- 	int i;
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c	2012-03-20 11:02:14.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c	2012-03-20 11:02:32.000000000 +0100
+@@ -1198,9 +1198,9 @@
+ 
+ /* I2C */
+ DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
+-	NULL, NULL, &ipg_clk, NULL);
++	NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(i2c2_clk, 1, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG10_OFFSET,
+-	NULL, NULL, &ipg_clk, NULL);
++	NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,
+ 	NULL, NULL, &ipg_clk, NULL);
  
- 	/* Divider value calculation */
--	i2c_clk_rate = clk_get_rate(i2c_imx->clk);
-+	//i2c_clk_rate = clk_get_rate(i2c_imx->clk);
-+	i2c_clk_rate = 10200000; //XXX: there is an error in clk tree
- 	div = (i2c_clk_rate + rate - 1) / rate;
- 	if (div < i2c_clk_div[0][0])
- 		i = 0;


hooks/post-receive
-- 
armadeus