Skip to contentSkip to conversation

Update ohci-omap to compile

PATCH Applied Tony Lindgren 2 participants 2 messages Feb 4, 2004 – Feb 5, 2004

Subsystems (3)
USB USB ohci driver OMAP USB support
lore
Share & tools
lore

Tony Lindgren

author
#0 lore raw

PATCH 1/1 Update ohci-omap to compile

Hi Greg,

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. Can you please apply?

Regards,

Tony

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1551 -> 1.1552
# drivers/usb/host/ohci-omap.c 1.1 -> 1.2
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/02/04 [email protected] 1.1552
# Patch to update the mainline ohci-omap.c with the current version # - Changed irq name from INT_OHCI to INT_USB_HHC_1
# - Cosmetic fix to replace inl/outl with readl/writel
# --------------------------------------------
#

drivers/usb/host/ohci-omap.c +6 -6
diff -Nru a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
@@ -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,
 	},
 };
Applied
#1 lore raw
Quoted 8 lines · Tony Lindgren

Hi Greg,

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. Can you please apply?

Applied, thanks,

greg k-h