Merge branch 'android-tegra-nv-3.4' into android-t114-3.4
Varun Wadekar [Thu, 5 Jul 2012 07:16:57 +0000 (12:16 +0530)]
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c

Change-Id: I9ce33061dcbf7ce41a2fe04da4e7b754b2a659c8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

1  2 
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/board-p1852.c
arch/arm/mach-tegra/tegra2_usb_phy.c
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
arch/arm/mm/Kconfig
arch/arm/mm/mmu.c
drivers/tty/serial/tegra_hsuart.c
drivers/usb/host/ehci-tegra.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -278,9 -261,11 +278,9 @@@ static int tegra_ehci_hub_control
                switch (typeReq) {
                case SetPortFeature:
                        if (wValue == USB_PORT_FEAT_SUSPEND) {
 -                              /* Need a 4ms delay for controller to suspend */
 -                              mdelay(4);
                                tegra_usb_phy_post_suspend(tegra->phy);
                        } else if (wValue == USB_PORT_FEAT_RESET) {
-                               if (ehci->reset_done[0] && wIndex == 0)
+                               if (ehci->reset_done[0] && wIndex == 1)
                                        tegra_usb_phy_bus_reset(tegra->phy);
                        } else if (wValue == USB_PORT_FEAT_POWER) {
                                if (wIndex == 1)