[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-185-g21ba061

[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  21ba061c199026dfcc74b86803a93daf472cc692 (commit)
       via  6b0d95deaf3e9c0bb6fddd21ec541ea01f0a2e85 (commit)
      from  c1357200e0901c9026592c0909d208021fa5c454 (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 21ba061c199026dfcc74b86803a93daf472cc692
Merge: 6b0d95d c135720
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Mar 21 09:26:46 2012 +0100

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

commit 6b0d95deaf3e9c0bb6fddd21ec541ea01f0a2e85
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Mar 21 09:26:21 2012 +0100

    [linux] patch is from Karo

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

Summary of changes:
 .../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch |   16 ----------
 .../2.6.38/359-karo-imx-fix_clock_on_i2c.patch     |   31 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 16 deletions(-)
 delete mode 100644 patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
 create mode 100644 patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch

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
deleted file mode 100644
index 551d95a..0000000
--- a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
-===================================================================
---- 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);
- 
diff --git a/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch
new file mode 100644
index 0000000..41940b5
--- /dev/null
+++ b/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch
@@ -0,0 +1,31 @@
+mach-mx5: fix the I2C clock parents
+
+The clock from which the I2C timing is derived is the ipg_perclk
+not ipg_clk.
+
+I2C bus frequency was lower by a factor of ~8 due to the clock divider
+calculation being based on 66.5MHz IPG clock while the bus actually
+uses 8MHz ipg_perclk.
+
+Kernel version: 3.0.0-rc2 branch 'imx-for-next' of
+git://git.pengutronix.de/git/imx/linux-2.6
+
+Signed-off-by: Lothar Waßmann <LW at KARO-electronics.de>
+Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
+---
+Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
+===================================================================
+--- 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);
+ 


hooks/post-receive
-- 
armadeus