diff options
| author | Russell Robinson Jr <rrobinson@phytec.com> | 2013-08-09 16:58:01 -0700 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2013-09-17 14:22:18 -0400 |
| commit | 734200d17cf5e8b20e50ecf24f682ff233a20554 (patch) | |
| tree | 9f8cbad536c6786b0f2c700478b257e40456f9a1 /drivers | |
| parent | 31c2750be324136ea634cdb5eded0b673119f6dd (diff) | |
pcl052: revert usb0 to device mode
Signed-off-by: Russell Robinson Jr <rrobinson@phytec.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/hub.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 5fa3206886df..ef1b40c69986 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -43,11 +43,16 @@ extern void fsl_platform_set_usb_phy_dis(struct fsl_usb2_platform_data *pdata, #define MVF_USB_HOST_HACK #include <linux/fsl_devices.h> -extern void fsl_platform_set_usb0_phy_dis(struct fsl_usb2_platform_data *pdata, - bool enable); +#if (defined(CONFIG_MACH_PCM052) || defined(CONFIG_MACH_PCL052)) extern void fsl_platform_set_usb1_phy_dis(struct fsl_usb2_platform_data *pdata, bool enable); #endif +#if defined(CONFIG_MACH_PCM052) +extern void fsl_platform_set_usb0_phy_dis(struct fsl_usb2_platform_data *pdata, + bool enable); +#endif +#endif + /* if we are in debug mode, always announce new devices */ #ifdef DEBUG #ifndef CONFIG_USB_ANNOUNCE_NEW_DEVICES @@ -1674,14 +1679,16 @@ void usb_disconnect(struct usb_device **pdev) udev->devnum); #ifdef MVF_USB_HOST_HACK if (udev->speed == USB_SPEED_HIGH && udev->level == 1) -#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052) - { - fsl_platform_set_usb0_phy_dis(NULL, 0); - fsl_platform_set_usb1_phy_dis(NULL, 0); - } + { +#if (defined(CONFIG_MACH_PCM052) || defined(CONFIG_MACH_PCL052)) + fsl_platform_set_usb1_phy_dis(NULL, 0); +#if defined(CONFIG_MACH_PCM052) + fsl_platform_set_usb0_phy_dis(NULL, 0); +#endif #else fsl_platform_set_usb_phy_dis(NULL, 0); #endif + } #endif usb_lock_device(udev); @@ -2929,14 +2936,16 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, } #ifdef MVF_USB_HOST_HACK if (udev->speed == USB_SPEED_HIGH && udev->level == 1) -#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052) - { - fsl_platform_set_usb0_phy_dis(NULL, 1); - fsl_platform_set_usb1_phy_dis(NULL, 1); - } + { +#if (defined(CONFIG_MACH_PCM052) || defined(CONFIG_MACH_PCL052)) + fsl_platform_set_usb1_phy_dis(NULL, 1); +#if defined(CONFIG_MACH_PCM052) + fsl_platform_set_usb0_phy_dis(NULL, 1); +#endif #else fsl_platform_set_usb_phy_dis(NULL, 1); #endif + } #endif /* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way? * Because device hardware and firmware is sometimes buggy in |