omap_cf works again (sync with linux-omap tree)
PATCH 1/1 omap_cf works again (sync with linux-omap tree)
This syncs the omap_cf driver with the one from the linux-omap tree. Changes include fixing build warnings (section mismatch, unused return value) and coping with various pcmcia core changes related to managing i/o memory and irq resources.
Signed-off-by David Brownell <[email protected]>
drivers/pcmcia/omap_cf.c +14 -11
@@ -67,6 +67,7 @@ struct omap_cf_socket {struct platform_device *pdev;unsigned long phys_cf;u_int irq; +struct resource iomem; };#define POLL_INTERVAL (2 * HZ)
@@ -112,16 +113,14 @@ static int omap_cf_get_status(struct pcmif (!sp)return -EINVAL ; -/* FIXME power management should probably be board-specific: -* - 3VCARD vs XVCARD (OSK only handles 3VCARD) -* - POWERON (switched on/off by set_socket) -*/ +/* NOTE CF is always 3VCARD */ if (omap_cf_present ()) {struct omap_cf_socket *cf; *sp =SS_READY |SS_DETECT |SS_POWERON |SS_3VCARD ; cf = container_of(s, struct omap_cf_socket, socket); - s->irq.AssignedIRQ = cf->irq; + s->irq.AssignedIRQ =0 ; + s->pci_irq = cf->irq; }else *sp =0 ;return 0 ;
@@ -132,7 +131,7 @@ omap_cf_set_socket(struct pcmcia_socket {u16 control; -/* FIXME some non-OSK boards will support power switching */ +/* REVISIT some non-OSK boards may support power switching */ switch (s->Vcc) {case 0 :case 33 :
@@ -204,7 +203,7 @@ static struct pccard_operations omap_cf_* "what chipselect is used". Boards could want more. */ -static int __init omap_cf_probe (struct device *dev) +static int __devinit omap_cf_probe (struct device *dev) {unsigned seg;struct omap_cf_socket *cf;
@@ -253,6 +252,9 @@ static int __init omap_cf_probe(struct ddefault : goto fail1; } + cf->iomem.start = cf->phys_cf; + cf->iomem.end = cf->iomem.end +SZ_8K -1 ; + cf->iomem.flags =IORESOURCE_MEM ;/* pcmcia layer only remaps "real" memory */ cf->socket.io_offset = (unsigned long)
@@ -296,6 +298,7 @@ static int __init omap_cf_probe(struct d cf->socket.features =SS_CAP_PCCARD |SS_CAP_STATIC_MAP |SS_CAP_MEM_ALIGN ; cf->socket.map_size =SZ_2K ; + cf->socket.io[0 ].res = &cf->iomem; status =pcmcia_register_socket (&cf->socket);if (status <0 )
@@ -334,15 +337,15 @@ static struct device_driver omap_cf_driv .bus = &platform_bus_type, .probe = omap_cf_probe, .remove = __devexit_p(omap_cf_remove), - .suspend = pcmcia_socket_dev_suspend, - .resume = pcmcia_socket_dev_resume, + .suspend = pcmcia_socket_dev_suspend, + .resume = pcmcia_socket_dev_resume, };static int __init omap_cf_init (void ) {if (cpu_is_omap16xx ()) -driver_register (&omap_cf_driver); -return 0 ; +return driver_register (&omap_cf_driver); +return -ENODEV ; } static void __exit omap_cf_exit(void)