rpms/kernel/devel linux-2.6-ide-netcell.patch, NONE, 1.1 kernel-2.6.spec, 1.1452, 1.1453

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31890

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ide-netcell.patch 
Log Message:
Add support for netcell revolution IDE controller. (#164330)



linux-2.6-ide-netcell.patch:
 drivers/ide/pci/generic.c |    9 ++++++++-
 drivers/ide/setup-pci.c   |    1 +
 drivers/pci/pci.ids       |    2 +-
 include/linux/pci_ids.h   |    3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-ide-netcell.patch ---
diff -purN linux-2.6.13-rc3-git5/drivers/ide/pci/generic.c linux/drivers/ide/pci/generic.c
--- linux-2.6.13-rc3-git5/drivers/ide/pci/generic.c	2005-07-26 10:50:31.000000000 -0700
+++ linux/drivers/ide/pci/generic.c	2005-07-26 11:37:51.000000000 -0700
@@ -173,7 +173,13 @@ static ide_pci_device_t generic_chipsets
 		.channels	= 2,
 		.autodma	= NOAUTODMA,
 		.bootable	= ON_BOARD,
-	}
+	},{	/* 14 */
+		.name		= "Revolution",
+                .init_hwif      = init_hwif_generic,
+                .channels       = 2,
+                .autodma        = AUTODMA,
+                .bootable       = OFF_BOARD,
+        }
 };
 
 /**
@@ -231,6 +237,7 @@ static struct pci_device_id generic_pci_
 	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO,     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
 	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
 	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},
+	{ PCI_VENDOR_ID_NETCELL,PCI_DEVICE_ID_REVOLUTION,          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14},	
 	/* Must come last. If you add entries adjust this table appropriately and the init_one code */
 	{ PCI_ANY_ID,		PCI_ANY_ID,			   PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 0},
 	{ 0, },
diff -purN linux-2.6.13-rc3-git5/drivers/ide/setup-pci.c linux/drivers/ide/setup-pci.c
--- linux-2.6.13-rc3-git5/drivers/ide/setup-pci.c	2005-07-26 10:50:31.000000000 -0700
+++ linux/drivers/ide/setup-pci.c	2005-07-26 11:37:51.000000000 -0700
@@ -229,6 +229,7 @@ second_chance_to_dma:
 			case PCI_DEVICE_ID_AMD_VIPER_7409:
 			case PCI_DEVICE_ID_CMD_643:
 			case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
+			case PCI_DEVICE_ID_REVOLUTION:
 				simplex_stat = hwif->INB(dma_base + 2);
 				hwif->OUTB((simplex_stat&0x60),(dma_base + 2));
 				simplex_stat = hwif->INB(dma_base + 2);
diff -purN linux-2.6.13-rc3-git5/drivers/pci/pci.ids linux/drivers/pci/pci.ids
--- linux-2.6.13-rc3-git5/drivers/pci/pci.ids	2005-07-26 10:50:01.000000000 -0700
+++ linux/drivers/pci/pci.ids	2005-07-26 11:37:52.000000000 -0700
@@ -7982,7 +7982,7 @@
 		168c 2042  Netgate 5354MP Plus ARIES2 a/b/g MiniPCI Adapter
 	1014  AR5212 802.11abg NIC
 169c  Netcell Corporation
-	0044  SyncRAID SR3000/5000 Series SATA RAID Controllers
+	0044  Revolution Storage Processing Card
 16a5  Tekram Technology Co.,Ltd.
 16ab  Global Sun Technology Inc
 	1100  GL24110P
diff -purN linux-2.6.13-rc3-git5/include/linux/pci_ids.h linux/include/linux/pci_ids.h
--- linux-2.6.13-rc3-git5/include/linux/pci_ids.h	2005-07-26 10:49:27.000000000 -0700
+++ linux/include/linux/pci_ids.h	2005-07-26 11:37:52.000000000 -0700
@@ -2170,6 +2170,9 @@
 #define PCI_VENDOR_ID_SIBYTE		0x166d
 #define PCI_DEVICE_ID_BCM1250_HT	0x0002
 
+#define PCI_VENDOR_ID_NETCELL		0x169c
+#define PCI_DEVICE_ID_REVOLUTION	0x0044
+
 #define PCI_VENDOR_ID_LINKSYS		0x1737
 #define PCI_DEVICE_ID_LINKSYS_EG1032	0x1032
 #define PCI_DEVICE_ID_LINKSYS_EG1064	0x1064


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1452
retrieving revision 1.1453
diff -u -r1.1452 -r1.1453
--- kernel-2.6.spec	5 Aug 2005 19:52:59 -0000	1.1452
+++ kernel-2.6.spec	5 Aug 2005 22:02:30 -0000	1.1453
@@ -346,6 +346,7 @@
 Patch1780: linux-2.6.12-firedire-init-breakage.patch 
 Patch1790: linux-2.6.12-ns558-nodev-rmmod.patch
 Patch1800: linux-2.6-ide-tune-locking.patch
+Patch1801: linux-2.6-ide-netcell.patch
 
 # VM bits.
 Patch2000: linux-2.6.11-vm-taint.patch
@@ -790,6 +791,8 @@
 %patch1790 -p1
 # Fix IDE locking bug.
 %patch1800 -p1
+# Add support for Netcell Revolution.
+%patch1801 -p1
 
 #
 # VM related fixes.
@@ -1254,6 +1257,7 @@
 %changelog
 * Fri Aug 05 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc5-git3
+- Add support for netcell revolution IDE controller. (#164330)
 
 * Thu Aug 04 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc5-git2