From ca76d7b58f133bd3f4cf0519ad27fbddf37562a6 Mon Sep 17 00:00:00 2001
From: Michael Schmitz <schmitz@xxxxxxxxxx>
Date: Wed, 23 May 2012 13:52:14 +1200
Subject: [PATCH 11/11] [m68k] Atari: add ISP1160 interrupt enable/disable to isp116x-hcd driver
---
drivers/usb/host/isp116x-hcd.c | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 9e65e30..7ce1546 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -82,6 +82,10 @@ MODULE_LICENSE("GPL");
static const char hcd_name[] = "isp116x-hcd";
+#ifdef CONFIG_ATARI
+static unsigned long *enat_cr; /* EtherNAT CPLD control register for USB interrupt enable */
+#endif
+
/*-----------------------------------------------------------------*/
/*
@@ -594,6 +598,10 @@ static irqreturn_t isp116x_irq(struct usb_hcd *hcd)
irqreturn_t ret = IRQ_NONE;
spin_lock(&isp116x->lock);
+#ifdef CONFIG_ATARI
+ /* Shut out all further interrupts */
+ *enat_cr = (*enat_cr) & 0xFB;
+#endif
isp116x_write_reg16(isp116x, HCuPINTENB, 0);
irqstat = isp116x_read_reg16(isp116x, HCuPINT);
isp116x_write_reg16(isp116x, HCuPINT, irqstat);
@@ -635,6 +643,10 @@ static irqreturn_t isp116x_irq(struct usb_hcd *hcd)
isp116x_write_reg16(isp116x, HCuPINTENB, isp116x->irqenb);
done:
+#ifdef CONFIG_ATARI
+ /* Enable CPLD USB interrupts */
+ *enat_cr = (*enat_cr) | 0x04;
+#endif
spin_unlock(&isp116x->lock);
return ret;
}
@@ -1291,6 +1303,11 @@ static void isp116x_stop(struct usb_hcd *hcd)
u32 val;
spin_lock_irqsave(&isp116x->lock, flags);
+
+#ifdef CONFIG_ATARI
+ /* EtherNAT control register, disable interrupt for USB */
+ *enat_cr = (*enat_cr) & 0xFB;
+#endif
isp116x_write_reg16(isp116x, HCuPINTENB, 0);
/* Switch off ports' power, some devices don't come up
@@ -1394,6 +1411,9 @@ static int isp116x_start(struct usb_hcd *hcd)
isp116x_write_reg32(isp116x, HCRHPORT1, RH_PS_CCS);
isp116x_write_reg32(isp116x, HCRHPORT2, RH_PS_CCS);
+#ifdef CONFIG_ATARI
+ *enat_cr = (*enat_cr) | 0x04; /* EtherNAT control register, enable interrupt for USB */
+#endif
isp116x_show_regs_log(isp116x);
spin_unlock_irqrestore(&isp116x->lock, flags);
return 0;
@@ -1567,6 +1587,9 @@ static int __devinit isp116x_probe(struct platform_device *pdev)
int irq;
int ret = 0;
unsigned long irqflags;
+#ifdef CONFIG_ATARI
+ unsigned long enat_cr_phys;
+#endif
if (usb_disabled())
return -ENODEV;
@@ -1594,6 +1617,19 @@ static int __devinit isp116x_probe(struct platform_device *pdev)
goto err1;
}
+#ifdef CONFIG_ATARI
+ /* map EtherNAT CPLD control register - at 0x23 off board base address */
+ enat_cr_phys = (data->start & 0xffffff00) + 0x23;
+ if (!request_mem_region(enat_cr_phys, 2, hcd_name)) {
+ ret = -EBUSY;
+ goto err1;
+ }
+ enat_cr = ioremap(addr->start, resource_size(addr));
+
+ /* Disable USB interrupt in the EtherNat board */
+ *enat_cr = (*enat_cr) & 0xFB;
+#endif
+
if (!request_mem_region(addr->start, 2, hcd_name)) {
ret = -EBUSY;
goto err1;
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
