summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-fsl.h
diff options
context:
space:
mode:
authorMatthieu CASTET <matthieu.castet@parrot.com>2010-09-06 18:26:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 19:21:29 +0200
commit65fd42724aee31018b0bb53f4cb04971423be664 (patch)
tree54fa9d5551875be65d979ea34d58e8313461d6f5 /drivers/usb/host/ehci-fsl.h
parentUSB: Kconfig: fix typos in USB_FUNCTIONFS* description (diff)
downloadlinux-65fd42724aee31018b0bb53f4cb04971423be664.tar.xz
linux-65fd42724aee31018b0bb53f4cb04971423be664.zip
USB: ehci tdi : let's tdi_reset set host mode
tdi_reset is already taking care of setting host mode for tdi devices. Don't duplicate code in platform driver. Make ehci_halt a nop if the controller is not in host mode (otherwise it will fail), and let's ehci_reset do the tdi_reset. We need to move hcd->has_tt flags before ehci_halt, in order ehci_halt knows we are a tdi device. Before the setup routine was doing : - put controller in host mode - ehci_halt - ehci_init - hcd->has_tt = 1; - ehci_reset Now we do : - hcd->has_tt = 1; - ehci_halt - ehci_init - ehci_reset PS : now we handle correctly the device -> host transition. Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-fsl.h')
-rw-r--r--drivers/usb/host/ehci-fsl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index b5e59db53347..eb537aa54610 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -27,7 +27,6 @@
#define PORT_PTS_SERIAL (3<<30)
#define PORT_PTS_PTW (1<<28)
#define FSL_SOC_USB_PORTSC2 0x188
-#define FSL_SOC_USB_USBMODE 0x1a8
#define FSL_SOC_USB_SNOOP1 0x400 /* NOTE: big-endian */
#define FSL_SOC_USB_SNOOP2 0x404 /* NOTE: big-endian */
#define FSL_SOC_USB_AGECNTTHRSH 0x408 /* NOTE: big-endian */