[parisc-linux-cvs] -pa43 Correcting behaviour of Dino's serial port

[Matthieu Delahaye]

--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This patch corrects behaviour of Dino's serial driver.
Thus, dino's serial port is registered AFTER Lasi's serial.
Now Serial port 1 is ttyS0 and serial port 2, ttyS1.

Contributed by Clement Moyroud <moyroudc@esiee.fr>


--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="serial.patch"

diff -Nru linux/drivers/gsc/serial.c linux.new/drivers/gsc/serial.c
--- linux/drivers/gsc/serial.c	Tue Jun 19 18:55:07 2001
+++ linux.new/drivers/gsc/serial.c	Tue Jun 19 19:00:04 2001
@@ -1,5 +1,5 @@
 /*
- *	Serial Device Initialisation for LASI/ASP/WAX
+ *	Serial Device Initialisation for LASI/ASP/WAX/DINO
  *
  *	(c) Copyright 2000 The Puffin Group Inc.
  *	(c) Copyright 2000-2001 Helge Deller <deller@gmx.de>
@@ -88,12 +88,76 @@
 }
 
 static struct pa_iodc_driver serial_drivers_for[] = {  
-   {HPHW_FIO, 0x022, 0x0, 0x0008C, 0x0, 0,		/* B-Class 132 & 180 */
-	DRIVER_CHECK_HVERSION + DRIVER_CHECK_HVERSION_REV + 
+	{HPHW_FIO, 0x03C, 0x0, 0x0008C, 0x0, 0,		/* B132L */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin 132 Core", serial_init_chip},
+  {HPHW_FIO, 0x03D, 0x0, 0x0008C, 0x0, 0,		/* B160L */
+	DRIVER_CHECK_HVERSION +  
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin 160 Core", serial_init_chip},
+  {HPHW_FIO, 0x03E, 0x0, 0x0008C, 0x0, 0,		/* B132L+ */
+	DRIVER_CHECK_HVERSION + 
 	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
-	"serial device", "B Class", serial_init_chip},
-   {HPHW_FIO, 0x05F, 0x0, 0x00081, 0x0, 0,		/* A-class 180 */
+	"serial device", "Merlin+ 132 Core", serial_init_chip},
+  {HPHW_FIO, 0x03F, 0x0, 0x0008C, 0x0, 0,		/* B180L+ */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin+ 180 Core", serial_init_chip},
+  {HPHW_FIO, 0x056, 0x0, 0x0008C, 0x0, 0,		/* Raven+ w SE FWSCSI */
 	DRIVER_CHECK_HVERSION + DRIVER_CHECK_HVERSION_REV + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Raven+ w SE FWSCSI", serial_init_chip},
+  {HPHW_FIO, 0x03B, 0x0, 0x0008C, 0x0, 0,		/* C1xx/C1xxL */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Raven U/L2 Core", serial_init_chip},
+  {HPHW_FIO, 0x046, 0x0, 0x0008C, 0x0, 0,		/* Rocky2 120 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Rocky2 120 Core", serial_init_chip},
+  {HPHW_FIO, 0x047, 0x0, 0x0008C, 0x0, 0,		/* Rocky2 150 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Rocky2 150 Core", serial_init_chip},
+  {HPHW_FIO, 0x04E, 0x0, 0x0008C, 0x0, 0,		/* Kiji L2 132 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Kiji L2 Core", serial_init_chip},
+  {HPHW_FIO, 0x040, 0x0, 0x0008C, 0x0, 0,		/* B132L */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin 132 Wax", serial_init_chip},
+  {HPHW_FIO, 0x041, 0x0, 0x0008C, 0x0, 0,		/* B160L */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin 160 Wax", serial_init_chip},
+  {HPHW_FIO, 0x022, 0x0, 0x0008C, 0x0, 0,		/* B132L+ */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin+ 132 Dino", serial_init_chip},
+  {HPHW_FIO, 0x019, 0x0, 0x0008C, 0x0, 0,		/* B180L+ */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Merlin+ 180 Dino", serial_init_chip},
+  {HPHW_FIO, 0x006, 0x0, 0x0008C, 0x0, 0,		/* C1xx/C1xxL */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Raven U/L2 Dino", serial_init_chip},
+  {HPHW_FIO, 0x048, 0x0, 0x0008C, 0x0, 0,		/* Rocky2 120 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Rocky2 120 Dino", serial_init_chip},
+  {HPHW_FIO, 0x049, 0x0, 0x0008C, 0x0, 0,		/* Rocky2 150 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Rocky2 150 Dino", serial_init_chip},
+  {HPHW_FIO, 0x04F, 0x0, 0x0008C, 0x0, 0,		/* Kiji L2 132 */
+	DRIVER_CHECK_HVERSION + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "Kiji L2 132 Dino", serial_init_chip},
+  {HPHW_FIO, 0x05F, 0x0, 0x00081, 0x0, 0,		/* A-class 180 */
+	DRIVER_CHECK_HVERSION +  
 	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
 	"serial device", "unknown", serial_init_chip},
   {HPHW_FIO, 0x0, 0x0, 0x8c, 0x0, 0,			/* 715/64 */

--d6Gm4EdcadzBjdND--