Author: qboosh Date: Thu Aug 17 12:37:58 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- SiS IDE backports from 2.6.18-rc4
---- Files affected:
SOURCES:
linux-2.4-ide-update.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.4
SOURCES/linux-2.4-ide-update.patch:1.5
--- SOURCES/linux-2.4-ide-update.patch:1.4 Thu Aug 17 14:04:30 2006
+++ SOURCES/linux-2.4-ide-update.patch Thu Aug 17 14:37:53 2006
@@ -17,7 +17,20 @@
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
-@@ -1052,6 +1055,11 @@
+@@ -577,10 +577,12 @@
+ #define PCI_DEVICE_ID_SI_752 0x0752
+ #define PCI_DEVICE_ID_SI_755 0x0755
+ #define PCI_DEVICE_ID_SI_900 0x0900
++#define PCI_DEVICE_ID_SI_965 0x0965
+ #define PCI_DEVICE_ID_SI_5107 0x5107
+ #define PCI_DEVICE_ID_SI_5300 0x5300
+ #define PCI_DEVICE_ID_SI_5511 0x5511
+ #define PCI_DEVICE_ID_SI_5513 0x5513
++#define PCI_DEVICE_ID_SI_5517 0x5517
+ #define PCI_DEVICE_ID_SI_5518 0x5518
+ #define PCI_DEVICE_ID_SI_5571 0x5571
+ #define PCI_DEVICE_ID_SI_5581 0x5581
+@@ -1052,6 +1057,11 @@
#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA 0x037E
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2 0x037F
@@ -29,7 +42,7 @@
#define PCI_VENDOR_ID_IMS 0x10e0
#define PCI_DEVICE_ID_IMS_8849 0x8849
-@@ -1792,6 +1792,9 @@
+@@ -1792,6 +1794,9 @@
#define PCI_DEVICE_ID_FARSITE_TE1 0x1610
#define PCI_DEVICE_ID_FARSITE_TE1C 0x1612
@@ -39,7 +52,7 @@
#define PCI_VENDOR_ID_ALTIMA 0x173b
#define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8
#define PCI_DEVICE_ID_ALTIMA_AC1001 0x03e9
-@@ -1939,6 +1950,7 @@
+@@ -1939,6 +1952,7 @@
#define PCI_DEVICE_ID_INTEL_82801CA_11 0x248b
#define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c
#define PCI_DEVICE_ID_INTEL_82801DB_0 0x24c0
@@ -47,7 +60,7 @@
#define PCI_DEVICE_ID_INTEL_82801DB_2 0x24c2
#define PCI_DEVICE_ID_INTEL_82801DB_3 0x24c3
#define PCI_DEVICE_ID_INTEL_82801DB_4 0x24c4
-@@ -1975,8 +1987,21 @@
+@@ -1975,8 +1989,21 @@
#define PCI_DEVICE_ID_INTEL_ESB_13 0x25ae
#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640
#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641
@@ -435,6 +448,62 @@
+ .channels = 2,
+ .autodma = AUTODMA,
+ .bootable = OFF_BOARD,
+ },{
+ .vendor = 0,
+ .device = 0,
+--- linux-2.4.33/drivers/ide/pci/sis5513.c.orig 2004-08-08
01:26:04.000000000 +0200
++++ linux-2.4.33/drivers/ide/pci/sis5513.c 2006-08-17 14:21:35.045971000
+0200
+@@ -87,6 +87,7 @@
+ u8 chipset_family;
+ u8 flags;
+ } SiSHostChipInfo[] = {
++ { "SiS965", PCI_DEVICE_ID_SI_965, ATA_133 },
+ { "SiS745", PCI_DEVICE_ID_SI_745, ATA_100 },
+ { "SiS735", PCI_DEVICE_ID_SI_735, ATA_100 },
+ { "SiS733", PCI_DEVICE_ID_SI_733, ATA_100 },
+@@ -111,6 +112,7 @@
+
+ { "SiS5596", PCI_DEVICE_ID_SI_5596, ATA_16 },
+ { "SiS5571", PCI_DEVICE_ID_SI_5571, ATA_16 },
++ { "SiS5517", PCI_DEVICE_ID_SI_5517, ATA_16 },
+ { "SiS551x", PCI_DEVICE_ID_SI_5511, ATA_16 },
+ };
+
+@@ -523,6 +525,7 @@
+ case 3: test1 = 0x30|0x03; break;
+ case 2: test1 = 0x40|0x04; break;
+ case 1: test1 = 0x60|0x07; break;
++ case 0: test1 = 0x00; break;
+ default: break;
+ }
+ pci_write_config_byte(dev, drive_pci, test1);
+@@ -965,6 +968,7 @@
+
+ static struct pci_device_id sis5513_pci_tbl[] __devinitdata = {
+ { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0,
0, 0},
++ { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0,
0, 1},
+ { 0, },
+ };
+
+--- linux-2.4.33/drivers/ide/pci/sis5513.h.orig 2006-08-17
14:11:45.785971000 +0200
++++ linux-2.4.33/drivers/ide/pci/sis5513.h 2006-08-17 14:24:59.335971000
+0200
+@@ -43,6 +43,19 @@
+ .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
+ .bootable = ON_BOARD,
+ .extra = 0
++ { /* 1 */
++ .vendor = PCI_VENDOR_ID_SI,
++ .device = PCI_DEVICE_ID_SI_5518,
++ .name = "SIS5518",
++ .init_chipset = init_chipset_sis5513,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_sis5513,
++ .init_dma = init_dma_sis5513,
++ .channels = 2,
++ .autodma = NOAUTODMA,
++ .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
++ .bootable = ON_BOARD,
++ .extra = 0
},{
.vendor = 0,
.device = 0,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.4-ide-update.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
