[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-387-g5d9f505

[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  5d9f505d4218302284ed719270d942f57220e4d0 (commit)
       via  3f8a6aadf94146f8098991de2876a02b046592fc (commit)
       via  d89239ce96b5ca4457d74fdbbf88884bba53ead9 (commit)
      from  e107b3d8a7e782eeeffc123608d60af6d8abe0cd (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 5d9f505d4218302284ed719270d942f57220e4d0
Merge: 3f8a6aa e107b3d
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Wed Aug 13 17:03:53 2014 +0200

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit 3f8a6aadf94146f8098991de2876a02b046592fc
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Wed Aug 13 17:03:24 2014 +0200

    [LINUX][3.16] usb: switch phy configuration and initialisation

commit d89239ce96b5ca4457d74fdbbf88884bba53ead9
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Wed Aug 13 17:01:45 2014 +0200

    [LINUX][3.16] fix patches 0444, 0445

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

Summary of changes:
 .../linux/3.16/0444-armadeus-fix_phy_init.patch    |   25 +++
 .../linux/3.16/0444-armadeus-imx27-add-usb.patch   |  165 +++++++++++++++
 .../3.16/0444-armadeus-imx27-add-usb.patch.tofix   |  212 --------------------
 ...-armadeus-add-apf27-apf27dev-dts-for-USB.patch} |  175 ++++++++--------
 4 files changed, 278 insertions(+), 299 deletions(-)
 create mode 100644 patches/linux/3.16/0444-armadeus-fix_phy_init.patch
 create mode 100644 patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
 delete mode 100644 patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
 rename patches/linux/3.16/{0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix => 0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch} (62%)

diff --git a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
new file mode 100644
index 0000000..78c663c
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..734af5e
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
@@ -0,0 +1,165 @@
+Add i.MX27 and i.MX31 to the usbmisc driver. (based on Alexexander Shiyan patches)
+
+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
++++ linux-3.16/arch/arm/boot/dts/imx27.dtsi
+@@ -35,6 +35,9 @@
+ 		spi0 = &cspi1;
+ 		spi1 = &cspi2;
+ 		spi2 = &cspi3;
++		usb0 = &usbotg;
++		usb1 = &usbh1;
++		usb2 = &usbh2;
+ 	};
+ 
+ 	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
++++ 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;
+ 	struct of_phandle_args args;
+ 	struct imx_usbmisc_data *data;
++	u32 sic;
+ 	int ret;
+ 
+ 	/*
+@@ -90,6 +91,14 @@ static struct imx_usbmisc_data *usbmisc_
+ 	if (!of_find_property(np, "ext-clk-en", NULL))
+ 		data->ext_clk_en = 1;
+ 
++	if (of_find_property(np, "disable-tll", NULL))
++		data->disable_tll = 1;
++
++	if (!of_property_read_u32(np, "sic", &sic)) {
++		data->enable_sic = 1;
++		data->sic = sic & 0x3;
++	}
++
+ 	return data;
+ }
+ 
+--- linux-3.16/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 */
+ 	unsigned int evdo:1; /* set external vbus divider option */
+ 	unsigned int ext_clk_en:1; /* select the clock from external PHY*/
++	unsigned int disable_tll:1; /* disable transceiver-less link logic */
++	unsigned int enable_sic:1; /* enable serial interface configuration */
++	unsigned int sic:2; /* serial interface configuration */
+ };
+ 
+ int imx_usbmisc_init(struct imx_usbmisc_data *);
+--- linux-3.16/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)
+ 
+ #define MX27_H1_PM_BIT			BIT(8)
++#define MX27_H1_SIC_OFFSET     13
++#define MX27_H1_SIC_MASK       0x00006000
++#define MX27_H1_TLL_BIT            BIT(4)
+ #define MX27_H2_PM_BIT			BIT(16)
++#define USBCTRL_UIE_BIT			BIT(26)
++#define USBCTRL_WIE_BIT			BIT(27)
++#define MX27_H2_SIC_OFFSET     21
++#define MX27_H2_SIC_MASK       0x00600000
++#define MX27_H2_TLL_BIT            BIT(5)
+ #define MX27_OTG_PM_BIT			BIT(24)
++#define MX27_OTG_SIC_OFFSET        29
++#define MX27_OTG_SIC_MASK      0x60000000
+ 
+ #define MX51_USB_OTG_PHY_CTRL_OFFSET	0x00
+ #define MX51_USB_OTG_PHY_CTRL_0_OFFSET	0x08
+@@ -148,28 +158,50 @@ static int usbmisc_imx25_post(struct imx
+ static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
+ {
+ 	unsigned long flags;
+-	u32 val;
++	u32 val = 0;
++	u32 mask;
++	u32 reg;
+ 
+ 	switch (data->index) {
+ 	case 0:
+ 		val = MX27_OTG_PM_BIT;
+ 		break;
+ 	case 1:
+-		val = MX27_H1_PM_BIT;
++		mask = MX27_H1_PM_BIT;
++		if (data->disable_oc)
++			val |= MX27_H1_PM_BIT;
++
++		if (data->enable_sic) {
++			mask |= MX27_H1_SIC_MASK;
++			val |= data->sic << MX27_H1_SIC_OFFSET;
++		}
++
++		if (data->disable_tll)
++			val |= MX27_H1_TLL_BIT;
++
+ 		break;
+ 	case 2:
+-		val = MX27_H2_PM_BIT;
++		mask = MX27_H2_PM_BIT;
++		if (data->disable_oc)
++			val |= MX27_H2_PM_BIT;
++
++		if (data->enable_sic) {
++			mask |= MX27_H2_SIC_MASK;
++			val |= data->sic << MX27_H2_SIC_OFFSET;
++		}
++
++		if (data->disable_tll)
++			val |= MX27_H2_TLL_BIT;
++
+ 		break;
+ 	default:
+ 		return -EINVAL;
+ 	};
+ 
+ 	spin_lock_irqsave(&usbmisc->lock, flags);
+-	if (data->disable_oc)
+-		val = readl(usbmisc->base) | val;
+-	else
+-		val = readl(usbmisc->base) & ~val;
+-	writel(val, usbmisc->base);
++	reg = readl(usbmisc->base);
++	reg = (reg  & ~mask) | val;
++	writel(reg, usbmisc->base);
+ 	spin_unlock_irqrestore(&usbmisc->lock, flags);
+ 
+ 	return 0;
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
deleted file mode 100644
index ec38f11..0000000
--- a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
+++ /dev/null
@@ -1,212 +0,0 @@
-Add i.MX27 and i.MX31 to the usbmisc driver. (based on Alexexander Shiyan patches)
-
-TODO: add control to external USB VBUS power supply
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
---- linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
-@@ -31,6 +31,9 @@
- 		spi0 = &cspi1;
- 		spi1 = &cspi2;
- 		spi2 = &cspi3;
-+		usb0 = &usbotg;
-+		usb1 = &usbh1;
-+		usb2 = &usbh2;
- 	};
- 
- 	aitc: aitc-interrupt-controller@e0000000 {
-@@ -411,6 +414,44 @@
- 				iram = <&iram>;
- 			};
- 
-+			usbotg: usb@10024000 {
-+				compatible = "fsl,imx27-usb";
-+				reg = <0x10024000 0x200>;
-+				interrupts = <56>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
-+				usbmisc = <&usbmisc 0>;
-+				status = "disabled";
-+			};
-+
-+			usbh1: usb@10024200 {
-+				compatible = "fsl,imx27-usb";
-+				reg = <0x10024200 0x200>;
-+				interrupts = <54>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
-+				usbmisc = <&usbmisc 1>;
-+				status = "disabled";
-+			};
-+
-+			usbh2: usb@10024400 {
-+				compatible = "fsl,imx27-usb";
-+				reg = <0x10024400 0x200>;
-+				interrupts = <55>;
-+				clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+				clock-names = "per", "ipg", "ahb";
-+				usbmisc = <&usbmisc 2>;
-+				status = "disabled";
-+			};
-+
-+			usbmisc: usbmisc@10024600 {
-+				#index-cells = <1>;
-+				compatible = "fsl,imx27-usbmisc";
-+				reg = <0x10024600 0x4>;
-+				clocks = <&clks 62>;
-+				status = "disabled";
-+			};
-+
- 			sahara2: sahara@10025000 {
- 				compatible = "fsl,imx27-sahara";
- 				reg = <0x10025000 0x1000>;
---- linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.c
-+++ linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.c
-@@ -37,6 +37,7 @@ static struct imx_usbmisc_data *usbmisc_
- 	struct device_node *np = dev->of_node;
- 	struct of_phandle_args args;
- 	struct imx_usbmisc_data *data;
-+	u32 sic;
- 	int ret;
- 
- 	/*
-@@ -70,6 +71,14 @@ static struct imx_usbmisc_data *usbmisc_
- 	if (!of_find_property(np, "ext-clk-en", NULL))
- 		data->ext_clk_en = 1;
- 
-+	if (of_find_property(np, "disable-tll", NULL))
-+		data->disable_tll = 1;
-+
-+	if (!of_property_read_u32(np, "sic", &sic)) {
-+		data->enable_sic = 1;
-+		data->sic = sic & 0x3;
-+	}
-+
- 	return data;
- }
- 
---- linux-3.13-rc8.ref2/drivers/usb/chipidea/ci_hdrc_imx.h
-+++ linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.h
-@@ -15,6 +15,9 @@ struct imx_usbmisc_data {
- 	unsigned int disable_oc:1; /* over current detect disabled */
- 	unsigned int evdo:1; /* set external vbus divider option */
- 	unsigned int ext_clk_en:1; /* select the clock from external PHY*/
-+	unsigned int disable_tll:1; /* disable transceiver-less link logic */
-+	unsigned int enable_sic:1; /* enable serial interface configuration */
-+	unsigned int sic:2; /* serial interface configuration */
- };
- 
- int imx_usbmisc_init(struct imx_usbmisc_data *);
---- linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
-+++ linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
-@@ -21,6 +21,18 @@
- #define MX25_USB_PHY_CTRL_OFFSET	0x08
- #define MX25_BM_EXTERNAL_VBUS_DIVIDER	BIT(23)
- 
-+#define MX27_H1_PM_BIT			BIT(8)
-+#define MX27_H1_SIC_OFFSET		13
-+#define MX27_H1_SIC_MASK		0x00006000
-+#define MX27_H1_TLL_BIT			BIT(4)
-+#define MX27_H2_PM_BIT			BIT(16)
-+#define MX27_H2_SIC_OFFSET		21
-+#define MX27_H2_SIC_MASK		0x00600000
-+#define MX27_H2_TLL_BIT			BIT(5)
-+#define MX27_OTG_PM_BIT			BIT(24)
-+#define MX27_OTG_SIC_OFFSET		29
-+#define MX27_OTG_SIC_MASK		0x60000000
-+
- #define MX51_USB_OTG_PHY_CTRL_OFFSET	0x00
- #define MX51_USB_OTG_PHY_CTRL_0_OFFSET	0x08
- #define MX51_USB_OTG_PHY_CTRL_1_OFFSET	0x0c
-@@ -170,6 +182,66 @@ static int usbmisc_imx51_post(struct imx
- 	return 0;
- }
- 
-+static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
-+{
-+	unsigned long flags;
-+	u32 val=0;
-+	u32 mask;
-+	u32 reg;
-+
-+	switch (data->index) {
-+	case 0:
-+		mask = MX27_OTG_PM_BIT;
-+		if (data->disable_oc)
-+			val |= MX27_OTG_PM_BIT;
-+
-+		if (data->enable_sic) {
-+			mask |= MX27_OTG_SIC_MASK;
-+			val |= data->sic << MX27_OTG_SIC_OFFSET;
-+		}
-+
-+		break;
-+	case 1:
-+		mask = MX27_H1_PM_BIT;
-+		if (data->disable_oc)
-+			val |= MX27_H1_PM_BIT;
-+
-+		if (data->enable_sic) {
-+			mask |= MX27_H1_SIC_MASK;
-+			val |= data->sic << MX27_H1_SIC_OFFSET;
-+		}
-+
-+		if (data->disable_tll)
-+			val |= MX27_H1_TLL_BIT;
-+
-+		break;
-+	case 2:
-+		mask = MX27_H2_PM_BIT;
-+		if (data->disable_oc)
-+			val |= MX27_H2_PM_BIT;
-+
-+		if (data->enable_sic) {
-+			mask |= MX27_H2_SIC_MASK;
-+			val |= data->sic << MX27_H2_SIC_OFFSET;
-+		}
-+
-+		if (data->disable_tll)
-+			val |= MX27_H2_TLL_BIT;
-+
-+		break;
-+	default:
-+		return -EINVAL;
-+	};
-+
-+	spin_lock_irqsave(&usbmisc->lock, flags);
-+	reg = readl(usbmisc->base);
-+	reg = (reg  & ~mask) | val;
-+	writel(reg, usbmisc->base);
-+	spin_unlock_irqrestore(&usbmisc->lock, flags);
-+
-+	return 0;
-+}
-+
- static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
- {
- 	void __iomem *reg = NULL;
-@@ -235,6 +307,10 @@ static const struct usbmisc_ops imx51_us
- 	.post = usbmisc_imx51_post,
- };
- 
-+static const struct usbmisc_ops imx27_usbmisc_ops = {
-+	.init = usbmisc_imx27_init,
-+};
-+
- static const struct usbmisc_ops imx53_usbmisc_ops = {
- 	.init = usbmisc_imx53_init,
- };
-@@ -273,7 +349,10 @@ static const struct of_device_id usbmisc
- 		.data = &imx51_usbmisc_ops,
- 	},
- 	{
--		.compatible = "fsl,imx53-usbmisc",
-+		.compatible = "fsl,imx27-usbmisc",
-+		.data = &imx27_usbmisc_ops,
-+	},
-+	{	.compatible = "fsl,imx53-usbmisc",
- 		.data = &imx53_usbmisc_ops,
- 	},
- 	{
---
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 62%
rename from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
rename to patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index 836eaad..adb3aaa 100644
--- a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
+++ b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,31 +2,27 @@ Add APF27 APF27dev USB to device tree
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
---- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -16,6 +16,17 @@
- 	model = "Armadeus Systems APF27Dev docking/development board";
- 	compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
- 
+--- linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+@@ -33,6 +33,26 @@
+ 			clock-frequency = <0>;
+ 		};
+ 	};
++
 +	regulators {
 +		compatible = "simple-bus";
++		#address-cells = <1>;
++		#size-cells = <0>;
 +
-+		reg_usbh1_vbus: usbh1_vbus {
++		reg_usbotg_vbus: usbotg_vbus {
 +			compatible = "regulator-fixed";
-+			regulator-name = "usbh1_vbus";
++			regulator-name = "usbotg_vbus";
 +			regulator-min-microvolt = <5000000>;
 +			regulator-max-microvolt = <5000000>;
 +		};
 +	};
 +
- 	display: display {
- 		model = "Chimei-LW700AT9003";
- 		native-mode = <&timing0>;
-@@ -56,6 +67,12 @@
- 		};
- 	};
- 
-+	usbphy1: usbphy@1 {
++	usbphy0: usbphy@0 {
 +		compatible = "usb-nop-xceiv";
 +		clocks = <&clks 75>;
 +		clock-names = "main_clk";
@@ -34,114 +30,119 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	};
  };
  
- &cspi1 {
-@@ -130,6 +147,23 @@
+ &iomuxc {
+@@ -66,6 +86,23 @@
+ 				MX27_PAD_UART1_RXD__UART1_RXD 0x0
  			>;
  		};
- 	};
 +
-+	usbh1 {
-+		pinctrl_usbh1: usbh1 {
++		pinctrl_usbotg: usbotg {
 +			fsl,pins = <
-+				MX27_PAD_USBH1_SUSP__USBH1_SUSP 0
-+				MX27_PAD_USB_PWR__USB_PWR 0
-+				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
-+				MX27_PAD_USBH1_TXDM__USBH1_TXDM 0
-+				MX27_PAD_USBH1_TXDP__USBH1_TXDP 0
-+				MX27_PAD_USBH1_RXDM__USBH1_RXDM 0
-+				MX27_PAD_USBH1_RXDP__USBH1_RXDP 0
++				MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
++				MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
++				MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
++				MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
++				MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
++				MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
++				MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
++				MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
++				MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
++				MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
++				MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
++				MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
 +			>;
 +		};
-+	};
+ 	};
  };
  
- &sdhci2 {
-@@ -139,3 +173,16 @@
- 	pinctrl-0 = <&pinctrl_sdhc2_1>;
+@@ -75,6 +112,21 @@
  	status = "okay";
  };
+ 
++&usbmisc {
++   status = "okay";
++};
 +
-+&usbh1 {
++&usbotg {
 +	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>;
-+	sic = <0>;
-+	disable-tll;
++	pinctrl-0 = <&pinctrl_usbotg>;
++	fsl,usbphy = <&usbphy0>;
++	fsl,usbmisc = <&usbmisc 0>;
++	phy_type = "ulpi";
++	dr_mode = "otg";
++	vbus-supply = <&reg_usbotg_vbus>;
++	disable-over-current;
 +	status = "okay";
 +};
---- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-@@ -32,6 +32,24 @@
- 			clock-frequency = <0>;
+ &fec {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_fec1>;
+--- linux-3.16/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";
  		};
  	};
 +
 +	regulators {
 +		compatible = "simple-bus";
 +
-+		reg_usbotg_vbus: usbotg_vbus {
++		reg_usbh1_vbus: usbh1_vbus {
 +			compatible = "regulator-fixed";
-+			regulator-name = "usbotg_vbus";
++			regulator-name = "usbh1_vbus";
 +			regulator-min-microvolt = <5000000>;
 +			regulator-max-microvolt = <5000000>;
 +		};
 +	};
 +
-+	usbphy0: usbphy@0 {
++	usbphy1: usbphy@1 {
 +		compatible = "usb-nop-xceiv";
 +		clocks = <&clks 75>;
 +		clock-names = "main_clk";
 +		status = "okay";
 +	};
++
  };
  
- &uart1 {
-@@ -87,3 +105,40 @@
- 		reg = <0x800000 0xf800000>;
+ &cspi1 {
+@@ -223,6 +242,22 @@
+ 		pinctrl_sdhc2_cd: sdhc2cdgrp {
+ 			fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
+ 		};
++
++		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 0
++				MX27_PAD_USBH1_RCV__USBH1_RCV 0
++				MX27_PAD_USBH1_FS__USBH1_FS 0
++				MX27_PAD_USBH1_OE_B__USBH1_OE_B 0
++				MX27_PAD_USBH1_TXDM__USBH1_TXDM 0
++				MX27_PAD_USBH1_TXDP__USBH1_TXDP 0
++				MX27_PAD_USBH1_RXDM__USBH1_RXDM 0
++				MX27_PAD_USBH1_RXDP__USBH1_RXDP 0
++			>;
++		};
++
  	};
  };
+ 
+@@ -238,3 +273,17 @@
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_pwm>;
+ };
 +
-+&usbmisc {
-+	status = "okay";
-+};
-+
-+&usbotg {
++&usbh1 {
 +	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>;
-+	disable-over-current;
++	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";
 +};
 +
-+&iomuxc {
-+	usbotg {
-+		pinctrl_usbotg: usbotg {
-+			fsl,pins = <
-+				MX27_PAD_USBOTG_NXT__USBOTG_NXT 0
-+				MX27_PAD_USBOTG_STP__USBOTG_STP 0
-+				MX27_PAD_USBOTG_DIR__USBOTG_DIR 0
-+				MX27_PAD_USBOTG_CLK__USBOTG_CLK 0
-+				MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0
-+				MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0
-+				MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0
-+				MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0
-+				MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0
-+				MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0
-+				MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0
-+				MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0
-+			>;
-+		};
-+	};
-+};
---


hooks/post-receive
-- 
armadeus