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/winbond/w83627dhg/chip.h | 2 +- src/superio/winbond/w83627dhg/superio.c | 9 --------- src/superio/winbond/w83627ehg/chip.h | 2 +- src/superio/winbond/w83627ehg/superio.c | 8 -------- src/superio/winbond/w83627hf/chip.h | 2 +- src/superio/winbond/w83627hf/superio.c | 8 -------- src/superio/winbond/w83627thg/chip.h | 2 +- src/superio/winbond/w83627thg/superio.c | 9 --------- src/superio/winbond/w83627uhg/chip.h | 2 +- src/superio/winbond/w83627uhg/superio.c | 13 ------------- src/superio/winbond/w83697hf/chip.h | 2 +- src/superio/winbond/w83697hf/superio.c | 14 -------------- src/superio/winbond/w83977f/chip.h | 2 +- src/superio/winbond/w83977f/superio.c | 9 --------- src/superio/winbond/w83977tf/chip.h | 2 +- src/superio/winbond/w83977tf/superio.c | 9 --------- 16 files changed, 8 insertions(+), 87 deletions(-) (limited to 'src/superio/winbond') 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; -- cgit v1.2.3