Author: qboosh Date: Thu Aug 17 11:52:00 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- ATI IXP600 IDE backports from 2.6.18-rc4
---- Files affected:
SOURCES:
linux-2.4-ide-update.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.2
SOURCES/linux-2.4-ide-update.patch:1.3
--- SOURCES/linux-2.4-ide-update.patch:1.2 Thu Aug 17 13:44:51 2006
+++ SOURCES/linux-2.4-ide-update.patch Thu Aug 17 13:51:54 2006
@@ -1,6 +1,14 @@
--- linux-2.4.33/include/linux/pci_ids.h.orig 2006-08-17 11:02:44.215971000
+0200
+++ linux-2.4.33/include/linux/pci_ids.h 2006-08-17 12:11:45.195971000
+0200
-@@ -469,6 +469,8 @@
+@@ -324,6 +324,7 @@
+ #define PCI_DEVICE_ID_ATI_IXP300_SATA 0x436e
+ #define PCI_DEVICE_ID_ATI_IXP400_IDE 0x4376
+ #define PCI_DEVICE_ID_ATI_IXP400_SATA 0x4379
++#define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c
+
+ #define PCI_VENDOR_ID_VLSI 0x1004
+ #define PCI_DEVICE_ID_VLSI_82C592 0x0005
+@@ -469,6 +470,8 @@
#define PCI_DEVICE_ID_AMD_8111_AUDIO 0x746d
#define PCI_DEVICE_ID_AMD_8131_APIC 0x7450
@@ -9,7 +17,7 @@
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
-@@ -1052,6 +1054,11 @@
+@@ -1052,6 +1055,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
@@ -21,7 +29,7 @@
#define PCI_VENDOR_ID_IMS 0x10e0
#define PCI_DEVICE_ID_IMS_8849 0x8849
-@@ -1939,6 +1946,7 @@
+@@ -1939,6 +1947,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
@@ -29,7 +37,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 +1983,21 @@
+@@ -1975,8 +1984,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
@@ -364,3 +372,30 @@
{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
+--- linux-2.4.33/drivers/ide/pci/atiixp.c.orig 2006-08-11 06:18:20.000000000
+0200
++++ linux-2.4.33/drivers/ide/pci/atiixp.c 2006-08-17 13:44:12.815971000
+0200
+@@ -495,6 +495,16 @@
+ .autodma = AUTODMA,
+ .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
+ .bootable = ON_BOARD,
++ },{ /* 3 */
++ .vendor = PCI_VENDOR_ID_ATI,
++ .device = PCI_DEVICE_ID_ATI_IXP600_IDE,
++ .name = "ATI-IXP600",
++ .init_chipset = init_chipset_atiixp,
++ .init_hwif = init_hwif_atiixp,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
++ .bootable = ON_BOARD,
+ }
+ };
+
+@@ -521,6 +531,7 @@
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 2},
++ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 3},
+ { 0, },
+ };
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.4-ide-update.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
