[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-411-g94de369

[Gwenhael Goavec-M. <gwe...@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  94de3699fe386f51ba1a3e793cc65256501e0557 (commit)
      from  bd693c9af17ae4d1134d486eccdc2099bc5db970 (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 94de3699fe386f51ba1a3e793cc65256501e0557
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 23 08:08:16 2013 +0200

    [LINUX][3.11] apf51: usbh1 & usbh2 phys have a reset pin

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

Summary of changes:
 .../device/armadeus/apf51/apf51-linux-3.11.config  |    2 +
 .../3.11/0400-Add-apf51-basic-dt-support.patch     |   32 +++++++++++++++++--
 .../0401-armadeus-add_apf51dev_baseboard.patch     |   14 +++++++--
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config
index 748119c..9287791 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.config
@@ -138,6 +138,8 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_WM831X_WATCHDOG=m
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_WM831X_I2C=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MFD_IMX_IPU_V3=y
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_VIDEO_DEV=m
diff --git a/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
index 8c4e093..4561fca 100644
--- a/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
@@ -3,15 +3,39 @@ Add apf51 basic support
 Signed-off-by: Laurent Cans <lau...@gm...>
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
-Index: linux-3.11-rc1/arch/arm/boot/dts/imx51-apf51.dts
+Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
 ===================================================================
---- linux-3.11-rc1.orig/arch/arm/boot/dts/imx51-apf51.dts
-+++ linux-3.11-rc1/arch/arm/boot/dts/imx51-apf51.dts
-@@ -57,3 +57,26 @@
+--- linux-3.11-rc4.orig/arch/arm/boot/dts/imx51-apf51.dts
++++ linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+@@ -34,6 +34,15 @@
+ 			clock-frequency = <33554432>;
+ 		};
+ 	};
++
++	hsusb_reset_regulator: usb_reset {
++		compatible = "regulator-fixed";
++		regulator-name = "usb_vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		gpio = <&gpio3 1 0>;
++		enable-active-high;
++	};
+ };
+ 
+ &fec {
+@@ -57,3 +66,34 @@
  	pinctrl-0 = <&pinctrl_uart3_2>;
  	status = "okay";
  };
 +
++&usbphy0 {
++	reset-supply = <&hsusb_reset_regulator>;
++};
++
++&usbphy1 {
++	reset-supply = <&hsusb_reset_regulator>;
++};
++
 +&usbh1 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_usbh1_1>;
diff --git a/patches/linux/3.11/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.11/0401-armadeus-add_apf51dev_baseboard.patch
index 362f12c..3ca64a1 100644
--- a/patches/linux/3.11/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.11/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.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
 ===================================================================
---- linux-3.10-rc2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.11-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
 @@ -51,6 +51,14 @@
  	fsl,spi-num-chipselects = <2>;
  	cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
@@ -30,3 +30,11 @@ Index: linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
  	non-removable;
  	status = "okay";
  };
+@@ -91,6 +100,7 @@
+ 				MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+ 				MX51_PAD_GPIO1_2__GPIO1_2    0x0C5
+ 				MX51_PAD_GPIO1_3__GPIO1_3    0x0C5
++				MX51_PAD_DI1_PIN12__GPIO3_1 0x80000000
+ 			>;
+ 		};
+ 	};


hooks/post-receive
-- 
armadeus