[packages/kernel.git] / vt8235-2.4.19.patch

diff -Nru a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
--- a/drivers/ide/via82cxxx.c	Mon Aug 19 19:06:14 2002
+++ b/drivers/ide/via82cxxx.c	Mon Aug 19 19:06:14 2002
@@ -1,7 +1,13 @@
 /*
- * $Id$
+ * Version 3.35
  *
- *  Copyright (c) 2000-2001 Vojtech Pavlik
+ * VIA IDE driver for Linux. Supports southbridges:
+ *
+ *   vt82c576, vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b,
+ *   vt82c686, vt82c686a, vt82c686b, vt8231, vt8233, vt8233c, vt8233a,
+ *   vt8235
+ *
+ * Copyright (c) 2000-2002 Vojtech Pavlik
  *
  *  Based on the work of:
  *	Michel Aubry
@@ -10,52 +16,9 @@
  */
 
 /*
- * VIA IDE driver for Linux. Supports
- *
- *   vt82c576, vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b,
- *   vt82c686, vt82c686a, vt82c686b, vt8231, vt8233, vt8233c, vt8233a
- *
- * southbridges, which can be found in
- *
- *  VIA Apollo Master, VP, VP2, VP2/97, VP3, VPX, VPX/97, MVP3, MVP4, P6, Pro,
- *    ProII, ProPlus, Pro133, Pro133+, Pro133A, Pro133A Dual, Pro133T, Pro133Z,
- *    PLE133, PLE133T, Pro266, Pro266T, ProP4X266, PM601, PM133, PN133, PL133T,
- *    PX266, PM266, KX133, KT133, KT133A, KT133E, KLE133, KT266, KX266, KM133,
- *    KM133A, KL133, KN133, KM266
- *  PC-Chips VXPro, VXPro+, VXTwo, TXPro-III, TXPro-AGP, AGPPro, ViaGra, BXToo,
- *    BXTel, BXpert
- *  AMD 640, 640 AGP, 750 IronGate, 760, 760MP
- *  ETEQ 6618, 6628, 6629, 6638
- *  Micron Samurai
- *
- * chipsets. Supports
- *
- *   PIO 0-5, MWDMA 0-2, SWDMA 0-2 and UDMA 0-6
- *
- * (this includes UDMA33, 66, 100 and 133) modes. UDMA66 and higher modes are
- * autoenabled only in case the BIOS has detected a 80 wire cable. To ignore
- * the BIOS data and assume the cable is present, use 'ide0=ata66' or
- * 'ide1=ata66' on the kernel command line.
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Tis program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.nclude <linux/kernel.h>
  */
 
 #include <linux/config.h>
@@ -105,8 +68,8 @@
 } via_isa_bridges[] = {
 #ifdef FUTURE_BRIDGES
 	{ "vt8237",	PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 },
-	{ "vt8235",	PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, VIA_UDMA_133 },
 #endif
+	{ "vt8235",	PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, VIA_UDMA_133 },
 	{ "vt8233a",	PCI_DEVICE_ID_VIA_8233A,    0x00, 0x2f, VIA_UDMA_133 },
 	{ "vt8233c",	PCI_DEVICE_ID_VIA_8233C_0,  0x00, 0x2f, VIA_UDMA_100 },
 	{ "vt8233",	PCI_DEVICE_ID_VIA_8233_0,   0x00, 0x2f, VIA_UDMA_100 },
@@ -163,7 +126,7 @@
 
 	via_print("----------VIA BusMastering IDE Configuration----------------");
 
-	via_print("Driver Version:                     3.34");
+	via_print("Driver Version:                     3.35");
 	via_print("South Bridge:                       VIA %s", via_config->name);
 
 	pci_read_config_byte(isa_dev, PCI_REVISION_ID, &amp;t);
@@ -414,7 +377,7 @@
 		}
 
 	if (!via_config->id) {
-		printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, contact Vojtech Pavlik <vojtech@ucw.cz>\n");
+		printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
 		return -ENODEV;
 	}
 
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	Mon Aug 19 19:06:14 2002
+++ b/include/linux/pci_ids.h	Mon Aug 19 19:06:14 2002
@@ -981,6 +981,7 @@
 #define PCI_DEVICE_ID_VIA_8233C_0	0x3109
 #define PCI_DEVICE_ID_VIA_8361		0x3112
 #define PCI_DEVICE_ID_VIA_8233A		0x3147
+#define PCI_DEVICE_ID_VIA_8235		0x3177
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100
 #define PCI_DEVICE_ID_VIA_8231		0x8231
 #define PCI_DEVICE_ID_VIA_8231_4	0x8235
Commit	Line	Data
f34b2d11	1	diff -Nru a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
	2	--- a/drivers/ide/via82cxxx.c Mon Aug 19 19:06:14 2002
	3	+++ b/drivers/ide/via82cxxx.c Mon Aug 19 19:06:14 2002
	4	@@ -1,7 +1,13 @@
	5	/*
	6	- * $Id$
	7	+ * Version 3.35
	8	*
	9	- * Copyright (c) 2000-2001 Vojtech Pavlik
	10	+ * VIA IDE driver for Linux. Supports southbridges:
	11	+ *
	12	+ * vt82c576, vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b,
	13	+ * vt82c686, vt82c686a, vt82c686b, vt8231, vt8233, vt8233c, vt8233a,
	14	+ * vt8235
	15	+ *
	16	+ * Copyright (c) 2000-2002 Vojtech Pavlik
	17	*
	18	* Based on the work of:
	19	* Michel Aubry
	20	@@ -10,52 +16,9 @@
	21	*/
	22
	23	/*
	24	- * VIA IDE driver for Linux. Supports
	25	- *
	26	- * vt82c576, vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b,
	27	- * vt82c686, vt82c686a, vt82c686b, vt8231, vt8233, vt8233c, vt8233a
	28	- *
	29	- * southbridges, which can be found in
	30	- *
	31	- * VIA Apollo Master, VP, VP2, VP2/97, VP3, VPX, VPX/97, MVP3, MVP4, P6, Pro,
	32	- * ProII, ProPlus, Pro133, Pro133+, Pro133A, Pro133A Dual, Pro133T, Pro133Z,
	33	- * PLE133, PLE133T, Pro266, Pro266T, ProP4X266, PM601, PM133, PN133, PL133T,
	34	- * PX266, PM266, KX133, KT133, KT133A, KT133E, KLE133, KT266, KX266, KM133,
	35	- * KM133A, KL133, KN133, KM266
	36	- * PC-Chips VXPro, VXPro+, VXTwo, TXPro-III, TXPro-AGP, AGPPro, ViaGra, BXToo,
	37	- * BXTel, BXpert
	38	- * AMD 640, 640 AGP, 750 IronGate, 760, 760MP
	39	- * ETEQ 6618, 6628, 6629, 6638
	40	- * Micron Samurai
	41	- *
	42	- * chipsets. Supports
	43	- *
	44	- * PIO 0-5, MWDMA 0-2, SWDMA 0-2 and UDMA 0-6
	45	- *
	46	- * (this includes UDMA33, 66, 100 and 133) modes. UDMA66 and higher modes are
	47	- * autoenabled only in case the BIOS has detected a 80 wire cable. To ignore
	48	- * the BIOS data and assume the cable is present, use 'ide0=ata66' or
	49	- * 'ide1=ata66' on the kernel command line.
	50	- */
	51	-
	52	-/*
	53	- * This program is free software; you can redistribute it and/or modify
	54	- * it under the terms of the GNU General Public License as published by
	55	- * the Free Software Foundation; either version 2 of the License, or
	56	- * (at your option) any later version.
	57	- *
	58	- * This program is distributed in the hope that it will be useful,
	59	- * but WITHOUT ANY WARRANTY; without even the implied warranty of
	60	- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	61	- * GNU General Public License for more details.
	62	- *
	63	- * You should have received a copy of the GNU General Public License
	64	- * along with this program; if not, write to the Free Software
65	- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
66	- *
67	- * Should you need to contact me, the author, you can do so either by
68	- * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
69	- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
70	+ * Tis program is free software; you can redistribute it and/or modify it
71	+ * under the terms of the GNU General Public License version 2 as published by
72	+ * the Free Software Foundation.nclude <linux/kernel.h>
73	*/
74
75	#include <linux/config.h>
76	@@ -105,8 +68,8 @@
77	} via_isa_bridges[] = {
78	#ifdef FUTURE_BRIDGES
79	{ "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 },
80	- { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 },
81	#endif
82	+ { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 },
83	{ "vt8233a", PCI_DEVICE_ID_VIA_8233A, 0x00, 0x2f, VIA_UDMA_133 },
84	{ "vt8233c", PCI_DEVICE_ID_VIA_8233C_0, 0x00, 0x2f, VIA_UDMA_100 },
85	{ "vt8233", PCI_DEVICE_ID_VIA_8233_0, 0x00, 0x2f, VIA_UDMA_100 },
86	@@ -163,7 +126,7 @@
87
88	via_print("----------VIA BusMastering IDE Configuration----------------");
89
90	- via_print("Driver Version: 3.34");
91	+ via_print("Driver Version: 3.35");
92	via_print("South Bridge: VIA %s", via_config->name);
93
94	pci_read_config_byte(isa_dev, PCI_REVISION_ID, &t);
95	@@ -414,7 +377,7 @@
96	}
97
98	if (!via_config->id) {
99	- printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, contact Vojtech Pavlik <vojtech@ucw.cz>\n");
100	+ printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
101	return -ENODEV;
102	}
103
104	diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
105	--- a/include/linux/pci_ids.h Mon Aug 19 19:06:14 2002
106	+++ b/include/linux/pci_ids.h Mon Aug 19 19:06:14 2002
107	@@ -981,6 +981,7 @@
108	#define PCI_DEVICE_ID_VIA_8233C_0 0x3109
109	#define PCI_DEVICE_ID_VIA_8361 0x3112
110	#define PCI_DEVICE_ID_VIA_8233A 0x3147
111	+#define PCI_DEVICE_ID_VIA_8235 0x3177
112	#define PCI_DEVICE_ID_VIA_86C100A 0x6100
113	#define PCI_DEVICE_ID_VIA_8231 0x8231
114	#define PCI_DEVICE_ID_VIA_8231_4 0x8235