[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-omap
Subject:    CF on OSK broken?
From:       dirk.behme () de ! bosch ! com (Dirk Behme)
Date:       2005-09-29 10:36:03
Message-ID: 433C09F5.3020608 () de ! bosch ! com
[Download RAW message or body]

Dirk Behme wrote:
> do I miss anything or is CF card on OSK broken with 2.6.14-rc1-omap1?

Looking into it shows that in drivers/pcmcia/pcmcia_resource.c there was
a change from

if (ret) {
	if (!s->pci_irq)
		return ret;
	irq = s->pci_irq; }

to

/* only assign PCI irq if no IRQ already assigned */
if (ret && !s->irq.AssignedIRQ) {
	if (!s->pci_irq)
		return ret;
	irq = s->pci_irq; }

Not sure if this has to be fixed in pcmcia code or our omap_cf.c, but
with patch in attachment I now get:

=> Instert CF card into OSK:

# hda: TOSHIBA THNCF256MDG, CFA DISK drive
ide0 at 0xc2852000-0xc2852007,0xc285200e on irq 222
hda: max request size: 128KiB
hda: 500736 sectors (256 MB) w/2KiB Cache, CHS=978/16/32
hda: cache flushes not supported
    hda: hda1
ide-cs: hda: Vcc = 3.3, Vpp = 0.0

# mount -t vfat /dev/hda1 /mount
    hda: hda1
#

Dirk

-------------- next part --------------
--- ./drivers/pcmcia/omap_cf.c_orig	2005-09-29 16:11:44.353882904 +0200
+++ ./drivers/pcmcia/omap_cf.c	2005-09-29 16:31:40.779998488 +0200
@@ -122,7 +122,8 @@ static int omap_cf_get_status(struct pcm
 
 		*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;


[prev in list] [next in list] [prev in thread] [next in thread]