Uwe Hermann:

here's a patch which replaces all DOS newlines with Unix newlines, and
removes some useless $Rev$, $Id$, and $Header$ tags.
(part 1)



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2385 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 707 insertions, 743 deletions

diff --git a/src/superio/smsc/lpc47b272/lpc47b272_early_serial.c b/src/superio/smsc/lpc47b272/lpc47b272_early_serial.c
index 49ec2c47f8..39444c0d02 100644
--- a/src/superio/smsc/lpc47b272/lpc47b272_early_serial.c
+++ b/src/superio/smsc/lpc47b272/lpc47b272_early_serial.c
@@ -1,62 +1,57 @@
-/*

- * $Header$

- *

- * lpc47b272_early_serial.c: Pre-RAM driver for SMSC LPC47B272 Super I/O chip

- *

- * Copyright (C) 2005 Digital Design Corporation

- *

- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * $Log$

- *

- */

+/*
+ * lpc47b272_early_serial.c: Pre-RAM driver for SMSC LPC47B272 Super I/O chip
+ *
+ * Copyright (C) 2005 Digital Design Corporation
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include <arch/romcc_io.h>
 #include "lpc47b272.h"
 
-//----------------------------------------------------------------------------------

-// Function:    	pnp_enter_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Enable access to the LPC47B272's configuration registers.

-//

+//----------------------------------------------------------------------------------
+// Function:    	pnp_enter_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Enable access to the LPC47B272's configuration registers.
+//
 static inline void pnp_enter_conf_state(device_t dev) {
 	unsigned port = dev>>8;
     outb(0x55, port);
-}

+}
 
-//----------------------------------------------------------------------------------

-// Function:    	pnp_exit_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Disable access to the LPC47B272's configuration registers.

-//

+//----------------------------------------------------------------------------------
+// Function:    	pnp_exit_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Disable access to the LPC47B272's configuration registers.
+//
 static void pnp_exit_conf_state(device_t dev) {
 	unsigned port = dev>>8;
     outb(0xaa, port);
 }
 
-//----------------------------------------------------------------------------------

-// Function:    	lpc47b272_enable_serial

-// Parameters:  	dev - high 8 bits = Super I/O port, 

-//						  low 8 bits = logical device number (per lpc47b272.h)

-//					iobase - processor I/O port address to assign to this serial device

-// Return Value:	bool

-// Description: 	Configure the base I/O port of the specified serial device

-//					and enable the serial device.

-//

+//----------------------------------------------------------------------------------
+// Function:    	lpc47b272_enable_serial
+// Parameters:  	dev - high 8 bits = Super I/O port, 
+//						  low 8 bits = logical device number (per lpc47b272.h)
+//					iobase - processor I/O port address to assign to this serial device
+// Return Value:	bool
+// Description: 	Configure the base I/O port of the specified serial device
+//					and enable the serial device.
+//
 static void lpc47b272_enable_serial(device_t dev, unsigned iobase)
 {
 	pnp_enter_conf_state(dev);
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 674fbdcfe4..c3d4f9a929 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -1,30 +1,25 @@
-/*

- * $Header$

- *

- * superio.c: RAM driver for SMSC LPC47B272 Super I/O chip

- *

+/*
+ * superio.c: RAM driver for SMSC LPC47B272 Super I/O chip
+ *
  * Copyright 2000  AG Electronics Ltd.
  * Copyright 2003-2004 Linux Networx
  * Copyright 2004 Tyan 
- * Copyright (C) 2005 Digital Design Corporation

- *

- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * $Log$

- *

- */

+ * Copyright (C) 2005 Digital Design Corporation
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include <arch/io.h>
 #include <device/device.h>
@@ -38,16 +33,16 @@
 #include "chip.h"
 #include "lpc47b272.h"
 
-// Forward declarations

-static void enable_dev(device_t dev);

+// Forward declarations
+static void enable_dev(device_t dev);
 void lpc47b272_pnp_set_resources(device_t dev);
 void lpc47b272_pnp_set_resources(device_t dev);
 void lpc47b272_pnp_enable_resources(device_t dev);
 void lpc47b272_pnp_enable(device_t dev);
 static void lpc47b272_init(device_t dev);
 
-static void pnp_enter_conf_state(device_t dev);

-static void pnp_exit_conf_state(device_t dev);

+static void pnp_enter_conf_state(device_t dev);
+static void pnp_exit_conf_state(device_t dev);
 static void dump_pnp_device(device_t dev);
 
 
@@ -73,30 +68,30 @@ static struct pnp_info pnp_dev_info[] = {
         { &ops, LPC47B272_RT,   PNP_IO0, { 0x780, 0 }, },
 };
 
-/**********************************************************************************/

-/*								PUBLIC INTERFACE								  */

-/**********************************************************************************/

-

-//----------------------------------------------------------------------------------

-// Function:    	enable_dev

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Create device structures and allocate resources to devices 

-//					specified in the pnp_dev_info array (above).

-//

-static void enable_dev(device_t dev)

-{

-	pnp_enable_devices(dev, &pnp_ops, 

-					   sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), 

-					   pnp_dev_info);

-}

-
-//----------------------------------------------------------------------------------

-// Function:    	lpc47b272_pnp_set_resources

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Configure the specified Super I/O device with the resources

-//					(I/O space, etc.) that have been allocated for it.

+/**********************************************************************************/
+/*								PUBLIC INTERFACE								  */
+/**********************************************************************************/
+
+//----------------------------------------------------------------------------------
+// Function:    	enable_dev
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Create device structures and allocate resources to devices 
+//					specified in the pnp_dev_info array (above).
+//
+static void enable_dev(device_t dev)
+{
+	pnp_enable_devices(dev, &pnp_ops, 
+					   sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), 
+					   pnp_dev_info);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47b272_pnp_set_resources
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Configure the specified Super I/O device with the resources
+//					(I/O space, etc.) that have been allocated for it.
 //
 void lpc47b272_pnp_set_resources(device_t dev)
 {
@@ -126,14 +121,14 @@ void lpc47b272_pnp_enable(device_t dev)
 	pnp_exit_conf_state(dev);  
 }
 
-//----------------------------------------------------------------------------------

-// Function:    	lpc47b272_init

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Initialize the specified Super I/O device.

+//----------------------------------------------------------------------------------
+// Function:    	lpc47b272_init
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Initialize the specified Super I/O device.
 //					Devices other than COM ports and the keyboard controller are 
-//					ignored. For COM ports, we configure the baud rate. 

-//

+//					ignored. For COM ports, we configure the baud rate. 
+//
 static void lpc47b272_init(device_t dev)
 {
 	struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
@@ -160,68 +155,68 @@ static void lpc47b272_init(device_t dev)
 		break;
 	}
 }
-

-/**********************************************************************************/

-/*								PRIVATE FUNCTIONS							      */

-/**********************************************************************************/

-
-//----------------------------------------------------------------------------------

-// Function:    	pnp_enter_conf_state

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Enable access to the LPC47B272's configuration registers.

-//

-static void pnp_enter_conf_state(device_t dev) 

+
+/**********************************************************************************/
+/*								PRIVATE FUNCTIONS							      */
+/**********************************************************************************/
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_enter_conf_state
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Enable access to the LPC47B272's configuration registers.
+//
+static void pnp_enter_conf_state(device_t dev) 
 {
 	outb(0x55, dev->path.u.pnp.port);
-}

-
-//----------------------------------------------------------------------------------

-// Function:    	pnp_exit_conf_state

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Disable access to the LPC47B272's configuration registers.

-//

-static void pnp_exit_conf_state(device_t dev) 

+}
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_exit_conf_state
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Disable access to the LPC47B272's configuration registers.
+//
+static void pnp_exit_conf_state(device_t dev) 
 {
     outb(0xaa, dev->path.u.pnp.port);
 }
 
 #if 0
-//----------------------------------------------------------------------------------

-// Function:    	dump_pnp_device

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Print the values of all of the LPC47B272's configuration registers.

-//					NOTE: The LPC47B272 must be in configuration mode when this

-//						  function is called.

-//

+//----------------------------------------------------------------------------------
+// Function:    	dump_pnp_device
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Print the values of all of the LPC47B272's configuration registers.
+//					NOTE: The LPC47B272 must be in configuration mode when this
+//						  function is called.
+//
 static void dump_pnp_device(device_t dev)
 {
     int register_index;
     print_debug("\r\n");
 
     for(register_index = 0; register_index <= LPC47B272_MAX_CONFIG_REGISTER; register_index++) {
-        uint8_t register_value;

+        uint8_t register_value;
 
         if ((register_index & 0x0f) == 0) {
                 print_debug_hex8(register_index);
                 print_debug_char(':');
-        }

-

+        }
+
 		// Skip over 'register' that would cause exit from configuration mode
 	    if (register_index == 0xaa)
-			register_value = 0xaa;

+			register_value = 0xaa;
 		else
-        	register_value = pnp_read_config(dev, register_index);

-

+        	register_value = pnp_read_config(dev, register_index);
+
         print_debug_char(' ');
         print_debug_hex8(register_value);
         if ((register_index & 0x0f) == 0x0f) {
         	print_debug("\r\n");
         }
-    }

-

-   	print_debug("\r\n");

+    }
+
+   	print_debug("\r\n");
 }
 #endif
diff --git a/src/superio/smsc/lpc47m10x/lpc47m10x_early_serial.c b/src/superio/smsc/lpc47m10x/lpc47m10x_early_serial.c
index 013453a9f4..70f7b20174 100644
--- a/src/superio/smsc/lpc47m10x/lpc47m10x_early_serial.c
+++ b/src/superio/smsc/lpc47m10x/lpc47m10x_early_serial.c
@@ -1,63 +1,58 @@
-/*

- * $Header$

- *

- * lpc47m10x_early_serial.c: Pre-RAM driver for SMSC LPC47M10X2 Super I/O chip

+/*
+ * lpc47m10x_early_serial.c: Pre-RAM driver for SMSC LPC47M10X2 Super I/O chip
  * derived from lpc47n217
- *

- * Copyright (C) 2005 Digital Design Corporation

- *

- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * $Log$

- *

- */

+ *
+ * Copyright (C) 2005 Digital Design Corporation
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include <arch/romcc_io.h>
 #include "lpc47m10x.h"
 
-//----------------------------------------------------------------------------------

-// Function:    	pnp_enter_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Enable access to the LPC47M10X2's configuration registers.

-//

+//----------------------------------------------------------------------------------
+// Function:    	pnp_enter_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Enable access to the LPC47M10X2's configuration registers.
+//
 static inline void pnp_enter_conf_state(device_t dev) {
 	unsigned port = dev>>8;
     outb(0x55, port);
-}

+}
 
-//----------------------------------------------------------------------------------

-// Function:    	pnp_exit_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Disable access to the LPC47M10X2's configuration registers.

-//

+//----------------------------------------------------------------------------------
+// Function:    	pnp_exit_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Disable access to the LPC47M10X2's configuration registers.
+//
 static void pnp_exit_conf_state(device_t dev) {
 	unsigned port = dev>>8;
     outb(0xaa, port);
 }
 
-//----------------------------------------------------------------------------------

-// Function:    	lpc47b272_enable_serial

-// Parameters:  	dev - high 8 bits = Super I/O port, 

-//						  low 8 bits = logical device number (per lpc47b272.h)

-//					iobase - processor I/O port address to assign to this serial device

-// Return Value:	bool

-// Description: 	Configure the base I/O port of the specified serial device

-//					and enable the serial device.

-//

+//----------------------------------------------------------------------------------
+// Function:    	lpc47b272_enable_serial
+// Parameters:  	dev - high 8 bits = Super I/O port, 
+//						  low 8 bits = logical device number (per lpc47b272.h)
+//					iobase - processor I/O port address to assign to this serial device
+// Return Value:	bool
+// Description: 	Configure the base I/O port of the specified serial device
+//					and enable the serial device.
+//
 static void lpc47b272_enable_serial(device_t dev, unsigned iobase)
 {
 	pnp_enter_conf_state(dev);
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 05449bd97d..d808514bec 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -1,6 +1,4 @@
 /*
- * $Header$
- *
  * superio.c: RAM driver for SMSC LPC47M10X2 Super I/O chip
  *
  * Copyright 2000  AG Electronics Ltd.
@@ -22,9 +20,6 @@
  * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * $Log$
- *
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c b/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c
index d3be378065..ae7c2a73a5 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c
+++ b/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c
@@ -1,155 +1,147 @@
-/*

- * $Header: /home/cvs/BIR/ca-cpu/freebios/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c,v 1.1.1.1 2005/07/11 15:28:51 smagnani Exp $

- *

- * lpc47n217_early_serial.c: Pre-RAM driver for SMSC LPC47N217 Super I/O chip

- *

- * Copyright (C) 2005 Digital Design Corporation

- *

- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * $Log: lpc47n217_early_serial.c,v $

- * Revision 1.1.1.1  2005/07/11 15:28:51  smagnani

- * Initial revision.

- *

- *

- */

-

-#include <arch/romcc_io.h>

-#include <assert.h>

-#include "lpc47n217.h"

-

-//----------------------------------------------------------------------------------

-// Function:    	pnp_enter_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Enable access to the LPC47N217's configuration registers.

-//

-static inline void pnp_enter_conf_state(device_t dev) {

-	unsigned port = dev>>8;

-    outb(0x55, port);

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	pnp_exit_conf_state

-// Parameters:  	dev - high 8 bits = Super I/O port

-// Return Value:	None

-// Description: 	Disable access to the LPC47N217's configuration registers.

-//

-static void pnp_exit_conf_state(device_t dev) {

-	unsigned port = dev>>8;

-    outb(0xaa, port);

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	lpc47n217_pnp_set_iobase

-// Parameters:  	dev - high 8 bits = Super I/O port, 

-//						  low 8 bits = logical device number (per lpc47n217.h)

-//					iobase - base I/O port for the logical device

-// Return Value:	None

-// Description: 	Program the base I/O port for the specified logical device.

-//

-void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)

-{

-	// LPC47N217 requires base ports to be a multiple of 4

-	ASSERT(!(iobase & 0x3));

-

-	switch(dev & 0xFF) {

-	case LPC47N217_PP: 

-		pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff);

-		break;

-		

-	case LPC47N217_SP1: 

-		pnp_write_config(dev, 0x24, (iobase >> 2) & 0xff);

-		break;

-		

-	case LPC47N217_SP2:

-		pnp_write_config(dev, 0x25, (iobase >> 2) & 0xff);

-		break;

-		

-	default:

-		break;

-	}

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	lpc47n217_pnp_set_enable

-// Parameters:  	dev - high 8 bits = Super I/O port, 

-//						  low 8 bits = logical device number (per lpc47n217.h)

-//					enable - 0 to disable, anythig else to enable

-// Return Value:	None

-// Description: 	Enable or disable the specified logical device.

-//					Technically, a full disable requires setting the device's base

-//					I/O port below 0x100. We don't do that here, because we don't

-//					have access to a data structure that specifies what the 'real'

-//					base port is (when asked to enable the device). Also the function

-//					is used only to disable the device while its true base port is

-//					programmed (see lpc47n217_enable_serial() below).

-//

-void lpc47n217_pnp_set_enable(device_t dev, int enable)

-{

-	uint8_t power_register = 0;

-	uint8_t power_mask = 0;

-	uint8_t current_power;

-	uint8_t new_power;

-	

-	switch(dev & 0xFF) {

-	case LPC47N217_PP: 

-		power_register = 0x01;

-		power_mask = 0x04;

-		break;

-		

-	case LPC47N217_SP1: 

-		power_register = 0x02;

-		power_mask = 0x08;

-		break;

-		

-	case LPC47N217_SP2:

-		power_register = 0x02;

-		power_mask = 0x80;

-		break;

-		

-	default:

-		return;

-	}

-

-	current_power = pnp_read_config(dev, power_register);

-	new_power = current_power & ~power_mask;		// disable by default

-

-	if (enable)

-		new_power |= power_mask;		// Enable

-

-	pnp_write_config(dev, power_register, new_power);

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	lpc47n217_enable_serial

-// Parameters:  	dev - high 8 bits = Super I/O port, 

-//						  low 8 bits = logical device number (per lpc47n217.h)

-//					iobase - processor I/O port address to assign to this serial device

-// Return Value:	bool

-// Description: 	Configure the base I/O port of the specified serial device

-//					and enable the serial device.

-//

-static void lpc47n217_enable_serial(device_t dev, unsigned iobase)

-{

-	// NOTE: Cannot use pnp_set_XXX() here because they assume chip

-	//		 support for logical devices, which the LPC47N217 doesn't have

-	

-	pnp_enter_conf_state(dev);

-	lpc47n217_pnp_set_enable(dev, 0);

-	lpc47n217_pnp_set_iobase(dev, iobase);

-	lpc47n217_pnp_set_enable(dev, 1);

-	pnp_exit_conf_state(dev);

-}

+/*
+ * lpc47n217_early_serial.c: Pre-RAM driver for SMSC LPC47N217 Super I/O chip
+ *
+ * Copyright (C) 2005 Digital Design Corporation
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <arch/romcc_io.h>
+#include <assert.h>
+#include "lpc47n217.h"
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_enter_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Enable access to the LPC47N217's configuration registers.
+//
+static inline void pnp_enter_conf_state(device_t dev) {
+	unsigned port = dev>>8;
+    outb(0x55, port);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_exit_conf_state
+// Parameters:  	dev - high 8 bits = Super I/O port
+// Return Value:	None
+// Description: 	Disable access to the LPC47N217's configuration registers.
+//
+static void pnp_exit_conf_state(device_t dev) {
+	unsigned port = dev>>8;
+    outb(0xaa, port);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47n217_pnp_set_iobase
+// Parameters:  	dev - high 8 bits = Super I/O port, 
+//						  low 8 bits = logical device number (per lpc47n217.h)
+//					iobase - base I/O port for the logical device
+// Return Value:	None
+// Description: 	Program the base I/O port for the specified logical device.
+//
+void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)
+{
+	// LPC47N217 requires base ports to be a multiple of 4
+	ASSERT(!(iobase & 0x3));
+
+	switch(dev & 0xFF) {
+	case LPC47N217_PP: 
+		pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff);
+		break;
+		
+	case LPC47N217_SP1: 
+		pnp_write_config(dev, 0x24, (iobase >> 2) & 0xff);
+		break;
+		
+	case LPC47N217_SP2:
+		pnp_write_config(dev, 0x25, (iobase >> 2) & 0xff);
+		break;
+		
+	default:
+		break;
+	}
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47n217_pnp_set_enable
+// Parameters:  	dev - high 8 bits = Super I/O port, 
+//						  low 8 bits = logical device number (per lpc47n217.h)
+//					enable - 0 to disable, anythig else to enable
+// Return Value:	None
+// Description: 	Enable or disable the specified logical device.
+//					Technically, a full disable requires setting the device's base
+//					I/O port below 0x100. We don't do that here, because we don't
+//					have access to a data structure that specifies what the 'real'
+//					base port is (when asked to enable the device). Also the function
+//					is used only to disable the device while its true base port is
+//					programmed (see lpc47n217_enable_serial() below).
+//
+void lpc47n217_pnp_set_enable(device_t dev, int enable)
+{
+	uint8_t power_register = 0;
+	uint8_t power_mask = 0;
+	uint8_t current_power;
+	uint8_t new_power;
+	
+	switch(dev & 0xFF) {
+	case LPC47N217_PP: 
+		power_register = 0x01;
+		power_mask = 0x04;
+		break;
+		
+	case LPC47N217_SP1: 
+		power_register = 0x02;
+		power_mask = 0x08;
+		break;
+		
+	case LPC47N217_SP2:
+		power_register = 0x02;
+		power_mask = 0x80;
+		break;
+		
+	default:
+		return;
+	}
+
+	current_power = pnp_read_config(dev, power_register);
+	new_power = current_power & ~power_mask;		// disable by default
+
+	if (enable)
+		new_power |= power_mask;		// Enable
+
+	pnp_write_config(dev, power_register, new_power);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47n217_enable_serial
+// Parameters:  	dev - high 8 bits = Super I/O port, 
+//						  low 8 bits = logical device number (per lpc47n217.h)
+//					iobase - processor I/O port address to assign to this serial device
+// Return Value:	bool
+// Description: 	Configure the base I/O port of the specified serial device
+//					and enable the serial device.
+//
+static void lpc47n217_enable_serial(device_t dev, unsigned iobase)
+{
+	// NOTE: Cannot use pnp_set_XXX() here because they assume chip
+	//		 support for logical devices, which the LPC47N217 doesn't have
+	
+	pnp_enter_conf_state(dev);
+	lpc47n217_pnp_set_enable(dev, 0);
+	lpc47n217_pnp_set_iobase(dev, iobase);
+	lpc47n217_pnp_set_enable(dev, 1);
+	pnp_exit_conf_state(dev);
+}
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 362f257fac..419b3babeb 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -1,394 +1,386 @@
-/*

- * $Header: /home/cvs/BIR/ca-cpu/freebios/src/superio/smsc/lpc47n217/superio.c,v 1.1.1.1 2005/07/11 15:28:51 smagnani Exp $

- *

- * superio.c: RAM-based driver for SMSC LPC47N217 Super I/O chip

- *

- * Based on LinuxBIOS code for SMSC 47B397:

- * Copyright 2000  AG Electronics Ltd.

- * Copyright 2003-2004 Linux Networx

- * Copyright 2004 Tyan 

- *

- * Copyright (C) 2005 Digital Design Corporation

- *

- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * $Log: superio.c,v $

- * Revision 1.1.1.1  2005/07/11 15:28:51  smagnani

- * Initial revision.

- *

- *

- */

-

-#include <arch/io.h>

-#include <device/device.h>

-#include <device/pnp.h>

-#include <console/console.h>

-#include <device/smbus.h>

-#include <string.h>

-#include <bitops.h>

-#include <uart8250.h>

-#include <assert.h>

-#include "chip.h"

-#include "lpc47n217.h"

-

-// Forward declarations

-static void enable_dev(device_t dev);

-void lpc47n217_pnp_set_resources(device_t dev);

-void lpc47n217_pnp_enable_resources(device_t dev);

-void lpc47n217_pnp_enable(device_t dev);

-static void lpc47n217_init(device_t dev);

-

-static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource);

-void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase);

-void lpc47n217_pnp_set_drq(device_t dev, unsigned drq);

-void lpc47n217_pnp_set_irq(device_t dev, unsigned irq);

-void lpc47n217_pnp_set_enable(device_t dev, int enable);

-

-static void pnp_enter_conf_state(device_t dev);

-static void pnp_exit_conf_state(device_t dev);

-

-

-struct chip_operations superio_smsc_lpc47n217_ops = {

-	CHIP_NAME("smsc lpc47n217")

-	.enable_dev = enable_dev,

-};

-

-static struct device_operations ops = {

-	.read_resources   = pnp_read_resources,

-	.set_resources    = lpc47n217_pnp_set_resources,

-	.enable_resources = lpc47n217_pnp_enable_resources,

-	.enable           = lpc47n217_pnp_enable,

-	.init             = lpc47n217_init,

-};

-

-static struct pnp_info pnp_dev_info[] = {

-        { &ops, LPC47N217_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },

-        { &ops, LPC47N217_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },

-        { &ops, LPC47N217_SP2,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }

-};

-

-/**********************************************************************************/

-/*								PUBLIC INTERFACE								  */

-/**********************************************************************************/

-

-//----------------------------------------------------------------------------------

-// Function:    	enable_dev

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Create device structures and allocate resources to devices 

-//					specified in the pnp_dev_info array (above).

-//

-static void enable_dev(device_t dev)

-{

-	pnp_enable_devices(dev, &pnp_ops, 

-					   sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), 

-					   pnp_dev_info);

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	lpc47n217_pnp_set_resources

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Configure the specified Super I/O device with the resources

-//					(I/O space, etc.) that have been allocate for it.

-//

-void lpc47n217_pnp_set_resources(device_t dev)

-{

-	int i;

-	

-	pnp_enter_conf_state(dev);  

-

-	// NOTE: Cannot use pnp_set_resources() here because it assumes chip

-	//		 support for logical devices, which the LPC47N217 doesn't have

-	for(i = 0; i < dev->resources; i++)

-		lpc47n217_pnp_set_resource(dev, &dev->resource[i]);

-

-//	dump_pnp_device(dev);

-                

-   	pnp_exit_conf_state(dev);  

-}       

-

-void lpc47n217_pnp_enable_resources(device_t dev)

-{       

-    pnp_enter_conf_state(dev);

-

-	// NOTE: Cannot use pnp_enable_resources() here because it assumes chip

-	//		 support for logical devices, which the LPC47N217 doesn't have

-    lpc47n217_pnp_set_enable(dev, 1);

-

-    pnp_exit_conf_state(dev);

-}

-

-void lpc47n217_pnp_enable(device_t dev)

-{

-	pnp_enter_conf_state(dev);   

-

-	// NOTE: Cannot use pnp_set_enable() here because it assumes chip

-	//		 support for logical devices, which the LPC47N217 doesn't have

-

-	if(dev->enabled) {

-		lpc47n217_pnp_set_enable(dev, 1);

-	}

-	else {

-		lpc47n217_pnp_set_enable(dev, 0);

-	}

-

-	pnp_exit_conf_state(dev);  

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	lpc47n217_init

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Initialize the specified Super I/O device.

-//					Devices other than COM ports are ignored.

-//					For COM ports, we configure the baud rate. 

-//

-static void lpc47n217_init(device_t dev)

-{

-	struct superio_smsc_lpc47n217_config* conf = dev->chip_info;

-	struct resource *res0;

-

-	if (!dev->enabled)

-		return;

-

-	switch(dev->path.u.pnp.device) {

-	case LPC47N217_SP1: 

-		res0 = find_resource(dev, PNP_IDX_IO0);

-		init_uart8250(res0->base, &conf->com1);

-		break;

-

-	case LPC47N217_SP2:

-		res0 = find_resource(dev, PNP_IDX_IO0);

-		init_uart8250(res0->base, &conf->com2);

-		break;

-	}

-}

-

-

-/**********************************************************************************/

-/*								PRIVATE FUNCTIONS							      */

-/**********************************************************************************/

-

-static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)

-{

-	if (!(resource->flags & IORESOURCE_ASSIGNED)) {

-		printk_err("ERROR: %s %02x not allocated\n",

-			dev_path(dev), resource->index);

-		return;

-	}

-

-	/* Now store the resource */

-	// NOTE: Cannot use pnp_set_XXX() here because they assume chip

-	//		 support for logical devices, which the LPC47N217 doesn't have

-

-	if (resource->flags & IORESOURCE_IO) {

-		lpc47n217_pnp_set_iobase(dev, resource->base);

-	}

-	else if (resource->flags & IORESOURCE_DRQ) {

-		lpc47n217_pnp_set_drq(dev, resource->base);

-	}

-	else if (resource->flags  & IORESOURCE_IRQ) {

-		lpc47n217_pnp_set_irq(dev, resource->base);

-	}

-	else {

-		printk_err("ERROR: %s %02x unknown resource type\n",

-			dev_path(dev), resource->index);

-		return;

-	}

-	resource->flags |= IORESOURCE_STORED;

-

-	report_resource_stored(dev, resource, "");

-}

-

-void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)

-{

-	ASSERT(!(iobase & 0x3));

-	

-	switch(dev->path.u.pnp.device) {

-	case LPC47N217_PP: 

-		pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff);

-		break;

-		

-	case LPC47N217_SP1: 

-		pnp_write_config(dev, 0x24, (iobase >> 2) & 0xff);

-		break;

-		

-	case LPC47N217_SP2:

-		pnp_write_config(dev, 0x25, (iobase >> 2) & 0xff);

-		break;

-		

-	default:

-		BUG();

-		break;

-	}

-}

-

-void lpc47n217_pnp_set_drq(device_t dev, unsigned drq)

-{

-	if (dev->path.u.pnp.device == LPC47N217_PP) {

-		const uint8_t PP_DMA_MASK = 0x0F;

-		const uint8_t PP_DMA_SELECTION_REGISTER = 0x26;

-		uint8_t current_config = pnp_read_config(dev, PP_DMA_SELECTION_REGISTER);

-		uint8_t new_config;

-

-		ASSERT(!(drq & ~PP_DMA_MASK));		// DRQ out of range??		

-		new_config = (current_config & ~PP_DMA_MASK) | drq;

-		pnp_write_config(dev, PP_DMA_SELECTION_REGISTER, new_config);

-	} else {

-		BUG();

-	}

-}

-

-void lpc47n217_pnp_set_irq(device_t dev, unsigned irq)

-{

-	uint8_t irq_config_register = 0;

-	uint8_t irq_config_mask = 0;

-	uint8_t current_config;

-	uint8_t new_config;

-	

-	switch(dev->path.u.pnp.device) {

-	case LPC47N217_PP: 

-		irq_config_register = 0x27;

-		irq_config_mask = 0x0F;

-		break;

-		

-	case LPC47N217_SP1: 

-		irq_config_register = 0x28;

-		irq_config_mask = 0xF0;

-		irq <<= 4;

-		break;

-		

-	case LPC47N217_SP2:

-		irq_config_register = 0x28;

-		irq_config_mask = 0x0F;

-		break;

-		

-	default:

-		BUG();

-		return;

-	}

-

-	ASSERT(!(irq & ~irq_config_mask));		// IRQ out of range??

-	

-	current_config = pnp_read_config(dev, irq_config_register);

-	new_config = (current_config & ~irq_config_mask) | irq;

-	pnp_write_config(dev, irq_config_register, new_config);

-}

-

-void lpc47n217_pnp_set_enable(device_t dev, int enable)

-{

-	uint8_t power_register = 0;

-	uint8_t power_mask = 0;

-	uint8_t current_power;

-	uint8_t new_power;

-	

-	switch(dev->path.u.pnp.device) {

-	case LPC47N217_PP: 

-		power_register = 0x01;

-		power_mask = 0x04;

-		break;

-		

-	case LPC47N217_SP1: 

-		power_register = 0x02;

-		power_mask = 0x08;

-		break;

-		

-	case LPC47N217_SP2:

-		power_register = 0x02;

-		power_mask = 0x80;

-		break;

-		

-	default:

-		BUG();

-		return;

-	}

-

-	current_power = pnp_read_config(dev, power_register);

-	new_power = current_power & ~power_mask;		// disable by default

-

-	if (enable) {

-		struct resource* ioport_resource = find_resource(dev, PNP_IDX_IO0);

-		lpc47n217_pnp_set_iobase(dev, ioport_resource->base);

-		

-		new_power |= power_mask;		// Enable

-		

-    } else {

-		lpc47n217_pnp_set_iobase(dev, 0);

-	}

-	pnp_write_config(dev, power_register, new_power);

-}

-

-

-//----------------------------------------------------------------------------------

-// Function:    	pnp_enter_conf_state

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Enable access to the LPC47N217's configuration registers.

-//

-static void pnp_enter_conf_state(device_t dev) 

-{

-	outb(0x55, dev->path.u.pnp.port);

-}

-

-//----------------------------------------------------------------------------------

-// Function:    	pnp_exit_conf_state

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Disable access to the LPC47N217's configuration registers.

-//

-static void pnp_exit_conf_state(device_t dev) 

-{

-    outb(0xaa, dev->path.u.pnp.port);

-}

-

-#if 0

-//----------------------------------------------------------------------------------

-// Function:    	dump_pnp_device

-// Parameters:  	dev - pointer to structure describing a Super I/O device 

-// Return Value:	None

-// Description: 	Print the values of all of the LPC47N217's configuration registers.

-//					NOTE: The LPC47N217 must be in configuration mode when this

-//						  function is called.

-//

-static void dump_pnp_device(device_t dev)

-{

-    int register_index;

-    print_debug("\r\n");

-

-    for(register_index = 0; register_index <= LPC47N217_MAX_CONFIG_REGISTER; register_index++) {

-        uint8_t register_value;

-

-        if ((register_index & 0x0f) == 0) {

-                print_debug_hex8(register_index);

-                print_debug_char(':');

-        }

-

-		// Skip over 'register' that would cause exit from configuration mode

-	    if (register_index == 0xaa)

-			register_value = 0xaa;

-		else

-        	register_value = pnp_read_config(dev, register_index);

-

-        print_debug_char(' ');

-        print_debug_hex8(register_value);

-        if ((register_index & 0x0f) == 0x0f) {

-        	print_debug("\r\n");

-        }

-    }

-

-   	print_debug("\r\n");

-}

-#endif

+/*
+ * superio.c: RAM-based driver for SMSC LPC47N217 Super I/O chip
+ *
+ * Based on LinuxBIOS code for SMSC 47B397:
+ * Copyright 2000  AG Electronics Ltd.
+ * Copyright 2003-2004 Linux Networx
+ * Copyright 2004 Tyan 
+ *
+ * Copyright (C) 2005 Digital Design Corporation
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <arch/io.h>
+#include <device/device.h>
+#include <device/pnp.h>
+#include <console/console.h>
+#include <device/smbus.h>
+#include <string.h>
+#include <bitops.h>
+#include <uart8250.h>
+#include <assert.h>
+#include "chip.h"
+#include "lpc47n217.h"
+
+// Forward declarations
+static void enable_dev(device_t dev);
+void lpc47n217_pnp_set_resources(device_t dev);
+void lpc47n217_pnp_enable_resources(device_t dev);
+void lpc47n217_pnp_enable(device_t dev);
+static void lpc47n217_init(device_t dev);
+
+static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource);
+void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase);
+void lpc47n217_pnp_set_drq(device_t dev, unsigned drq);
+void lpc47n217_pnp_set_irq(device_t dev, unsigned irq);
+void lpc47n217_pnp_set_enable(device_t dev, int enable);
+
+static void pnp_enter_conf_state(device_t dev);
+static void pnp_exit_conf_state(device_t dev);
+
+
+struct chip_operations superio_smsc_lpc47n217_ops = {
+	CHIP_NAME("smsc lpc47n217")
+	.enable_dev = enable_dev,
+};
+
+static struct device_operations ops = {
+	.read_resources   = pnp_read_resources,
+	.set_resources    = lpc47n217_pnp_set_resources,
+	.enable_resources = lpc47n217_pnp_enable_resources,
+	.enable           = lpc47n217_pnp_enable,
+	.init             = lpc47n217_init,
+};
+
+static struct pnp_info pnp_dev_info[] = {
+        { &ops, LPC47N217_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
+        { &ops, LPC47N217_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+        { &ops, LPC47N217_SP2,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }
+};
+
+/**********************************************************************************/
+/*								PUBLIC INTERFACE								  */
+/**********************************************************************************/
+
+//----------------------------------------------------------------------------------
+// Function:    	enable_dev
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Create device structures and allocate resources to devices 
+//					specified in the pnp_dev_info array (above).
+//
+static void enable_dev(device_t dev)
+{
+	pnp_enable_devices(dev, &pnp_ops, 
+					   sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), 
+					   pnp_dev_info);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47n217_pnp_set_resources
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Configure the specified Super I/O device with the resources
+//					(I/O space, etc.) that have been allocate for it.
+//
+void lpc47n217_pnp_set_resources(device_t dev)
+{
+	int i;
+	
+	pnp_enter_conf_state(dev);  
+
+	// NOTE: Cannot use pnp_set_resources() here because it assumes chip
+	//		 support for logical devices, which the LPC47N217 doesn't have
+	for(i = 0; i < dev->resources; i++)
+		lpc47n217_pnp_set_resource(dev, &dev->resource[i]);
+
+//	dump_pnp_device(dev);
+                
+   	pnp_exit_conf_state(dev);  
+}       
+
+void lpc47n217_pnp_enable_resources(device_t dev)
+{       
+    pnp_enter_conf_state(dev);
+
+	// NOTE: Cannot use pnp_enable_resources() here because it assumes chip
+	//		 support for logical devices, which the LPC47N217 doesn't have
+    lpc47n217_pnp_set_enable(dev, 1);
+
+    pnp_exit_conf_state(dev);
+}
+
+void lpc47n217_pnp_enable(device_t dev)
+{
+	pnp_enter_conf_state(dev);   
+
+	// NOTE: Cannot use pnp_set_enable() here because it assumes chip
+	//		 support for logical devices, which the LPC47N217 doesn't have
+
+	if(dev->enabled) {
+		lpc47n217_pnp_set_enable(dev, 1);
+	}
+	else {
+		lpc47n217_pnp_set_enable(dev, 0);
+	}
+
+	pnp_exit_conf_state(dev);  
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	lpc47n217_init
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Initialize the specified Super I/O device.
+//					Devices other than COM ports are ignored.
+//					For COM ports, we configure the baud rate. 
+//
+static void lpc47n217_init(device_t dev)
+{
+	struct superio_smsc_lpc47n217_config* conf = dev->chip_info;
+	struct resource *res0;
+
+	if (!dev->enabled)
+		return;
+
+	switch(dev->path.u.pnp.device) {
+	case LPC47N217_SP1: 
+		res0 = find_resource(dev, PNP_IDX_IO0);
+		init_uart8250(res0->base, &conf->com1);
+		break;
+
+	case LPC47N217_SP2:
+		res0 = find_resource(dev, PNP_IDX_IO0);
+		init_uart8250(res0->base, &conf->com2);
+		break;
+	}
+}
+
+
+/**********************************************************************************/
+/*								PRIVATE FUNCTIONS							      */
+/**********************************************************************************/
+
+static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)
+{
+	if (!(resource->flags & IORESOURCE_ASSIGNED)) {
+		printk_err("ERROR: %s %02x not allocated\n",
+			dev_path(dev), resource->index);
+		return;
+	}
+
+	/* Now store the resource */
+	// NOTE: Cannot use pnp_set_XXX() here because they assume chip
+	//		 support for logical devices, which the LPC47N217 doesn't have
+
+	if (resource->flags & IORESOURCE_IO) {
+		lpc47n217_pnp_set_iobase(dev, resource->base);
+	}
+	else if (resource->flags & IORESOURCE_DRQ) {
+		lpc47n217_pnp_set_drq(dev, resource->base);
+	}
+	else if (resource->flags  & IORESOURCE_IRQ) {
+		lpc47n217_pnp_set_irq(dev, resource->base);
+	}
+	else {
+		printk_err("ERROR: %s %02x unknown resource type\n",
+			dev_path(dev), resource->index);
+		return;
+	}
+	resource->flags |= IORESOURCE_STORED;
+
+	report_resource_stored(dev, resource, "");
+}
+
+void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)
+{
+	ASSERT(!(iobase & 0x3));
+	
+	switch(dev->path.u.pnp.device) {
+	case LPC47N217_PP: 
+		pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff);
+		break;
+		
+	case LPC47N217_SP1: 
+		pnp_write_config(dev, 0x24, (iobase >> 2) & 0xff);
+		break;
+		
+	case LPC47N217_SP2:
+		pnp_write_config(dev, 0x25, (iobase >> 2) & 0xff);
+		break;
+		
+	default:
+		BUG();
+		break;
+	}
+}
+
+void lpc47n217_pnp_set_drq(device_t dev, unsigned drq)
+{
+	if (dev->path.u.pnp.device == LPC47N217_PP) {
+		const uint8_t PP_DMA_MASK = 0x0F;
+		const uint8_t PP_DMA_SELECTION_REGISTER = 0x26;
+		uint8_t current_config = pnp_read_config(dev, PP_DMA_SELECTION_REGISTER);
+		uint8_t new_config;
+
+		ASSERT(!(drq & ~PP_DMA_MASK));		// DRQ out of range??		
+		new_config = (current_config & ~PP_DMA_MASK) | drq;
+		pnp_write_config(dev, PP_DMA_SELECTION_REGISTER, new_config);
+	} else {
+		BUG();
+	}
+}
+
+void lpc47n217_pnp_set_irq(device_t dev, unsigned irq)
+{
+	uint8_t irq_config_register = 0;
+	uint8_t irq_config_mask = 0;
+	uint8_t current_config;
+	uint8_t new_config;
+	
+	switch(dev->path.u.pnp.device) {
+	case LPC47N217_PP: 
+		irq_config_register = 0x27;
+		irq_config_mask = 0x0F;
+		break;
+		
+	case LPC47N217_SP1: 
+		irq_config_register = 0x28;
+		irq_config_mask = 0xF0;
+		irq <<= 4;
+		break;
+		
+	case LPC47N217_SP2:
+		irq_config_register = 0x28;
+		irq_config_mask = 0x0F;
+		break;
+		
+	default:
+		BUG();
+		return;
+	}
+
+	ASSERT(!(irq & ~irq_config_mask));		// IRQ out of range??
+	
+	current_config = pnp_read_config(dev, irq_config_register);
+	new_config = (current_config & ~irq_config_mask) | irq;
+	pnp_write_config(dev, irq_config_register, new_config);
+}
+
+void lpc47n217_pnp_set_enable(device_t dev, int enable)
+{
+	uint8_t power_register = 0;
+	uint8_t power_mask = 0;
+	uint8_t current_power;
+	uint8_t new_power;
+	
+	switch(dev->path.u.pnp.device) {
+	case LPC47N217_PP: 
+		power_register = 0x01;
+		power_mask = 0x04;
+		break;
+		
+	case LPC47N217_SP1: 
+		power_register = 0x02;
+		power_mask = 0x08;
+		break;
+		
+	case LPC47N217_SP2:
+		power_register = 0x02;
+		power_mask = 0x80;
+		break;
+		
+	default:
+		BUG();
+		return;
+	}
+
+	current_power = pnp_read_config(dev, power_register);
+	new_power = current_power & ~power_mask;		// disable by default
+
+	if (enable) {
+		struct resource* ioport_resource = find_resource(dev, PNP_IDX_IO0);
+		lpc47n217_pnp_set_iobase(dev, ioport_resource->base);
+		
+		new_power |= power_mask;		// Enable
+		
+    } else {
+		lpc47n217_pnp_set_iobase(dev, 0);
+	}
+	pnp_write_config(dev, power_register, new_power);
+}
+
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_enter_conf_state
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Enable access to the LPC47N217's configuration registers.
+//
+static void pnp_enter_conf_state(device_t dev) 
+{
+	outb(0x55, dev->path.u.pnp.port);
+}
+
+//----------------------------------------------------------------------------------
+// Function:    	pnp_exit_conf_state
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Disable access to the LPC47N217's configuration registers.
+//
+static void pnp_exit_conf_state(device_t dev) 
+{
+    outb(0xaa, dev->path.u.pnp.port);
+}
+
+#if 0
+//----------------------------------------------------------------------------------
+// Function:    	dump_pnp_device
+// Parameters:  	dev - pointer to structure describing a Super I/O device 
+// Return Value:	None
+// Description: 	Print the values of all of the LPC47N217's configuration registers.
+//					NOTE: The LPC47N217 must be in configuration mode when this
+//						  function is called.
+//
+static void dump_pnp_device(device_t dev)
+{
+    int register_index;
+    print_debug("\r\n");
+
+    for(register_index = 0; register_index <= LPC47N217_MAX_CONFIG_REGISTER; register_index++) {
+        uint8_t register_value;
+
+        if ((register_index & 0x0f) == 0) {
+                print_debug_hex8(register_index);
+                print_debug_char(':');
+        }
+
+		// Skip over 'register' that would cause exit from configuration mode
+	    if (register_index == 0xaa)
+			register_value = 0xaa;
+		else
+        	register_value = pnp_read_config(dev, register_index);
+
+        print_debug_char(' ');
+        print_debug_hex8(register_value);
+        if ((register_index & 0x0f) == 0x0f) {
+        	print_debug("\r\n");
+        }
+    }
+
+   	print_debug("\r\n");
+}
+#endif