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/ite/it8661f/chip.h | 2 +- src/superio/ite/it8661f/superio.c | 11 ----------- src/superio/ite/it8671f/chip.h | 2 +- src/superio/ite/it8671f/superio.c | 9 --------- src/superio/ite/it8673f/chip.h | 2 +- src/superio/ite/it8673f/superio.c | 9 --------- src/superio/ite/it8705f/chip.h | 2 +- src/superio/ite/it8705f/superio.c | 9 --------- src/superio/ite/it8712f/chip.h | 2 +- src/superio/ite/it8712f/superio.c | 9 --------- src/superio/ite/it8716f/chip.h | 2 +- src/superio/ite/it8716f/superio.c | 8 -------- src/superio/ite/it8718f/chip.h | 2 +- src/superio/ite/it8718f/superio.c | 9 --------- 14 files changed, 7 insertions(+), 71 deletions(-) (limited to 'src/superio/ite') 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. */ -- cgit v1.2.3