[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-176-gaadc1f0

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  aadc1f08cd4b33d931f8a740f92f74169f238bb1 (commit)
       via  b3029385c2888037f61e2093a8c821a344c1da85 (commit)
      from  d0624e0e94fe2e5871fdf1e53cf304a965dd90c8 (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 aadc1f08cd4b33d931f8a740f92f74169f238bb1
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Sat Mar 1 19:17:46 2014 +0100

    [LINUX][3.14] imx51: usbphy1 has no real clock, use dummy clk aka 0

commit b3029385c2888037f61e2093a8c821a344c1da85
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Sat Mar 1 19:16:26 2014 +0100

    [LINUX][3.14] fix patch 0431

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

Summary of changes:
 ...-imx51_dts-add_usbphy_for_host1_and_host2.patch |   14 +++++++-------
 ...ot_link_otg_phy_clock_directly_to_osc_ref.patch |   17 +++++++++++++++++
 ...k_otg_phy_clock_directly_to_osc_ref.patch.tofix |   17 -----------------
 3 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
 delete mode 100644 patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix

diff --git a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
index 24422f2..40e8ce1 100644
--- a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
+++ b/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
@@ -2,17 +2,17 @@ usbphy is mandatory to avoid null pointer when a device is (un)plugged.
 
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
-Index: linux-3.11-rc1/arch/arm/boot/dts/imx51.dtsi
+Index: linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
 ===================================================================
---- linux-3.11-rc1.orig/arch/arm/boot/dts/imx51.dtsi
-+++ linux-3.11-rc1/arch/arm/boot/dts/imx51.dtsi
-@@ -182,6 +182,13 @@
+--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51.dtsi
++++ linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
+@@ -195,6 +195,13 @@
  				status = "okay";
  			};
  
 +			usbphy1: usbphy@1 {
 +				compatible = "usb-nop-xceiv";
-+				clocks = <&clks 125>;
++				clocks = <&clks 0>;
 +				clock-names = "main_clk";
 +				status = "okay";
 +			};
@@ -20,7 +20,7 @@ Index: linux-3.11-rc1/arch/arm/boot/dts/imx51.dtsi
  			usbotg: usb@73f80000 {
  				compatible = "fsl,imx51-usb", "fsl,imx27-usb";
  				reg = <0x73f80000 0x0200>;
-@@ -198,6 +205,7 @@
+@@ -211,6 +218,7 @@
  				interrupts = <14>;
  				clocks = <&clks 108>;
  				fsl,usbmisc = <&usbmisc 1>;
@@ -28,7 +28,7 @@ Index: linux-3.11-rc1/arch/arm/boot/dts/imx51.dtsi
  				status = "disabled";
  			};
  
-@@ -207,6 +215,7 @@
+@@ -220,6 +228,7 @@
  				interrupts = <16>;
  				clocks = <&clks 108>;
  				fsl,usbmisc = <&usbmisc 2>;
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
new file mode 100644
index 0000000..43422c2
--- /dev/null
+++ b/patches/linux/3.14/0431-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-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
+===================================================================
+--- linux-3.14-rc3.orig/arch/arm/mach-imx/clk-imx51-imx53.c
++++ linux-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
+@@ -304,7 +304,7 @@ static void __init mx5_clocks_common_ini
+ 	clk_set_parent(clk[IMX5_CLK_ESDHC_B_SEL], clk[IMX5_CLK_PLL2_SW]);
+ 
+ 	/* move usb phy clk to 24MHz */
+-	clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);
++	/*clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);*/
+ 
+ 	clk_prepare_enable(clk[IMX5_CLK_GPC_DVFS]);
+ 	clk_prepare_enable(clk[IMX5_CLK_AHB_MAX]); /* esdhc3 */
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix b/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
deleted file mode 100644
index a496055..0000000
--- a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
+++ /dev/null
@@ -1,17 +0,0 @@
-Otherwise OTG controller accesses freeze at startup on APF51.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c
-===================================================================
---- linux-3.11.orig/arch/arm/mach-imx/clk-imx51-imx53.c	2011-04-18 09:26:04.000000000 +0200
-+++ linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c	2011-04-18 09:26:34.000000000 +0200
-@@ -345,7 +345,7 @@
- 	clk_set_parent(clk[esdhc_b_sel], clk[pll2_sw]);
- 
- 	/* move usb phy clk to 24MHz */
--	clk_set_parent(clk[usb_phy_sel], clk[osc]);
-+/*	clk_set_parent(clk[usb_phy_sel], clk[osc]);*/
- 
- 	clk_prepare_enable(clk[gpc_dvfs]);
- 	clk_prepare_enable(clk[ahb_max]); /* esdhc3 */


hooks/post-receive
-- 
armadeus


