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/fintek/f71805f/chip.h | 2 +- src/superio/fintek/f71805f/superio.c | 13 ------------- src/superio/fintek/f71859/chip.h | 2 +- src/superio/fintek/f71859/superio.c | 9 --------- src/superio/fintek/f71863fg/chip.h | 2 +- src/superio/fintek/f71863fg/superio.c | 8 -------- src/superio/fintek/f71872/chip.h | 2 +- src/superio/fintek/f71872/superio.c | 9 --------- src/superio/fintek/f71889/chip.h | 2 +- src/superio/fintek/f71889/superio.c | 9 --------- src/superio/fintek/f81865f/chip.h | 2 +- src/superio/fintek/f81865f/superio.c | 9 --------- 12 files changed, 6 insertions(+), 63 deletions(-) (limited to 'src/superio/fintek') 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; -- cgit v1.2.3