[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-64-gfb71824

[jorasse <jo...@us...>]

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  fb71824e5dc68a1fa3fac271b23434da31620da5 (commit)
      from  e722cc699571ca95444b9e8ac36182cdcca84ebe (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 fb71824e5dc68a1fa3fac271b23434da31620da5
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jan 22 23:47:04 2014 +0100

    [LINUX] 3.13: apf27: add 2 USB ports to the apf27 device tree

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

Summary of changes:
 ...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch |   96 ++++++++++++++++----
 1 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index ee3c42e..836eaad 100644
--- a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -1,20 +1,51 @@
-Add APF27 APF27dev USB to DTS
+Add APF27 APF27dev USB to device tree
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27dev.dts
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
 +++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -130,6 +130,23 @@
+@@ -16,6 +16,17 @@
+ 	model = "Armadeus Systems APF27Dev docking/development board";
+ 	compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
+ 
++	regulators {
++		compatible = "simple-bus";
++
++		reg_usbh1_vbus: usbh1_vbus {
++			compatible = "regulator-fixed";
++			regulator-name = "usbh1_vbus";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++		};
++	};
++
+ 	display: display {
+ 		model = "Chimei-LW700AT9003";
+ 		native-mode = <&timing0>;
+@@ -56,6 +67,12 @@
+ 		};
+ 	};
+ 
++	usbphy1: usbphy@1 {
++		compatible = "usb-nop-xceiv";
++		clocks = <&clks 75>;
++		clock-names = "main_clk";
++		status = "okay";
++	};
+ };
+ 
+ &cspi1 {
+@@ -130,6 +147,23 @@
  			>;
  		};
  	};
 +
-+	usbh2 {
-+		pinctrl_usbh2: usbh2 {
++	usbh1 {
++		pinctrl_usbh1: usbh1 {
 +			fsl,pins = <
 +				MX27_PAD_USBH1_SUSP__USBH1_SUSP 0
 +				MX27_PAD_USB_PWR__USB_PWR 0
-+				MX27_PAD_USB_OC_B__USB_OC_B 1
++				MX27_PAD_USB_OC_B__USB_OC_B 0
 +				MX27_PAD_USBH1_RCV__USBH1_RCV 0
 +				MX27_PAD_USBH1_FS__USBH1_FS 0
 +				MX27_PAD_USBH1_OE_B__USBH1_OE_B 0
@@ -28,39 +59,68 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  };
  
  &sdhci2 {
-@@ -139,3 +156,15 @@
+@@ -139,3 +173,16 @@
  	pinctrl-0 = <&pinctrl_sdhc2_1>;
  	status = "okay";
  };
 +
-+&usbphy2 {
-+	status = "okay";
-+};
-+
-+&usbh2 {
++&usbh1 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usbh2>;
++	pinctrl-0 = <&pinctrl_usbh1>;
++	fsl,usbphy = <&usbphy1>;
++	fsl,usbmisc = <&usbmisc 1>;
 +	phy_type = "serial";
 +	dr_mode = "host";
++	vbus-supply = <&reg_usbh1_vbus>;
++	sic = <0>;
++	disable-tll;
 +	status = "okay";
 +};
-
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
 +++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-@@ -87,3 +87,36 @@
+@@ -32,6 +32,24 @@
+ 			clock-frequency = <0>;
+ 		};
+ 	};
++
++	regulators {
++		compatible = "simple-bus";
++
++		reg_usbotg_vbus: usbotg_vbus {
++			compatible = "regulator-fixed";
++			regulator-name = "usbotg_vbus";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++		};
++	};
++
++	usbphy0: usbphy@0 {
++		compatible = "usb-nop-xceiv";
++		clocks = <&clks 75>;
++		clock-names = "main_clk";
++		status = "okay";
++	};
+ };
+ 
+ &uart1 {
+@@ -87,3 +105,40 @@
  		reg = <0x800000 0xf800000>;
  	};
  };
 +
-+&usbphy0 {
++&usbmisc {
 +	status = "okay";
 +};
 +
 +&usbotg {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_usbotg>;
++	fsl,usbphy = <&usbphy0>;
++	fsl,usbmisc = <&usbmisc 0>;
 +	phy_type = "ulpi";
-+	dr_mode = "host";
++	dr_mode = "otg";
++	vbus-supply = <&reg_usbotg_vbus>;
++	disable-over-current;
 +	status = "okay";
 +};
 +


hooks/post-receive
-- 
armadeus