[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-44-gf89143c

[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  f89143c73d4c0addeee69af48ed637eff06c31c9 (commit)
      from  2a968308b1c5f0b05e09e5092a1dfc7405ee5e3a (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 f89143c73d4c0addeee69af48ed637eff06c31c9
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Sep 27 12:31:31 2012 +0200

    [LINUX] apf28: 2.6.35: fix USB connection hang after system supsend/resume

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

Summary of changes:
 .../452-armadeus-mxs-fixes_USB_freescale_bsp.patch |   28 +++++++++++++++++---
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch b/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
index d8ea709..63de12b 100644
--- a/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
+++ b/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
@@ -7,7 +7,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
 ===================================================================
 --- linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
 +++ linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
-@@ -58,11 +58,11 @@ void fsl_phy_usb_utmi_uninit(struct fsl_
+@@ -60,17 +60,17 @@ void fsl_phy_usb_utmi_uninit(struct fsl_
  void fsl_phy_set_power(struct fsl_xcvr_ops *this,
  			struct fsl_usb2_platform_data *pdata, int on)
  {
@@ -23,7 +23,14 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
  	}
  }
  
-@@ -363,6 +363,7 @@ static struct fsl_usb2_platform_data __m
+ static void usb_host_phy_resume(struct fsl_usb2_platform_data *plat)
+ {
+-	fsl_platform_set_usb_phy_dis(plat, 0);
++	/* fsl_platform_set_usb_phy_dis(plat, 0); -- Removed to fix USB connect hang after resume */
+ }
+ 
+ static int internal_phy_clk_already_on;
+@@ -408,6 +408,7 @@ static struct fsl_usb2_platform_data __m
  	.platform_resume = usb_host_phy_resume,
  	.transceiver       = "utmi",
  	.phy_regs          = USBPHY0_PHYS_ADDR,
@@ -31,8 +38,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
  };
  
  /*
-@@ -457,6 +458,11 @@ static struct fsl_usb2_wakeup_platform_d
- 	.usb_clock_for_pm  = usbotg_clock_gate,
+@@ -503,6 +504,11 @@ static struct fsl_usb2_wakeup_platform_d
+ 	.usb_wakeup_exhandle = usbotg_wakeup_event_clear,
  };
  
 +struct fsl_usb2_platform_data * __init usb_dr_get_plateform_data(void)
@@ -56,6 +63,19 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb.h
  /*
   * Determine which platform_data struct to use for the DR controller,
   * based on which transceiver is configured.
+Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_h1.c
+===================================================================
+--- linux-2.6.35.3/arch/arm/mach-mx28/usb_h1.c
++++ linux-2.6.35.3/arch/arm/mach-mx28/usb_h1.c
+@@ -37,7 +37,7 @@ static struct platform_device *h1_pdev;
+ 
+ static void usb_host_phy_resume(struct fsl_usb2_platform_data *plat)
+ {
+-	fsl_platform_set_usb_phy_dis(plat, 0);
++	/*fsl_platform_set_usb_phy_dis(plat, 0); -- Removed to fix USB connect hang after resume */
+ }
+ 
+ static int internal_phy_clk_already_on;
 Index: linux-2.6.35.3/include/linux/fsl_devices.h
 ===================================================================
 --- linux-2.6.35.3/include/linux/fsl_devices.h


hooks/post-receive
-- 
armadeus