[PATCH] pata_pcmcia: another memory card support

[PATCH] pata_pcmcia: another memory card support

[Marc Pignat]

Support for Apacer photo steno pro card.

Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
---

Hi all!

Here is a new ID for ide-cs and pata_pcmcia. I tried all the card
I can find in the labs, only this one was unknown.

Best regards

Marc



diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 271cb64..64b2e22 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
 	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
 	PCMCIA_DEVICE_NULL,
 };
 
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index cb199c8..f50210f 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
 	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
 	PCMCIA_DEVICE_NULL,
 };
 MODULE_DEVICE_TABLE(pcmcia, ide_ids);

Re: [PATCH] pata_pcmcia: another memory card support

[Komuro]

Hi,

Could you post the output of lspcmcia -vv?

I think it is better to use "PCMCIA_DEVICE_PROD_ID12"
instead of "PCMCIA_DEVICE_PROD_ID2"

> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),


Best Regards
Komuro


> Support for Apacer photo steno pro card.
> 
> Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
> ---
> 
> Hi all!
> 
> Here is a new ID for ide-cs and pata_pcmcia. I tried all the card
> I can find in the labs, only this one was unknown.
> 
> Best regards
> 
> Marc
> 
> 
> 
> diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
> index 271cb64..64b2e22 100644
> --- a/drivers/ata/pata_pcmcia.c
> +++ b/drivers/ata/pata_pcmcia.c
> @@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>  	PCMCIA_DEVICE_NULL,
>  };
>  
> diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
> index cb199c8..f50210f 100644
> --- a/drivers/ide/ide-cs.c
> +++ b/drivers/ide/ide-cs.c
> @@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>  	PCMCIA_DEVICE_NULL,
>  };
>  MODULE_DEVICE_TABLE(pcmcia, ide_ids);
> 
> _______________________________________________
> Linux PCMCIA reimplementation list
> http://lists.infradead.org/mailman/listinfo/linux-pcmcia


-- 
Komuro <komurojun-mbn@nifty.com>

Re: [PATCH] pata_pcmcia: another memory card support

[Marc Pignat]

Hi!

On Thursday 06 November 2008, Komuro wrote:
...
> Could you post the output of lspcmcia -vv?

Here it is:
armebs3:~# lspcmcia -vv
Socket 0 Bridge:        [at91_cf]       (bus ID: at91_cf)
        Configuration:  state: on       ready: yes
                        Voltage: 3.3V Vcc: 3.3V Vpp: 0.0V
                        Available IRQs: none
Socket 0 Device 0:      [pata_pcmcia]           (bus ID: 0.0)
        Configuration:  state: on
        Product Name:    512MB Flash Card 55LD017-A2 CFCA217I
        Identification: manf_id: 0x00bf card_id: 0x0001
                        function: 4 (fixed disk)
                        prod_id(1): " 512MB" (0xdc108d0e)
                        prod_id(2): "Flash Card" (0x5a362506)
                        prod_id(3): "55LD017-A2" (0xc0ede6dd)
                        prod_id(4): "CFCA217I" (0x8c1a6afb)
armebs3:~#        
> 
> I think it is better to use "PCMCIA_DEVICE_PROD_ID12"
> instead of "PCMCIA_DEVICE_PROD_ID2"
> 
> > +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),

I don't want to hardcode the size, however I'm not sure if other size have the
same prod_id2. " 512MB" with the space at the begginning let me hope there is
some card exists with 1024, 2048, ... or anything else in that place.

Best regards

Marc

Re: [PATCH] pata_pcmcia: another memory card support

[Komuro]

> > 
> > > +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
> 
> I don't want to hardcode the size, however I'm not sure if other size have the
> same prod_id2. " 512MB" with the space at the begginning let me hope there is
> some card exists with 1024, 2048, ... or anything else in that place.
> 

OK. You are right.
Thanks!


Best Regards
Komuro

Re: [PATCH] pata_pcmcia: another memory card support

[Dominik Brodowski]

On Thu, Nov 06, 2008 at 11:44:34AM +0100, Marc Pignat wrote:
> Support for Apacer photo steno pro card.

Applied, many thanks!

	Dominik

Re: [PATCH] pata_pcmcia: another memory card support

[Jeff Garzik]

Marc Pignat wrote:
> Support for Apacer photo steno pro card.
> 
> Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
> ---
> 
> Hi all!
> 
> Here is a new ID for ide-cs and pata_pcmcia. I tried all the card
> I can find in the labs, only this one was unknown.
> 
> Best regards
> 
> Marc
> 
> 
> 
> diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
> index 271cb64..64b2e22 100644
> --- a/drivers/ata/pata_pcmcia.c
> +++ b/drivers/ata/pata_pcmcia.c
> @@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>  	PCMCIA_DEVICE_NULL,
>  };
>  
> diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
> index cb199c8..f50210f 100644
> --- a/drivers/ide/ide-cs.c
> +++ b/drivers/ide/ide-cs.c
> @@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>  	PCMCIA_DEVICE_NULL,
>  };
>  MODULE_DEVICE_TABLE(pcmcia, ide_ids);
> --

applied pata_pcmcia bit

Re: [PATCH] pata_pcmcia: another memory card support

[Dominik Brodowski]

Jeff,

On Tue, Nov 11, 2008 at 03:02:23AM -0500, Jeff Garzik wrote:
> Marc Pignat wrote:
> > Support for Apacer photo steno pro card.
> > 
> > Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
> > ---
> > 
> > Hi all!
> > 
> > Here is a new ID for ide-cs and pata_pcmcia. I tried all the card
> > I can find in the labs, only this one was unknown.
> > 
> > Best regards
> > 
> > Marc
> > 
> > 
> > 
> > diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
> > index 271cb64..64b2e22 100644
> > --- a/drivers/ata/pata_pcmcia.c
> > +++ b/drivers/ata/pata_pcmcia.c
> > @@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
> >  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
> >  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
> >  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> > +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
> >  	PCMCIA_DEVICE_NULL,
> >  };
> >  
> > diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
> > index cb199c8..f50210f 100644
> > --- a/drivers/ide/ide-cs.c
> > +++ b/drivers/ide/ide-cs.c
> > @@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
> >  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
> >  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
> >  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
> > +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
> >  	PCMCIA_DEVICE_NULL,
> >  };
> >  MODULE_DEVICE_TABLE(pcmcia, ide_ids);
> > --
> 
> applied pata_pcmcia bit

could we merge such stuff through pcmcia-git in future, please? (see
http://git.kernel.org/?p=linux/kernel/git/brodo/pcmcia-2.6.git;a=commitdiff;h=980fc29f20f5cfb8cef29ddfccecb685f299ada4
) Else the device tables in ide-cs and pata_pcmcia will diverge again.

Thanks,
	Dominik

Re: [PATCH] pata_pcmcia: another memory card support

[Jeff Garzik]

Dominik Brodowski wrote:
> Jeff,
> 
> On Tue, Nov 11, 2008 at 03:02:23AM -0500, Jeff Garzik wrote:
>> Marc Pignat wrote:
>>> Support for Apacer photo steno pro card.
>>>
>>> Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
>>> ---
>>>
>>> Hi all!
>>>
>>> Here is a new ID for ide-cs and pata_pcmcia. I tried all the card
>>> I can find in the labs, only this one was unknown.
>>>
>>> Best regards
>>>
>>> Marc
>>>
>>>
>>>
>>> diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
>>> index 271cb64..64b2e22 100644
>>> --- a/drivers/ata/pata_pcmcia.c
>>> +++ b/drivers/ata/pata_pcmcia.c
>>> @@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
>>>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>>>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>>>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
>>> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>>>  	PCMCIA_DEVICE_NULL,
>>>  };
>>>  
>>> diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
>>> index cb199c8..f50210f 100644
>>> --- a/drivers/ide/ide-cs.c
>>> +++ b/drivers/ide/ide-cs.c
>>> @@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
>>>  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
>>>  	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
>>>  	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
>>> +	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
>>>  	PCMCIA_DEVICE_NULL,
>>>  };
>>>  MODULE_DEVICE_TABLE(pcmcia, ide_ids);
>>> --
>> applied pata_pcmcia bit
> 
> could we merge such stuff through pcmcia-git in future, please? (see
> http://git.kernel.org/?p=linux/kernel/git/brodo/pcmcia-2.6.git;a=commitdiff;h=980fc29f20f5cfb8cef29ddfccecb685f299ada4
> ) Else the device tables in ide-cs and pata_pcmcia will diverge again.

It is not normal practice to merge add-device-id patches through 
bus-specific trees.  We do not do such things with PCI IDs, for example.

I would be happy to apply the whole patch, or ACK it and let Bart apply 
the entire patch.  Either way is fine with me.

	Jeff

Re: [PATCH] pata_pcmcia: another memory card support

[Dominik Brodowski]

Jeff,

On Tue, Nov 11, 2008 at 03:44:09AM -0500, Jeff Garzik wrote:
> It is not normal practice to merge add-device-id patches through 
> bus-specific trees.  We do not do such things with PCI IDs, for example.

Well, it's been normal practice for pcmcia IDs.

> I would be happy to apply the whole patch, or ACK it and let Bart apply 
> the entire patch.  Either way is fine with me.

Anyways, as it's already in my queue for Linus, it'll be a double-merge this
time. Let's just try to keep the IDs in pata_pcmcia and ide-cs coordinated
in future, ok?

Best,
	Dominik

Re: [PATCH] pata_pcmcia: another memory card support

[Alan Cox]

> It is not normal practice to merge add-device-id patches through 
> bus-specific trees.  We do not do such things with PCI IDs, for example.

We've also been parallel applying patches via myself through Jeff and via
Bart since the beginnings of libata without a problem. So it ain't
broke ....

Re: [PATCH] pata_pcmcia: another memory card support

[Alan Cox]

On Tue, 11 Nov 2008 12:22:43 +0100
Dominik Brodowski <linux@dominikbrodowski.net> wrote:

> Jeff,
> 
> On Tue, Nov 11, 2008 at 03:44:09AM -0500, Jeff Garzik wrote:
> > It is not normal practice to merge add-device-id patches through 
> > bus-specific trees.  We do not do such things with PCI IDs, for example.
> 
> Well, it's been normal practice for pcmcia IDs.

Not for ide or ATA in the past few years.

Alan

Re: [PATCH] pata_pcmcia: another memory card support

[Dominik Brodowski]

On Tue, Nov 11, 2008 at 11:37:38AM +0000, Alan Cox wrote:
> > It is not normal practice to merge add-device-id patches through 
> > bus-specific trees.  We do not do such things with PCI IDs, for example.
> 
> We've also been parallel applying patches via myself through Jeff and via
> Bart since the beginnings of libata without a problem. So it ain't
> broke ....

795659ef0ee175d47723f806e7a29427b171e61b . Let's just try to apply new IDs
to both files, and not cherry-pick parts of such a patch?

Best,
	Dominik