From 13508b94cba913b94ba9afc8dc3d97313140152d Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 19 Apr 2011 21:33:40 +0000 Subject: 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 Acked-by: Patrick Georgi 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 --- src/superio/nsc/pc8374/chip.h | 2 +- src/superio/nsc/pc8374/superio.c | 9 --------- src/superio/nsc/pc87309/chip.h | 2 +- src/superio/nsc/pc87309/superio.c | 9 --------- src/superio/nsc/pc87351/chip.h | 2 +- src/superio/nsc/pc87351/superio.c | 9 --------- src/superio/nsc/pc87360/chip.h | 2 +- src/superio/nsc/pc87360/superio.c | 9 --------- src/superio/nsc/pc87366/chip.h | 2 +- src/superio/nsc/pc87366/superio.c | 9 --------- src/superio/nsc/pc87382/chip.h | 2 +- src/superio/nsc/pc87382/superio.c | 10 ---------- src/superio/nsc/pc87384/chip.h | 2 +- src/superio/nsc/pc87384/superio.c | 10 ---------- src/superio/nsc/pc87392/chip.h | 2 +- src/superio/nsc/pc87392/superio.c | 15 --------------- src/superio/nsc/pc87417/chip.h | 2 +- src/superio/nsc/pc87417/superio.c | 9 --------- src/superio/nsc/pc87427/chip.h | 2 +- src/superio/nsc/pc87427/superio.c | 9 --------- src/superio/nsc/pc97307/chip.h | 2 +- src/superio/nsc/pc97307/superio.c | 9 --------- src/superio/nsc/pc97317/chip.h | 2 +- src/superio/nsc/pc97317/superio.c | 9 --------- 24 files changed, 12 insertions(+), 128 deletions(-) (limited to 'src/superio/nsc') 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 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 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 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 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 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 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 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 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 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 */ -- cgit v1.2.3