Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a0a00cbf8ae5cea3d72e28982c06f3270420c657

Authored by Alan Cox
Committed by Linus Torvalds
1 parent 11966adc33
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff

drivers/ata/pata_ali.c
Diff comments   View file @ a0a00cb
... ... @@ -34,7 +34,7 @@
34 34 #include <linux/dmi.h>
35 35  
36 36 #define DRV_NAME "pata_ali"
37   -#define DRV_VERSION "0.6.5"
  37 +#define DRV_VERSION "0.6.6"
38 38  
39 39 /*
40 40 * Cable special cases
... ... @@ -630,7 +630,7 @@
630 630 pci_read_config_byte(pdev, 0x53, &tmp);
631 631 if (rev <= 0x20)
632 632 tmp &= ~0x02;
633   - if (rev == 0xc7)
  633 + if (rev >= 0xc7)
634 634 tmp |= 0x03;
635 635 else
636 636 tmp |= 0x01; /* CD_ROM enable for DMA */
drivers/ata/pata_pcmcia.c
Diff comments   View file @ a0a00cb
... ... @@ -42,7 +42,7 @@
42 42  
43 43  
44 44 #define DRV_NAME "pata_pcmcia"
45   -#define DRV_VERSION "0.2.9"
  45 +#define DRV_VERSION "0.2.11"
46 46  
47 47 /*
48 48 * Private data structure to glue stuff together
... ... @@ -355,6 +355,8 @@
355 355 PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
356 356 PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
357 357 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
  358 + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
  359 + PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
358 360 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
359 361 PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
360 362 PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),