[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-391-g7b20dae

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  7b20dae85283cb2c1f546b4a066a4d9d5831f3cd (commit)
       via  10f338e3349858d9eeb472a38143c9130d7dcb96 (commit)
       via  1df015aa2a618aec7205a3691c4491166ed7c59c (commit)
      from  149604c9024176b5ba3272ce82115f2419ee451a (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 7b20dae85283cb2c1f546b4a066a4d9d5831f3cd
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Sat Aug 16 15:16:35 2014 +0200

    [LINUX][3.16] imx27: add a trick to enable usb_div and avoid usb crash

commit 10f338e3349858d9eeb472a38143c9130d7dcb96
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Sat Aug 16 15:15:59 2014 +0200

    [LINUX][3.16] simplify 0444 and 0445

commit 1df015aa2a618aec7205a3691c4491166ed7c59c
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Sat Aug 16 15:15:26 2014 +0200

    [LINUX][3.16] suppress patch 0444-armadeus-fix_phy_init.patch.patch (wrong solution)

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

Summary of changes:
 .../linux/3.16/0444-armadeus-fix_phy_init.patch    |   25 -----------
 .../linux/3.16/0444-armadeus-imx27-add-usb.patch   |   46 +++++--------------
 ...44-armadeus-usb-enable_usb_div_by_default.patch |   19 ++++++++
 ...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch |   18 ++++---
 4 files changed, 41 insertions(+), 67 deletions(-)
 delete mode 100644 patches/linux/3.16/0444-armadeus-fix_phy_init.patch
 create mode 100644 patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch

diff --git a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
deleted file mode 100644
index 78c663c..0000000
--- a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-hw_phymode_configure must be called after usb_phy_init
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
---- linux-3.16/drivers/usb/chipidea/core.c
-+++ linux-3.16/drivers/usb/chipidea/core.c
-@@ -306,17 +306,12 @@ static int ci_usb_phy_init(struct ci_hdr
- 	case USBPHY_INTERFACE_MODE_UTMI:
- 	case USBPHY_INTERFACE_MODE_UTMIW:
- 	case USBPHY_INTERFACE_MODE_HSIC:
--		ret = usb_phy_init(ci->transceiver);
--		if (ret)
--			return ret;
--		hw_phymode_configure(ci);
--		break;
- 	case USBPHY_INTERFACE_MODE_ULPI:
- 	case USBPHY_INTERFACE_MODE_SERIAL:
--		hw_phymode_configure(ci);
- 		ret = usb_phy_init(ci->transceiver);
- 		if (ret)
- 			return ret;
-+		hw_phymode_configure(ci);
- 		break;
- 	default:
- 		ret = usb_phy_init(ci->transceiver);
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
index 734af5e..bb016b8 100644
--- a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
+++ b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
@@ -4,7 +4,9 @@ TODO: add control to external USB VBUS power supply
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
---- linux-3.16/arch/arm/boot/dts/imx27.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27.dtsi
 +++ linux-3.16/arch/arm/boot/dts/imx27.dtsi
 @@ -35,6 +35,9 @@
  		spi0 = &cspi1;
@@ -16,37 +18,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	};
  
  	aitc: aitc-interrupt-controller@e0000000 {
-@@ -446,7 +449,8 @@
- 				compatible = "fsl,imx27-usb";
- 				reg = <0x10024000 0x200>;
- 				interrupts = <56>;
--				clocks = <&clks 75>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
- 				fsl,usbmisc = <&usbmisc 0>;
- 				status = "disabled";
- 			};
-@@ -455,7 +459,8 @@
- 				compatible = "fsl,imx27-usb";
- 				reg = <0x10024200 0x200>;
- 				interrupts = <54>;
--				clocks = <&clks 75>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
- 				fsl,usbmisc = <&usbmisc 1>;
- 				status = "disabled";
- 			};
-@@ -464,7 +469,8 @@
- 				compatible = "fsl,imx27-usb";
- 				reg = <0x10024400 0x200>;
- 				interrupts = <55>;
--				clocks = <&clks 75>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
- 				fsl,usbmisc = <&usbmisc 2>;
- 				status = "disabled";
- 			};
---- linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
+Index: linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/ci_hdrc_imx.c
 +++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
 @@ -57,6 +57,7 @@ static struct imx_usbmisc_data *usbmisc_
  	struct device_node *np = dev->of_node;
@@ -71,7 +45,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	return data;
  }
  
---- linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
+Index: linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/ci_hdrc_imx.h
 +++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
 @@ -18,6 +18,9 @@ struct imx_usbmisc_data {
  	unsigned int disable_oc:1; /* over current detect disabled */
@@ -83,7 +59,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  };
  
  int imx_usbmisc_init(struct imx_usbmisc_data *);
---- linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
+Index: linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/usbmisc_imx.c
 +++ linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
 @@ -42,8 +42,18 @@
  #define MX25_H1_OCPOL_BIT		BIT(2)
diff --git a/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
new file mode 100644
index 0000000..19e14e6
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
@@ -0,0 +1,19 @@
+i.MX27's usb needs three clocks (usb_ipg_gate, usb_ahb_gate and usb_misc)
+but the current chipidea driver implementation, and devicetree, provides 
+only ipg and ahb. Consequently, if the bootloader don't enable the last 
+one, the kernel will crash.
+
+This patch is an temporary solution to enable usb_div.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+--- linux-3.16/arch/arm/mach-imx/clk-imx27.c
++++ linux-3.16/arch/arm/mach-imx/clk-imx27.c
+@@ -279,6 +279,7 @@ int __init mx27_clocks_init(unsigned lon
+ 	mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
+ 
+ 	clk_prepare_enable(clk[emi_ahb_gate]);
++	clk_prepare_enable(clk[usb_div]);
+ 
+ 	imx_print_silicon_rev("i.MX27", mx27_revision());
+ 
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index adb3aaa..6c23dcd 100644
--- a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,7 +2,9 @@ Add APF27 APF27dev USB to device tree
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
---- linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27.dts
 +++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
 @@ -33,6 +33,26 @@
  			clock-frequency = <0>;
@@ -24,7 +26,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +
 +	usbphy0: usbphy@0 {
 +		compatible = "usb-nop-xceiv";
-+		clocks = <&clks 75>;
++		clocks = <&clks 0>;
 +		clock-names = "main_clk";
 +		status = "okay";
 +	};
@@ -55,7 +57,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	};
  };
  
-@@ -75,6 +112,21 @@
+@@ -75,6 +112,20 @@
  	status = "okay";
  };
  
@@ -67,7 +69,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_usbotg>;
 +	fsl,usbphy = <&usbphy0>;
-+	fsl,usbmisc = <&usbmisc 0>;
 +	phy_type = "ulpi";
 +	dr_mode = "otg";
 +	vbus-supply = <&reg_usbotg_vbus>;
@@ -77,7 +78,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  &fec {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_fec1>;
---- linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27dev.dts
 +++ linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
 @@ -60,6 +60,25 @@
  			linux,default-trigger = "heartbeat";
@@ -97,7 +100,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +
 +	usbphy1: usbphy@1 {
 +		compatible = "usb-nop-xceiv";
-+		clocks = <&clks 75>;
++		clocks = <&clks 0>;
 +		clock-names = "main_clk";
 +		status = "okay";
 +	};
@@ -128,7 +131,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	};
  };
  
-@@ -238,3 +273,17 @@
+@@ -238,3 +273,16 @@
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_pwm>;
  };
@@ -137,7 +140,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_usbh1>;
 +	fsl,usbphy = <&usbphy1>;
-+	fsl,usbmisc = <&usbmisc 1>;
 +	phy_type = "serial";
 +	dr_mode = "host";
 +	vbus-supply = <&reg_usbh1_vbus>;


hooks/post-receive
-- 
armadeus


