[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-62-g601d11b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-62-g601d11b
|
From: Julien B a. A. <ar...@us...> - 2011-04-18 09:57:20
|
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 601d11b96700d0af4fe86c3dda62a7e59a150bea (commit)
via e503df8a265493c63ea5b7f70eb655e98ebae610 (commit)
via 881675e7e889fcc8e1cb10c862a99e9f8bbc20d9 (commit)
from 1a5b39e850b105e42063df8371454cd263515745 (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 601d11b96700d0af4fe86c3dda62a7e59a150bea
Merge: e503df8a265493c63ea5b7f70eb655e98ebae610 1a5b39e850b105e42063df8371454cd263515745
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 18 11:55:43 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e503df8a265493c63ea5b7f70eb655e98ebae610
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 18 10:49:28 2011 +0200
[LINUX] 2.6.38: Activates OTG again on APF51
commit 881675e7e889fcc8e1cb10c862a99e9f8bbc20d9
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 18 09:36:39 2011 +0200
[LINUX] 2.6.38: Makes OTG port work again on APF51
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 24 +++++++++----------
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 17 ++++++++++++++
2 files changed, 28 insertions(+), 13 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 48dcd3a..adf98fc 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:18.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:57.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-04-18 09:39:16.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-04-18 10:47:45.000000000 +0200
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -23,7 +23,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:57.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-04-18 10:47:45.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -35,11 +35,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-03-30 18:33:36.000000000 +0200
-@@ -0,0 +1,443 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-04-18 10:20:41.000000000 +0200
+@@ -0,0 +1,441 @@
+/*
+ * Support for APF51 System On Module
-+ * Copyright (C) 2010-2011 Armadeus Systems
++ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
+ *
+ * Based on code which is:
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -447,15 +447,13 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+ apf51_usbh1_usbh2_active();
+ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
+ mxc_register_device(&mxc_usbh2_device, &usbh2_config);
-+#if 0
-+ /* Currently system boot freezes when OTG is activated :-( */
++
+ if (otg_mode_host)
+ mxc_register_device(&mxc_usbdr_host_device, &apf51_usbdr_host_config);
+ else {
+ initialize_otg_port(NULL);
+ mxc_register_device(&mxc_usbdr_udc_device, &apf51_usbdr_device_pdata);
+ }
-+#endif
+
+#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
@@ -482,8 +480,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:22.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:24.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-18 09:39:18.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-18 09:39:18.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -504,8 +502,8 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:23.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:24.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-04-18 09:39:18.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-04-18 09:39:18.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
new file mode 100644
index 0000000..98d6236
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
@@ -0,0 +1,17 @@
+Otherwise OTG controller accesses freeze at startup on APF51.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38.1/arch/arm/mach-mx5/clock-mx51-mx53.c
+===================================================================
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-04-18 09:26:04.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-04-18 09:26:34.000000000 +0200
+@@ -1385,7 +1385,7 @@
+ clk_disable(&iim_clk);
+
+ /* move usb_phy_clk to 24MHz */
+- clk_set_parent(&usb_phy1_clk, &osc_clk);
++/* clk_set_parent(&usb_phy1_clk, &osc_clk); */
+
+ /* set the usboh3_clk parent to pll2_sw_clk */
+ clk_set_parent(&usboh3_clk, &pll2_sw_clk);
hooks/post-receive
--
armadeus
|
