Drop baud rate init to an arbitrary baud rate from Super I/O code.

                                                                                                                                                                                
See discussion at                                                                                                                                                               
http://www.mail-archive.com/coreboot@coreboot.org/msg29394.html                                                                                                                 
                                                                                                                                                                                
config->com1, devicetree.cb cleanup and init_uart8250() removal                                                                                                                 
will follow once this patch is comitted                                                                                                                                         
                                                                                                                                                                                
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>                                                                                                                   
Acked-by: Patrick Georgi <patrick@georgi-clan.de>                                                                                                                               

Updated to drop com1, com2.... from config structure and devicetree.cb



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

90 files changed, 47 insertions, 462 deletions

diff --git a/src/superio/fintek/f71805f/chip.h b/src/superio/fintek/f71805f/chip.h
index 3ab1a7c2e2..6e9c6c9241 100644
--- a/src/superio/fintek/f71805f/chip.h
+++ b/src/superio/fintek/f71805f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_fintek_f71805f_ops;
 
 struct superio_fintek_f71805f_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index 6b2b9c2df6..5f179466ca 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -40,23 +40,10 @@ static void pnp_exit_conf_state(device_t dev)
 
 static void f71805f_init(device_t dev)
 {
-	struct superio_fintek_f71805f_config *conf = dev->chip_info;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
 
-	switch(dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F71805F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case F71805F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-	}
 }
 
 static void f71805f_pnp_set_resources(device_t dev)
diff --git a/src/superio/fintek/f71859/chip.h b/src/superio/fintek/f71859/chip.h
index a0de2d5982..84008623e1 100755
--- a/src/superio/fintek/f71859/chip.h
+++ b/src/superio/fintek/f71859/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_fintek_f71859_ops;
 
 struct superio_fintek_f71859_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 6c74d81516..809140b5a1 100755
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -41,19 +41,10 @@ static void pnp_exit_conf_state(device_t dev)
 
 static void f71859_init(device_t dev)
 {
-	struct superio_fintek_f71859_config *conf = dev->chip_info;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
 
-	switch(dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F71859_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	}
 }
 
 static void f71859_pnp_set_resources(device_t dev)
diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h
index 5ccfa5bd76..ce9fd480b2 100644
--- a/src/superio/fintek/f71863fg/chip.h
+++ b/src/superio/fintek/f71863fg/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_fintek_f71863fg_ops;
 
 struct superio_fintek_f71863fg_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 3c7ebd277a..62f5f8cfa1 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -48,14 +48,6 @@ static void f71863fg_init(device_t dev)
 
 	switch(dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F71863FG_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case F71863FG_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case F71863FG_KBC:
 		res0 = find_resource(dev, PNP_IDX_IO0);
 		pc_keyboard_init(&conf->keyboard);
diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h
index 6625711a68..58ee4217ca 100644
--- a/src/superio/fintek/f71872/chip.h
+++ b/src/superio/fintek/f71872/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_fintek_f71872_ops;
 
 struct superio_fintek_f71872_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 0e1f4d0169..987f53691b 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -40,21 +40,12 @@ static void pnp_exit_conf_state(device_t dev)
 static void f71872_init(device_t dev)
 {
 	struct superio_fintek_f71872_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F71872_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case F71872_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case F71872_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h
index b4357b2018..c7752164cb 100644
--- a/src/superio/fintek/f71889/chip.h
+++ b/src/superio/fintek/f71889/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_fintek_f71889_ops;
 
 struct superio_fintek_f71889_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 5f4ca3fc23..bed421aa24 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -41,21 +41,12 @@ static void pnp_exit_conf_state(device_t dev)
 static void f71889_init(device_t dev)
 {
 	struct superio_fintek_f71889_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F71889_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case F71889_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case F71889_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h
index 2789e2805f..6ff30012ca 100644
--- a/src/superio/fintek/f81865f/chip.h
+++ b/src/superio/fintek/f81865f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_fintek_f81865f_ops;
 
 struct superio_fintek_f81865f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index dd964e4e23..7c5c2d2205 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -40,21 +40,12 @@ static void pnp_exit_conf_state(device_t dev)
 static void f81865f_init(device_t dev)
 {
 	struct superio_fintek_f81865f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
 	/* TODO: Might potentially need code for HWM or FDC etc. */
-	case F81865F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case F81865F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case F81865F_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/intel/i3100/chip.h b/src/superio/intel/i3100/chip.h
index e6666e5bbf..4ed322527a 100644
--- a/src/superio/intel/i3100/chip.h
+++ b/src/superio/intel/i3100/chip.h
@@ -27,7 +27,6 @@
 extern struct chip_operations superio_intel_i3100_ops;
 
 struct superio_intel_i3100_config {
-	struct uart8250 com1, com2;
 };
 
 #endif
diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c
index 143e649ed7..74862eb6ff 100644
--- a/src/superio/intel/i3100/superio.c
+++ b/src/superio/intel/i3100/superio.c
@@ -40,24 +40,8 @@ static void pnp_exit_ext_func_mode(device_t dev)
 
 static void i3100_init(device_t dev)
 {
-	struct superio_intel_i3100_config *conf;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
-
-	conf = dev->chip_info;
-
-	switch (dev->path.pnp.device) {
-	case I3100_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case I3100_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-	}
 }
 
 static void i3100_pnp_set_resources(device_t dev)
diff --git a/src/superio/ite/it8661f/chip.h b/src/superio/ite/it8661f/chip.h
index 81cf1fc03d..744316e0e4 100644
--- a/src/superio/ite/it8661f/chip.h
+++ b/src/superio/ite/it8661f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_ite_it8661f_ops;
 
 struct superio_ite_it8661f_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index 165a6384d2..fcf54e7dc3 100644
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -29,23 +29,12 @@
 
 static void init(device_t dev)
 {
-	struct superio_ite_it8661f_config *conf = dev->chip_info;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
 	case IT8661F_FDC: /* TODO. */
 		break;
-	case IT8661F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8661F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8661F_PP: /* TODO. */
 		break;
 	case IT8661F_IR: /* TODO. */
diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h
index 529c6b4458..3dd2d81a5b 100644
--- a/src/superio/ite/it8671f/chip.h
+++ b/src/superio/ite/it8671f/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_ite_it8671f_ops;
 
 struct superio_ite_it8671f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 1045a2ad07..4b5577257e 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -29,7 +29,6 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8671f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -37,14 +36,6 @@ static void init(device_t dev)
 	switch (dev->path.pnp.device) {
 	case IT8671F_FDC: /* TODO. */
 		break;
-	case IT8671F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8671F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8671F_PP: /* TODO. */
 		break;
 	case IT8671F_KBCK:
diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h
index bfb6d72b37..431098e433 100644
--- a/src/superio/ite/it8673f/chip.h
+++ b/src/superio/ite/it8673f/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_ite_it8673f_ops;
 
 struct superio_ite_it8673f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index 8acca88bae..9103800210 100644
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -29,7 +29,6 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8673f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -37,14 +36,6 @@ static void init(device_t dev)
 	switch (dev->path.pnp.device) {
 	case IT8673F_FDC: /* TODO. */
 		break;
-	case IT8673F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8673F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8673F_PP: /* TODO. */
 		break;
 	case IT8673F_FAN: /* TODO. */
diff --git a/src/superio/ite/it8705f/chip.h b/src/superio/ite/it8705f/chip.h
index 0697ac77b4..be4a8d7b6d 100644
--- a/src/superio/ite/it8705f/chip.h
+++ b/src/superio/ite/it8705f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_ite_it8705f_ops;
 
 struct superio_ite_it8705f_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 1797023a2b..8f14a34c53 100644
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -28,7 +28,6 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8705f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -36,14 +35,6 @@ static void init(device_t dev)
 	switch (dev->path.pnp.device) {
 	case IT8705F_FDC: /* TODO. */
 		break;
-	case IT8705F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8705F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8705F_PP: /* TODO. */
 		break;
 	case IT8705F_EC: /* TODO. */
diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h
index 844d4df7a0..76401099df 100644
--- a/src/superio/ite/it8712f/chip.h
+++ b/src/superio/ite/it8712f/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_ite_it8712f_ops;
 
 struct superio_ite_it8712f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index c84a92916f..0265d35f5f 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -46,7 +46,6 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void it8712f_init(device_t dev)
 {
 	struct superio_ite_it8712f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -54,14 +53,6 @@ static void it8712f_init(device_t dev)
 	switch (dev->path.pnp.device) {
 	case IT8712F_FDC: /* TODO. */
 		break;
-	case IT8712F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8712F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8712F_PP: /* TODO. */
 		break;
 	case IT8712F_EC: /* TODO. */
diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h
index be6e0a10c1..0c2f387a3e 100644
--- a/src/superio/ite/it8716f/chip.h
+++ b/src/superio/ite/it8716f/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_ite_it8716f_ops;
 
 struct superio_ite_it8716f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index c7109465b5..46d5c979fd 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -85,14 +85,6 @@ static void it8716f_init(device_t dev)
 
 	/* TODO: FDC, PP, KBCM, MIDI, GAME, IR. */
 	switch (dev->path.pnp.device) {
-	case IT8716F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8716F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8716F_EC:
 		res0 = find_resource(dev, PNP_IDX_IO0);
 #define EC_INDEX_PORT 5
diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h
index b0ee40566c..78044aa1d7 100644
--- a/src/superio/ite/it8718f/chip.h
+++ b/src/superio/ite/it8718f/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_ite_it8718f_ops;
 
 struct superio_ite_it8718f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 2190578f6a..8a6c8b813c 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -29,7 +29,6 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8718f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -37,14 +36,6 @@ static void init(device_t dev)
 	switch (dev->path.pnp.device) {
 	case IT8718F_FDC: /* TODO. */
 		break;
-	case IT8718F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case IT8718F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case IT8718F_PP: /* TODO. */
 		break;
 	case IT8718F_EC: /* TODO. */
diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h
index 9e5e8dda85..ec0a57a617 100644
--- a/src/superio/nsc/pc8374/chip.h
+++ b/src/superio/nsc/pc8374/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc8374_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc8374_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 0dd33d597e..d5060c4d05 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -34,20 +34,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc8374_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC8374_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC8374_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC8374_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h
index fd4c0cc9c6..8a612245bd 100644
--- a/src/superio/nsc/pc87309/chip.h
+++ b/src/superio/nsc/pc87309/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_nsc_pc87309_ops;
 
 struct superio_nsc_pc87309_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index e3f7b7b0fe..6e56e38e86 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -30,20 +30,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87309_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
-	case PC87309_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87309_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87309_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h
index 44af196c64..cb835c7963 100644
--- a/src/superio/nsc/pc87351/chip.h
+++ b/src/superio/nsc/pc87351/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87351_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87351_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index aa8c6fdae0..259430e0f5 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -34,20 +34,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87351_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87351_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87351_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87351_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h
index 57bc26ac66..712176dd8a 100644
--- a/src/superio/nsc/pc87360/chip.h
+++ b/src/superio/nsc/pc87360/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87360_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87360_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index b6cd729e81..5da68e2c11 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -34,20 +34,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87360_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87360_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87360_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87360_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h
index ec37a3d93e..75ce691ac0 100644
--- a/src/superio/nsc/pc87366/chip.h
+++ b/src/superio/nsc/pc87366/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nsc_pc87366_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87366_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index af8f8993a2..b5f28700ec 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -34,20 +34,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87366_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87366_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87366_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87366_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87382/chip.h b/src/superio/nsc/pc87382/chip.h
index 316f9645a3..18d570ad1e 100644
--- a/src/superio/nsc/pc87382/chip.h
+++ b/src/superio/nsc/pc87382/chip.h
@@ -25,7 +25,7 @@
 extern struct chip_operations superio_nsc_pc87382_ops;
 
 struct superio_nsc_pc87382_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index fd9fdc55d7..4a4fbde387 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -33,21 +33,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87382_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87382_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87382_IR:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-
 	case PC87382_DOCK:
 		break;
 
diff --git a/src/superio/nsc/pc87384/chip.h b/src/superio/nsc/pc87384/chip.h
index 4eaa92f3ec..d006478962 100644
--- a/src/superio/nsc/pc87384/chip.h
+++ b/src/superio/nsc/pc87384/chip.h
@@ -25,7 +25,7 @@
 extern struct chip_operations superio_nsc_pc87384_ops;
 
 struct superio_nsc_pc87384_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 5bd318fb3d..b6ac07c7fd 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -33,21 +33,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87384_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87384_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87384_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-
 	case PC87384_GPIO:
 		break;
 	}
diff --git a/src/superio/nsc/pc87392/chip.h b/src/superio/nsc/pc87392/chip.h
index 0465d21b7f..1241cb2f44 100644
--- a/src/superio/nsc/pc87392/chip.h
+++ b/src/superio/nsc/pc87392/chip.h
@@ -26,7 +26,7 @@ extern struct chip_operations superio_nsc_pc87392_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87392_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 30bf563897..1b527ad679 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -31,23 +31,8 @@
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87392_config *conf = dev->chip_info;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
-
-	switch(dev->path.pnp.device) {
-	case PC87392_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-
-	case PC87392_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-	}
 }
 
 static struct device_operations ops = {
diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h
index 1b661ef8af..a66bb40a97 100644
--- a/src/superio/nsc/pc87417/chip.h
+++ b/src/superio/nsc/pc87417/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87417_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87417_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index fede61e6bd..9cd0e6bd4d 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -35,20 +35,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87417_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87417_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87417_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87417_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h
index 531e2df58e..d044fe09ff 100644
--- a/src/superio/nsc/pc87427/chip.h
+++ b/src/superio/nsc/pc87427/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nsc_pc87427_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87427_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index 088fd0aa6f..3646fd1e1a 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -32,20 +32,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87427_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC87427_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC87427_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC87427_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
index 43e8044ea5..838d36b9e2 100644
--- a/src/superio/nsc/pc97307/chip.h
+++ b/src/superio/nsc/pc97307/chip.h
@@ -34,7 +34,7 @@ extern struct chip_operations superio_nsc_pc97307_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc97307_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 #endif
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index b8ae944153..db10a75c97 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -29,21 +29,12 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc97307_config *conf = dev->chip_info;
-	struct resource *res0;
 	u8 reg8;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC97307_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC97307_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC97307_KBCK:
 		pnp_set_logical_device(dev);
 		pnp_set_enable(dev, 0);		   /* Disable keyboard */
diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
index 798561ba36..6c415f6aee 100644
--- a/src/superio/nsc/pc97317/chip.h
+++ b/src/superio/nsc/pc97317/chip.h
@@ -34,7 +34,7 @@ extern struct chip_operations superio_nsc_pc97317_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc97317_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 5d7824f117..7157f9b562 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -29,20 +29,11 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc97317_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case PC97317_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case PC97317_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case PC97317_KBCK:
 		pnp_set_logical_device(dev);
 		pnp_set_enable(dev, 0);		   /* Disable keyboard */
diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h
index a5fdba76e2..2afc2de597 100644
--- a/src/superio/nuvoton/wpcm450/chip.h
+++ b/src/superio/nuvoton/wpcm450/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nuvoton_wpcm450_ops;
 #include <uart8250.h>
 
 struct superio_nuvoton_wpcm450_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index e97be7a198..879f40591e 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -33,20 +33,11 @@
 static void init(device_t dev)
 {
 	struct superio_nuvoton_wpcm450_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case WPCM450_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case WPCM450_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case WPCM450_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h
index eca6422342..2a1186fe0e 100644
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ b/src/superio/smsc/fdc37m60x/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_smsc_fdc37m60x_ops;
 
 struct superio_smsc_fdc37m60x_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index d074c648de..c49e978d04 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -29,7 +29,6 @@
 static void init(device_t dev)
 {
 	struct superio_smsc_fdc37m60x_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -39,14 +38,6 @@ static void init(device_t dev)
 		break;
 	case FDC37M60X_PP: /* TODO. */
 		break;
-	case FDC37M60X_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case FDC37M60X_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case FDC37M60X_KBCK:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
index 0d8c18a8cb..abaf765153 100644
--- a/src/superio/smsc/fdc37n972/chip.h
+++ b/src/superio/smsc/fdc37n972/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_smsc_fdc37n972_ops;
 
 struct superio_smsc_fdc37n972_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h
index 4ca90e360f..020224f650 100644
--- a/src/superio/smsc/kbc1100/chip.h
+++ b/src/superio/smsc/kbc1100/chip.h
@@ -27,7 +27,7 @@ struct chip_operations;
 extern struct chip_operations superio_smsc_kbc1100_ops;
 
 struct superio_smsc_kbc1100_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h
index b96063c7f7..031cd20f55 100644
--- a/src/superio/smsc/lpc47b272/chip.h
+++ b/src/superio/smsc/lpc47b272/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_lpc47b272_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47b272_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 0f5ea9272b..f57c306d98 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -120,20 +120,11 @@ static void lpc47b272_pnp_enable(device_t dev)
 static void lpc47b272_init(device_t dev)
 {
 	struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case LPC47B272_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case LPC47B272_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case LPC47B272_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h
index b18b6a556f..3f3c719bf4 100644
--- a/src/superio/smsc/lpc47b397/chip.h
+++ b/src/superio/smsc/lpc47b397/chip.h
@@ -30,7 +30,7 @@ extern struct chip_operations superio_smsc_lpc47b397_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47b397_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index a0a6c1db19..fa549db46b 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -68,20 +68,11 @@ static void enable_hwm_smbus(device_t dev)
 static void lpc47b397_init(device_t dev)
 {
 	struct superio_smsc_lpc47b397_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case LPC47B397_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case LPC47B397_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case LPC47B397_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h
index ace92f1c2f..79b72dae43 100644
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ b/src/superio/smsc/lpc47m10x/chip.h
@@ -32,7 +32,7 @@ extern struct chip_operations superio_smsc_lpc47m10x_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47m10x_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 04140b13f8..0be8742e45 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -118,20 +118,11 @@ static void lpc47m10x_pnp_enable(device_t dev)
 static void lpc47m10x_init(device_t dev)
 {
 	struct superio_smsc_lpc47m10x_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case LPC47M10X2_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case LPC47M10X2_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case LPC47M10X2_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h
index a4532bb454..27031f21b2 100644
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ b/src/superio/smsc/lpc47m15x/chip.h
@@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47m15x_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47m15x_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 54762de1c1..222e3c9eec 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -94,20 +94,11 @@ static void lpc47m15x_pnp_enable(device_t dev)
 static void lpc47m15x_init(device_t dev)
 {
 	struct superio_smsc_lpc47m15x_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case LPC47M15X_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case LPC47M15X_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case LPC47M15X_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/smsc/lpc47n217/chip.h b/src/superio/smsc/lpc47n217/chip.h
index 0eda25f6b1..c29031a85c 100644
--- a/src/superio/smsc/lpc47n217/chip.h
+++ b/src/superio/smsc/lpc47n217/chip.h
@@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47n217_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47n217_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index b1455330d0..88832e13d6 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -134,21 +134,9 @@ static void lpc47n217_pnp_enable(device_t dev)
 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.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;
-	}
 }
 
 static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)
diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h
index b2d0a9218f..fa0269971c 100644
--- a/src/superio/smsc/lpc47n227/chip.h
+++ b/src/superio/smsc/lpc47n227/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_smsc_lpc47n227_ops;
 
 struct superio_smsc_lpc47n227_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 20345b8230..c7ffd69624 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -131,20 +131,11 @@ void lpc47n227_pnp_enable(device_t dev)
 static void lpc47n227_init(device_t dev)
 {
 	struct superio_smsc_lpc47n227_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
-	case LPC47N227_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case LPC47N227_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case LPC47N227_KBDC:
 		printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n");
 		pc_keyboard_init(&conf->keyboard);
diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
index 43ad168223..32703bb394 100644
--- a/src/superio/smsc/sio10n268/chip.h
+++ b/src/superio/smsc/sio10n268/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_smsc_sio10n268_ops;
 
 struct superio_smsc_sio10n268_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h
index 1655eea102..ffe4b21ce3 100644
--- a/src/superio/smsc/smscsuperio/chip.h
+++ b/src/superio/smsc/smscsuperio/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_smsc_smscsuperio_ops;
 
 struct superio_smsc_smscsuperio_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index e618823fa4..4026affa66 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -205,7 +205,6 @@ static void smsc_pnp_enable(device_t dev)
 static void smsc_init(device_t dev)
 {
 	struct superio_smsc_smscsuperio_config *conf = dev->chip_info;
-	struct resource *res0;
 	int i, ld;
 
 	/* Do not initialize disabled devices. */
@@ -223,13 +222,7 @@ static void smsc_init(device_t dev)
 
 	/* A Super I/O was found, so initialize the respective device. */
 	ld = dev->path.pnp.device;
-	if (ld == logical_device_table[i].devs[LD_SP1]) {
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-	} else if (ld == logical_device_table[i].devs[LD_SP2]) {
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-	} else if (ld == logical_device_table[i].devs[LD_KBC]) {
+	if (ld == logical_device_table[i].devs[LD_KBC]) {
 		pc_keyboard_init(&conf->keyboard);
 	}
 }
diff --git a/src/superio/via/vt1211/chip.h b/src/superio/via/vt1211/chip.h
index 4d88e9637e..2154996a44 100644
--- a/src/superio/via/vt1211/chip.h
+++ b/src/superio/via/vt1211/chip.h
@@ -26,7 +26,7 @@
 extern struct chip_operations superio_via_vt1211_ops;
 
 struct superio_via_vt1211_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h
index 4aec1bf741..51c56e892b 100644
--- a/src/superio/winbond/w83627dhg/chip.h
+++ b/src/superio/winbond/w83627dhg/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_winbond_w83627dhg_ops;
 
 struct superio_winbond_w83627dhg_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 7f7bf21d3a..1771c269e2 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -40,20 +40,11 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void w83627dhg_init(device_t dev)
 {
 	struct superio_winbond_w83627dhg_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83627DHG_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83627DHG_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83627DHG_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h
index 21a53de4ab..f3fe8ce9e2 100644
--- a/src/superio/winbond/w83627ehg/chip.h
+++ b/src/superio/winbond/w83627ehg/chip.h
@@ -28,7 +28,7 @@
 extern struct chip_operations superio_winbond_w83627ehg_ops;
 
 struct superio_winbond_w83627ehg_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index d174cace8f..85747f26eb 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -114,14 +114,6 @@ static void w83627ehg_init(device_t dev)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83627EHG_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83627EHG_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83627EHG_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h
index 3b0d4aca69..14793ddbfe 100644
--- a/src/superio/winbond/w83627hf/chip.h
+++ b/src/superio/winbond/w83627hf/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_winbond_w83627hf_ops;
 
 struct superio_winbond_w83627hf_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 2a86aa8c47..8ecec62bbe 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -135,14 +135,6 @@ static void w83627hf_init(device_t dev)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83627HF_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83627HF_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83627HF_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h
index a2c9a0de6d..8da6954b90 100644
--- a/src/superio/winbond/w83627thg/chip.h
+++ b/src/superio/winbond/w83627thg/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_winbond_w83627thg_ops;
 
 struct superio_winbond_w83627thg_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 58d4d0609f..40a232602d 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -45,20 +45,11 @@ static void w83627thg_exit_ext_func_mode(device_t dev)
 static void w83627thg_init(device_t dev)
 {
 	struct superio_winbond_w83627thg_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83627THG_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83627THG_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83627THG_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h
index 74a41f8feb..ffabfa5fed 100644
--- a/src/superio/winbond/w83627uhg/chip.h
+++ b/src/superio/winbond/w83627uhg/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_winbond_w83627uhg_ops;
 
 struct superio_winbond_w83627uhg_config {
-	struct uart8250 com1, com2, com3, com4, com5, com6;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index a132446352..933bde6cef 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -73,41 +73,28 @@ static void set_uart_clock_source(device_t dev, u8 uart_clock)
 static void w83627uhg_init(device_t dev)
 {
 	struct superio_winbond_w83627uhg_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case W83627UHG_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com1);
 		break;
 	case W83627UHG_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627UHG_SP3:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com3);
 		break;
 	case W83627UHG_SP4:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com4);
 		break;
 	case W83627UHG_SP5:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com5);
 		break;
 	case W83627UHG_SP6:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		/* set_uart_clock_source(dev, 0); */
-		init_uart8250(res0->base, &conf->com6);
 		break;
 	case W83627UHG_KBC:
 		pc_keyboard_init(&conf->keyboard);
diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index cb7aebd9af..dd54a525ca 100644
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -26,7 +26,7 @@
 extern struct chip_operations superio_winbond_w83697hf_ops;
 
 struct superio_winbond_w83697hf_config {
-	struct uart8250 com1, com2;
+	
 };
 
 #endif
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 9159fc2547..d2cbcbd642 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -43,22 +43,8 @@ static void pnp_exit_ext_func_mode(device_t dev)
 
 static void w83697hf_init(device_t dev)
 {
-	struct superio_winbond_w83697hf_config *conf = dev->chip_info;
-	struct resource *res0;
-
 	if (!dev->enabled)
 		return;
-
-	switch(dev->path.pnp.device) {
-	case W83697HF_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83697HF_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
-	}
 }
 
 static void w83697hf_pnp_set_resources(device_t dev)
diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h
index 94a8cb694a..1c126971de 100644
--- a/src/superio/winbond/w83977f/chip.h
+++ b/src/superio/winbond/w83977f/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_winbond_w83977f_ops;
 
 struct superio_winbond_w83977f_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index aa51577363..e197b372f2 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -44,20 +44,11 @@ static void w83977f_exit_ext_func_mode(device_t dev)
 static void w83977f_init(device_t dev)
 {
 	struct superio_winbond_w83977f_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83977F_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83977F_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83977F_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h
index e50f00661f..cc24fc0e62 100644
--- a/src/superio/winbond/w83977tf/chip.h
+++ b/src/superio/winbond/w83977tf/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_winbond_w83977tf_ops;
 
 struct superio_winbond_w83977tf_config {
-	struct uart8250 com1, com2;
+	
 	struct pc_keyboard keyboard;
 };
 
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 4c99999eb4..40952d2a4b 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -46,20 +46,11 @@ static void w83977tf_exit_ext_func_mode(device_t dev)
 static void w83977tf_init(device_t dev)
 {
 	struct superio_winbond_w83977tf_config *conf = dev->chip_info;
-	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	case W83977TF_SP1:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com1);
-		break;
-	case W83977TF_SP2:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		init_uart8250(res0->base, &conf->com2);
-		break;
 	case W83977TF_KBC:
 		pc_keyboard_init(&conf->keyboard);
 		break;