[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-184-g05c79e4

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  05c79e4b2c4801f23ae32acec7a5736f8e946f8e (commit)
      from  46c961f20d09a433c47b2ba26cd1736a7cd5f3a4 (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 05c79e4b2c4801f23ae32acec7a5736f8e946f8e
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Mar 3 21:36:24 2014 +0100

    [LINUX] 3.14: APF51: Add missing patches forgotten during rc4 -> rc5

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

Summary of changes:
 .../0401-armadeus-add_apf51dev_baseboard.patch     |   16 ++++++++++++----
 ...-imx51_dts-add_usbphy_for_host1_and_host2.patch |   14 +++++++-------
 ...ot_link_otg_phy_clock_directly_to_osc_ref.patch |    0
 ...k_otg_phy_clock_directly_to_osc_ref.patch.tofix |   17 -----------------
 4 files changed, 19 insertions(+), 28 deletions(-)
 copy patches/linux/{3.14 => 3.14-rc5}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch (100%)
 delete mode 100644 patches/linux/3.14-rc5/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix

diff --git a/patches/linux/3.14-rc5/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.14-rc5/0401-armadeus-add_apf51dev_baseboard.patch
index 72506dc..515d37c 100644
--- a/patches/linux/3.14-rc5/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.14-rc5/0401-armadeus-add_apf51dev_baseboard.patch
@@ -3,10 +3,10 @@ The APF51Dev is a docking board for an APF51 SOM
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 Signed-off-by: Laurent Cans <lau...@gm...>
 ---
-Index: linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
 ===================================================================
---- linux-3.13-rc7.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
 @@ -61,6 +61,12 @@
  			gpios = <&gpio1 2 0>;
  			linux,default-trigger = "heartbeat";
@@ -57,7 +57,15 @@ Index: linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
  &iomuxc {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_hog>;
-@@ -118,6 +138,8 @@
+@@ -109,6 +129,7 @@
+ 	hog {
+ 		pinctrl_hog: hoggrp {
+ 			fsl,pins = <
++				MX51_PAD_GPIO1_8__GPIO1_8    0x0C5
+ 				MX51_PAD_EIM_EB2__GPIO2_22   0x0C5
+ 				MX51_PAD_EIM_EB3__GPIO2_23   0x0C5
+ 				MX51_PAD_EIM_CS4__GPIO2_29   0x100
+@@ -118,6 +139,8 @@
  				MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
  				MX51_PAD_GPIO1_2__GPIO1_2    0x0C5
  				MX51_PAD_GPIO1_3__GPIO1_3    0x0C5
diff --git a/patches/linux/3.14-rc5/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.14-rc5/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
index 24422f2..40e8ce1 100644
--- a/patches/linux/3.14-rc5/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
+++ b/patches/linux/3.14-rc5/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-rc5/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/3.14-rc5/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/patches/linux/3.14-rc5/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix b/patches/linux/3.14-rc5/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-rc5/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


