mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-20 20:40:44 +09:00
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Change-Id: Ie3ee3a63df7ba098c3480a2f4f5c669a74909688
This commit is contained in:
@@ -201,18 +201,6 @@ static int tegra_usb_resume(struct usb_hcd *hcd)
|
||||
writel(val, &hw->port_status[0]);
|
||||
udelay(10);
|
||||
|
||||
/* Program the field PTC in PORTSC based on the saved speed mode */
|
||||
val = readl(&hw->port_status[0]);
|
||||
val &= ~(TEGRA_USB_PORTSC1_PTC(~0));
|
||||
if (context->port_speed == TEGRA_USB_PHY_PORT_HIGH)
|
||||
val |= TEGRA_USB_PORTSC1_PTC(5);
|
||||
else if (context->port_speed == TEGRA_USB_PHY_PORT_SPEED_FULL)
|
||||
val |= TEGRA_USB_PORTSC1_PTC(6);
|
||||
else if (context->port_speed == TEGRA_USB_PHY_PORT_SPEED_LOW)
|
||||
val |= TEGRA_USB_PORTSC1_PTC(7);
|
||||
writel(val, &hw->port_status[0]);
|
||||
udelay(10);
|
||||
|
||||
/* Disable test mode by setting PTC field to NORMAL_OP */
|
||||
val = readl(&hw->port_status[0]);
|
||||
val &= ~(TEGRA_USB_PORTSC1_PTC(~0));
|
||||
|
||||
Reference in New Issue
Block a user