In some systems using the Freescale EHCI controller if only one port
of the multiport host (MPH) is being used the other port must be
disabled if there is no clock signal. Since we dont know how someone
will wire a board, we disable the clock if the port is not enabled.
Signed-off-by: Kumar Gala <[email protected]>
---
commit 984d42232fd47ddbeef7c825ec2bafbca9aed5a0
tree 166532f0cd229b1a6f090c43b3617fd49ff3068a
parent 2497a5e4242d500178d6d0f0ce4ee9249a38f5dc
author Kumar Gala <[email protected]> Mon, 23 Jan 2006 16:13:21 -0600
committer Kumar Gala <[email protected]> Mon, 23 Jan 2006 16:13:21 -0600
drivers/usb/host/ehci-fsl.c | 7 +++++++
drivers/usb/host/ehci-fsl.h | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index f40ee41..032fa6b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -161,6 +161,7 @@ static void mpc83xx_setup_phy(struct ehc
unsigned int port_offset)
{
u32 portsc = 0;
+
switch (phy_mode) {
case FSL_USB2_PHY_ULPI:
portsc |= PORT_PTS_ULPI;
@@ -175,6 +176,7 @@ static void mpc83xx_setup_phy(struct ehc
portsc |= PORT_PTS_UTMI;
break;
case FSL_USB2_PHY_NONE:
+ portsc |= PORT_PHCD;
break;
}
writel(portsc, &ehci->regs->port_status[port_offset]);
@@ -209,8 +211,13 @@ static void mpc83xx_usb_setup(struct usb
if (pdata->port_enables & FSL_USB2_PORT0_ENABLED)
mpc83xx_setup_phy(ehci, pdata->phy_mode, 0);
+ else
+ mpc83xx_setup_phy(ehci, FSL_USB2_PHY_NONE, 0);
+
if (pdata->port_enables & FSL_USB2_PORT1_ENABLED)
mpc83xx_setup_phy(ehci, pdata->phy_mode, 1);
+ else
+ mpc83xx_setup_phy(ehci, FSL_USB2_PHY_NONE, 1);
}
/* put controller in host mode. */
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index caac0d1..f579254 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -26,6 +26,7 @@
#define PORT_PTS_ULPI (2<<30)
#define PORT_PTS_SERIAL (3<<30)
#define PORT_PTS_PTW (1<<28)
+#define PORT_PHCD (1<<23)
#define FSL_SOC_USB_PORTSC2 0x188
#define FSL_SOC_USB_USBMODE 0x1a8
#define FSL_SOC_USB_SNOOP1 0x400 /* NOTE: big-endian */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
