From 6f0257d5e711a0744acccaadd104917c5b7257bd Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 4 Feb 2004 01:06:19 -0800 Subject: [PATCH] [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 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index d664ed24f9873..7b8a80227a0a7 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -134,7 +134,7 @@ static int omap_ohci_clock_power(int on) 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 @@ static int omap_1610_usb_init(int mode) 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 @@ static int omap_1610_usb_init(int mode) 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 @@ static int omap_1610_usb_init(int mode) 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 @@ static struct omap_dev ohci_hcd_omap_device = { .end = OMAP_OHCI_BASE + OMAP_OHCI_SIZE, }, .irq = { - INT_OHCI, + INT_USB_HHC_1, }, }; -- 2.53.0