ChangeSet 1.1500.8.19, 2004/02/04 17:06:19-08:00, [EMAIL PROTECTED]
[PATCH] USB: Update ohci-omap to compile
Following is a trivial patch to update the ohci-omap.c in 2.6.2 to be in
sync with the OMAP tree. Basically the IRQ name was changed, which keeps
the driver from compiling.
It also includes a cosmetic change to replace inl/outl with readl/writel.
drivers/usb/host/ohci-omap.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff -Nru a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
--- a/drivers/usb/host/ohci-omap.c Mon Feb 9 14:39:17 2004
+++ b/drivers/usb/host/ohci-omap.c Mon Feb 9 14:39:17 2004
@@ -134,7 +134,7 @@
writel(readl(ULPD_SOFT_REQ_REG) | SOFT_USB_REQ,
ULPD_SOFT_REQ_REG);
- outl(inl(ULPD_STATUS_REQ_REG) | USB_HOST_DPLL_REQ,
+ writel(readl(ULPD_STATUS_REQ_REG) | USB_HOST_DPLL_REQ,
ULPD_STATUS_REQ_REG);
}
@@ -248,7 +248,7 @@
val |= (1 << 2); /* Disable pulldown on integrated transceiver DM */
val |= (1 << 1); /* Disable pulldown on integraded transceiver DP */
- outl(val, USB_TRANSCEIVER_CTRL);
+ writel(val, USB_TRANSCEIVER_CTRL);
/* Set the USB0_TRX_MODE */
val = 0;
@@ -256,7 +256,7 @@
val &= ~DEV_IDLE_EN;
val &= ~(7 << 16); /* Clear USB0_TRX_MODE */
val |= (3 << 16); /* 0 or 3, 6-wire DAT/SE0, TRM p 15-159 */
- outl(val, OTG_SYSCON_1);
+ writel(val, OTG_SYSCON_1);
/*
* Control via OTG, see TRM p 15-163
@@ -275,10 +275,10 @@
val |= (4 << 16); /* Must be 4 */
val |= USBX_SYNCHRO; /* Must be set */
val |= SRP_VBUS;
- outl(val, OTG_SYSCON_2);
+ writel(val, OTG_SYSCON_2);
/* Enable OTG idle */
- //outl(inl(OTG_SYSCON_1) | OTG_IDLE_EN, OTG_SYSCON_1);
+ //writel(readl(OTG_SYSCON_1) | OTG_IDLE_EN, OTG_SYSCON_1);
return 0;
}
@@ -631,7 +631,7 @@
.end = OMAP_OHCI_BASE + OMAP_OHCI_SIZE,
},
.irq = {
- INT_OHCI,
+ INT_USB_HHC_1,
},
};
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
