Author: qboosh Date: Thu Aug 17 12:55:48 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- SiS typo fix
- VIA IDE backports from 2.6.18-rc4
---- Files affected:
SOURCES:
linux-2.4-ide-update.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.5
SOURCES/linux-2.4-ide-update.patch:1.6
--- SOURCES/linux-2.4-ide-update.patch:1.5 Thu Aug 17 14:37:53 2006
+++ SOURCES/linux-2.4-ide-update.patch Thu Aug 17 14:55:43 2006
@@ -42,7 +42,21 @@
#define PCI_VENDOR_ID_IMS 0x10e0
#define PCI_DEVICE_ID_IMS_8849 0x8849
-@@ -1792,6 +1794,9 @@
+@@ -1164,11 +1164,13 @@
+ #define PCI_DEVICE_ID_VIA_8233A 0x3147
+ #define PCI_DEVICE_ID_VIA_P4M266 0x3148
+ #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149
++#define PCI_DEVICE_ID_VIA_6410 0x3164
+ #define PCI_DEVICE_ID_VIA_P4X333 0x3168
+ #define PCI_DEVICE_ID_VIA_8235 0x3177
+ #define PCI_DEVICE_ID_VIA_8377_0 0x3189
+ #define PCI_DEVICE_ID_VIA_K8T400M_0 0x3188
+ #define PCI_DEVICE_ID_VIA_8237 0x3227
++#define PCI_DEVICE_ID_VIA_8251 0x3287
+ #define PCI_DEVICE_ID_VIA_86C100A 0x6100
+ #define PCI_DEVICE_ID_VIA_8231 0x8231
+ #define PCI_DEVICE_ID_VIA_8231_4 0x8235
+@@ -1792,6 +1796,9 @@
#define PCI_DEVICE_ID_FARSITE_TE1 0x1610
#define PCI_DEVICE_ID_FARSITE_TE1C 0x1612
@@ -52,7 +66,7 @@
#define PCI_VENDOR_ID_ALTIMA 0x173b
#define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8
#define PCI_DEVICE_ID_ALTIMA_AC1001 0x03e9
-@@ -1939,6 +1952,7 @@
+@@ -1939,6 +1954,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
@@ -60,7 +74,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 +1989,21 @@
+@@ -1975,8 +1991,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
@@ -105,6 +119,16 @@
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
+@@ -710,7 +710,9 @@
+ case PCI_DEVICE_ID_VIA_82C596:
+ case PCI_DEVICE_ID_VIA_82C686:
+ case PCI_DEVICE_ID_VIA_8231:
++ case PCI_DEVICE_ID_VIA_8233A:
+ case PCI_DEVICE_ID_VIA_8235:
++ case PCI_DEVICE_ID_VIA_8237:
+ /* FIXME: add new ones for 8233/5 */
+ r->name = "VIA";
+ r->get = pirq_via_get;
--- linux-2.4.33/drivers/ide/pci/piix.c.orig 2004-11-17 12:54:21.000000000
+0100
+++ linux-2.4.33/drivers/ide/pci/piix.c 2006-08-17 12:22:01.685971000
+0200
@@ -149,12 +149,16 @@
@@ -491,7 +515,7 @@
.enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
.bootable = ON_BOARD,
.extra = 0
-+ { /* 1 */
++ },{ /* 1 */
+ .vendor = PCI_VENDOR_ID_SI,
+ .device = PCI_DEVICE_ID_SI_5518,
+ .name = "SIS5518",
@@ -504,6 +528,47 @@
+ .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
+ .bootable = ON_BOARD,
+ .extra = 0
+ },{
+ .vendor = 0,
+ .device = 0,
+--- linux-2.4.33/drivers/ide/pci/via82cxxx.c.orig 2003-08-25
13:44:41.000000000 +0200
++++ linux-2.4.33/drivers/ide/pci/via82cxxx.c 2006-08-17 14:40:59.305971000
+0200
+@@ -74,6 +74,8 @@
+ u8 rev_max;
+ u16 flags;
+ } via_isa_bridges[] = {
++ { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, VIA_UDMA_133 |
VIA_BAD_AST },
++ { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 |
VIA_BAD_AST },
+ { "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 |
VIA_BAD_AST },
+ { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 |
VIA_BAD_AST },
+ { "vt8233a", PCI_DEVICE_ID_VIA_8233A, 0x00, 0x2f, VIA_UDMA_133 |
VIA_BAD_AST },
+@@ -641,6 +643,7 @@
+ static struct pci_device_id via_pci_tbl[] __devinitdata = {
+ { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
++ { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_6410, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 2},
+ { 0, },
+ };
+
+--- linux-2.4.33/drivers/ide/pci/via82cxxx.h.orig 2003-06-13
16:51:33.000000000 +0200
++++ linux-2.4.33/drivers/ide/pci/via82cxxx.h 2006-08-17 14:39:46.315971000
+0200
+@@ -56,6 +56,19 @@
+ .enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+ .bootable = ON_BOARD,
+ .extra = 0,
++ },{ /* 2 */
++ .vendor = PCI_VENDOR_ID_VIA,
++ .device = PCI_DEVICE_ID_VIA_6410,
++ .name = "VP_IDE",
++ .init_chipset = init_chipset_via82cxxx,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_via82cxxx,
++ .init_dma = init_dma_via82cxxx,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
++ .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.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
