Commit a0a00cbf authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync 



This fixes support for rev c8 of the ALi/ULi PATA, and keeps pcmcia in
sync so ide_cs and pata_pcmcia are interchangable, both are only changes
to constants.

Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the
field now.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 11966adc

drivers/ata/pata_ali.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/dmi.h>



#define DRV_NAME "pata_ali"

#define DRV_VERSION "0.6.5"

#define DRV_VERSION "0.6.6"



/*

 *	Cable special cases
@@ -630,7 +630,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		pci_read_config_byte(pdev, 0x53, &tmp);

		if (rev <= 0x20)

			tmp &= ~0x02;

		if (rev == 0xc7)

		if (rev >= 0xc7)

			tmp |= 0x03;

		else

			tmp |= 0x01;	/* CD_ROM enable for DMA */

drivers/ata/pata_pcmcia.c

+3 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 




#define DRV_NAME "pata_pcmcia"

#define DRV_VERSION "0.2.9"

#define DRV_VERSION "0.2.11"



/*

 *	Private data structure to glue stuff together
@@ -355,6 +355,8 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),

	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),

	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),

	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),

CRA Git | Maintained and supported by SUSTech CRA and CCSE