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/smsc/fdc37m60x/chip.h | 2 +- src/superio/smsc/fdc37m60x/superio.c | 9 --------- src/superio/smsc/fdc37n972/chip.h | 2 +- src/superio/smsc/kbc1100/chip.h | 2 +- src/superio/smsc/lpc47b272/chip.h | 2 +- src/superio/smsc/lpc47b272/superio.c | 9 --------- src/superio/smsc/lpc47b397/chip.h | 2 +- src/superio/smsc/lpc47b397/superio.c | 9 --------- src/superio/smsc/lpc47m10x/chip.h | 2 +- src/superio/smsc/lpc47m10x/superio.c | 9 --------- src/superio/smsc/lpc47m15x/chip.h | 2 +- src/superio/smsc/lpc47m15x/superio.c | 9 --------- src/superio/smsc/lpc47n217/chip.h | 2 +- src/superio/smsc/lpc47n217/superio.c | 12 ------------ src/superio/smsc/lpc47n227/chip.h | 2 +- src/superio/smsc/lpc47n227/superio.c | 9 --------- src/superio/smsc/sio10n268/chip.h | 2 +- src/superio/smsc/smscsuperio/chip.h | 2 +- src/superio/smsc/smscsuperio/superio.c | 9 +-------- 19 files changed, 12 insertions(+), 85 deletions(-) (limited to 'src/superio/smsc') 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 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 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 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 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 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); } } -- cgit v1.2.3