[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-171-g65ad880
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-171-g65ad880
|
From: Fabien M <fa...@us...> - 2012-03-19 18:09:48
|
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 65ad8807bdebe74c960124e5650551fce8a4eb76 (commit)
via 0df1448d8eeddde93d60be9ca30748db4ddb3f25 (commit)
via 2a4f0de38dd38830694234f941071b50f144e37a (commit)
via c1a99f7f5803c7ab995b96d34982a51c9f61af5a (commit)
via d64a2f6492a391eafb1bb7a12947cedaab9a9c91 (commit)
via 7ca2789f4b298905c28441b1d107f147be67477b (commit)
via de9dacf42b6c126baaf8ccd0d6574c06ed21eb82 (commit)
via 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421 (commit)
from 82bc2886a327e6d5e80645b9a74bcdba7fdc7515 (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 65ad8807bdebe74c960124e5650551fce8a4eb76
Merge: 0df1448 82bc288
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 19:02:57 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0df1448d8eeddde93d60be9ca30748db4ddb3f25
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 19:02:32 2012 +0100
[linux][apf51] bitrate is defined under board-apf51 not in devboard
commit 2a4f0de38dd38830694234f941071b50f144e37a
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 18:59:21 2012 +0100
[linux] fix i2c clock bug
commit c1a99f7f5803c7ab995b96d34982a51c9f61af5a
Merge: d64a2f6 d9ebdaf
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:07:08 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d64a2f6492a391eafb1bb7a12947cedaab9a9c91
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:06:27 2012 +0100
Revert "[linux][apf51] i2c bitrate is declared in board_apf51.c"
This reverts commit 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421.
commit 7ca2789f4b298905c28441b1d107f147be67477b
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:05:58 2012 +0100
Revert "Revert "[BUILD] Add Buildroot version to build infos""
This reverts commit de9dacf42b6c126baaf8ccd0d6574c06ed21eb82.
commit de9dacf42b6c126baaf8ccd0d6574c06ed21eb82
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:05:17 2012 +0100
Revert "[BUILD] Add Buildroot version to build infos"
This reverts commit 2f02a624997a86fe947bc40f842a69c3fa336e0a.
commit 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:02:35 2012 +0100
[linux][apf51] i2c bitrate is declared in board_apf51.c
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch | 14 +++++++++++
.../408-armadeus-add_apf51-dev_baseboard.patch | 24 ++++++++-----------
2 files changed, 24 insertions(+), 14 deletions(-)
create mode 100644 patches/linux/2.6.38/359-armadeus-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
new file mode 100644
index 0000000..a524651
--- /dev/null
+++ b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
@@ -0,0 +1,14 @@
+Index: linux-2.6.38.8/drivers/i2c/busses/i2c-imx.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;
+
+ /* 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;
diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index eabb69a..d317315 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -2,11 +2,11 @@ Add APF51Dev baseboard support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-07-07 16:43:36.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-07-07 17:02:20.000000000 +0200
-@@ -174,4 +174,27 @@
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-03-19 18:51:31.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-03-19 19:01:08.000000000 +0100
+@@ -175,4 +175,27 @@
Include support for Armadeus systems APF51 System On Module. This
includes specific configurations for the board and its peripherals.
@@ -34,10 +34,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+endchoice
+
endif
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-07-07 16:43:36.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-07-07 17:02:20.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2012-03-19 18:51:31.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2012-03-19 19:01:08.000000000 +0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -46,11 +46,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-07-07 16:53:13.000000000 +0200
-@@ -0,0 +1,504 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c 2012-03-19 19:01:24.000000000 +0100
+@@ -0,0 +1,500 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -233,10 +233,6 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .flags = IMXUART_HAVE_RTSCTS,
+};
+
-+static const struct imxi2c_platform_data apf51dev_i2c_data __initconst = {
-+ .bitrate = 400000,
-+};
-+
+/* APF51Proto has a LCD connector for a 18 bits 800x480 Chimei TFT LCD */
+static struct fb_videomode apf51dev_modes[] = {
+ {
hooks/post-receive
--
armadeus
|
