KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB probe rewrite, really needs testing

Browse source 
SVN-Revision: 7505
This commit is contained in:
Florian Fainelli 2007-06-05 14:03:42 +00:00
parent f111480b82
commit 40f74f411d
1 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
View file

@ -328,9 +328,8 @@ static void admhcd_ed_start(struct admhcd *ahcd, struct admhcd_ed *ed)
ahcd->dma_en |= ADMHCD_DMA_EN; ahcd->dma_en |= ADMHCD_DMA_EN;
} }
static irqreturn_t adm5120hcd_irq(int irq, void *ptr, struct pt_regs *regs) static irqreturn_t adm5120hcd_irq(struct usb_hcd *hcd)
{ {
struct usb_hcd *hcd = (struct usb_hcd *)ptr;
struct admhcd *ahcd = hcd_to_admhcd(hcd); struct admhcd *ahcd = hcd_to_admhcd(hcd);
u32 intstatus; u32 intstatus;
@ -689,6 +688,7 @@ static struct hc_driver adm5120_hc_driver = {
.description = hcd_name, .description = hcd_name,
.product_desc = "ADM5120 HCD", .product_desc = "ADM5120 HCD",
.hcd_priv_size = sizeof(struct admhcd), .hcd_priv_size = sizeof(struct admhcd),
.irq = adm5120hcd_irq,
.flags = HCD_USB11, .flags = HCD_USB11,
.urb_enqueue = admhcd_urb_enqueue, .urb_enqueue = admhcd_urb_enqueue,
.urb_dequeue = admhcd_urb_dequeue, .urb_dequeue = admhcd_urb_dequeue,
@ -707,37 +707,33 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
struct resource *addr, *data; struct resource *addr, *data;
void __iomem *addr_reg; void __iomem *addr_reg;
void __iomem *data_reg; void __iomem *data_reg;
int irq, err = 0;
int err = 0, irq;
if (pdev->num_resources < 3) { if (pdev->num_resources < 3) {
err = -ENODEV; err = -ENODEV;
goto out; goto out;
} }
if (pdev->dev.dma_mask) {
printk(KERN_DEBUG "no we won't dma\n");
return -EINVAL;
}
irq = platform_get_irq(pdev, 0);
data = platform_get_resource(pdev, IORESOURCE_MEM, 0); data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
addr = platform_get_resource(pdev, IORESOURCE_MEM, 1); addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (request_irq(data->start, adm5120hcd_irq, 0, hcd_name, hcd)) {
printk(KERN_WARNING "Could not request IRQ\n");
err = -EBUSY;
goto out;
}
if (!addr || !data || irq < 0) { if (!addr || !data || irq < 0) {
err = -ENODEV; err = -ENODEV;
goto out; goto out;
} }
if (pdev->dev.dma_mask) {
printk(KERN_DEBUG "DMA not supported\n");
err = -EINVAL;
goto out;
}
if (!request_mem_region(addr->start, 2, hcd_name)) { if (!request_mem_region(addr->start, 2, hcd_name)) {
err = -EBUSY; err = -EBUSY;
goto out; goto out;
} }
addr_reg = ioremap(addr->start, resource_len(addr)); addr_reg = ioremap(addr->start, resource_len(addr));
if (addr_reg == NULL) { if (addr_reg == NULL) {
err = -ENOMEM; err = -ENOMEM;
@ -747,27 +743,34 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
err = -EBUSY; err = -EBUSY;
goto out_unmap; goto out_unmap;
} }
data_reg = ioremap(data->start, resource_len(data)); data_reg = ioremap(data->start, resource_len(data));
if (data_reg == NULL) { if (data_reg == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto out_mem; goto out_mem;
} }
hcd = usb_create_hcd(&adm5120_hc_driver, &pdev->dev, pdev->dev.bus_id); hcd = usb_create_hcd(&adm5120_hc_driver, &pdev->dev, pdev->dev.bus_id);
if (!hcd) if (!hcd)
goto out_mem; goto out_mem;
hcd->rsrc_start = addr->start;
ahcd = hcd_to_admhcd(hcd); ahcd = hcd_to_admhcd(hcd);
ahcd->data_reg = data_reg;
ahcd->addr_reg = addr_reg;
spin_lock_init(&ahcd->lock); spin_lock_init(&ahcd->lock);
INIT_LIST_HEAD(&ahcd->async); INIT_LIST_HEAD(&ahcd->async);
ahcd->data_reg = data_reg;
ahcd->addr_reg = addr_reg;
hcd->product_desc = "ADM5120 HCD";
/* Initialise the HCD registers */ /* Initialise the HCD registers */
admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0); admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0);
mdelay(10); mdelay(10);
admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_SW_RESET); admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_SW_RESET);
while (admhcd_reg_get(ahcd, ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET) while (admhcd_reg_get(ahcd, ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET)
mdelay(1); mdelay(1);
@ -793,7 +796,7 @@ out_dev:
out_unmap: out_unmap:
iounmap(addr_reg); iounmap(addr_reg);
out_mem: out_mem:
release_mem_region(addr->start, 2); release_mem_region(pdev->resource[0].start, pdev->resource[0].end - pdev->resource[0].start);
out: out:
return err; return err;
} }