diff options
39 files changed, 39 insertions, 49 deletions
diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index 33ac913de8..ce281bb56e 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -5,7 +5,7 @@ struct pc_keyboard { /* No initialization parameters for now */ }; -void init_pc_keyboard(unsigned port0, unsigned port1, struct pc_keyboard *kbd); +void pc_keyboard_init(struct pc_keyboard *keyboard); void set_kbc_ps2_mode(void); #endif /* PC80_KEYBOARD_H */ diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c index 4982b71b27..05bf2f391b 100644 --- a/src/mainboard/emulation/qemu-x86/mainboard.c +++ b/src/mainboard/emulation/qemu-x86/mainboard.c @@ -23,7 +23,7 @@ static void qemu_init(device_t dev) /* This sneaked in here, because Qemu does not * emulate a SuperIO chip */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); /* The PIRQ table is not working well for interrupt routing purposes. * so we'll just set the IRQ directly. diff --git a/src/northbridge/via/cx700/cx700_lpc.c b/src/northbridge/via/cx700/cx700_lpc.c index 115d66c235..943838720a 100644 --- a/src/northbridge/via/cx700/cx700_lpc.c +++ b/src/northbridge/via/cx700/cx700_lpc.c @@ -294,7 +294,7 @@ static void cx700_lpc_init(struct device *dev) isa_dma_init(); /* Initialize keyboard controller */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); } static struct device_operations cx700_lpc_ops = { diff --git a/src/northbridge/via/vx800/vx800_lpc.c b/src/northbridge/via/vx800/vx800_lpc.c index 8f79670034..2cd3202ad6 100644 --- a/src/northbridge/via/vx800/vx800_lpc.c +++ b/src/northbridge/via/vx800/vx800_lpc.c @@ -342,7 +342,7 @@ static void southbridge_init(struct device *dev) setup_i8259(); // make sure interupt controller is configured before keyboard init /* turn on keyboard and RTC, no need to visit this reg twice */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); printk_debug ("ps2 usb lid, you set who can wakeup system from s3 sleep\n"); S3_ps2_kb_ms_wakeup(dev); diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c index c025c889fb..04abe043cb 100644 --- a/src/pc80/keyboard.c +++ b/src/pc80/keyboard.c @@ -159,7 +159,7 @@ static u8 send_keyboard(u8 command) return regval; } -static void pc_keyboard_init(struct pc_keyboard *keyboard) +void pc_keyboard_init(struct pc_keyboard *keyboard) { u8 regval; printk_debug("Keyboard init...\n"); @@ -242,16 +242,6 @@ static void pc_keyboard_init(struct pc_keyboard *keyboard) } } - -void init_pc_keyboard(unsigned port0, unsigned port1, struct pc_keyboard *kbd) -{ - if ((port0 == 0x60) && (port1 == 0x64)) { - pc_keyboard_init(kbd); - } else { - printk_warning("Unsupported keyboard controller.\n"); - } -} - /* * Support PS/2 mode - oddball SIOs(KBC) need this setup * Not well documented. Google - 0xcb keyboard controller diff --git a/src/southbridge/sis/sis966/sis966_lpc.c b/src/southbridge/sis/sis966/sis966_lpc.c index f549f1af8c..0786fcda79 100644 --- a/src/southbridge/sis/sis966/sis966_lpc.c +++ b/src/southbridge/sis/sis966/sis966_lpc.c @@ -93,7 +93,7 @@ static void lpc_init(device_t dev) int nmi_option; printk_debug("LPC_INIT -------->\n"); - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); lpc_usb_legacy_init(dev); lpc_common_init(dev); diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c index d270a6b90b..5f8ab45009 100644 --- a/src/southbridge/via/vt8231/vt8231.c +++ b/src/southbridge/via/vt8231/vt8231.c @@ -26,7 +26,7 @@ static void keyboard_on(void) regval |= 0x0f; pci_write_config8(lpc_dev, 0x51, regval); } - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); } static void com_port_on(void) diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c index 8e2abb79db..f384847d5c 100644 --- a/src/southbridge/via/vt8235/vt8235.c +++ b/src/southbridge/via/vt8235/vt8235.c @@ -26,7 +26,7 @@ static void keyboard_on(struct device *dev) regval &= 0xfd; pci_write_config8(dev, 0x51, regval); - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); } void dump_south(device_t dev0) diff --git a/src/southbridge/via/vt8237r/vt8237r_lpc.c b/src/southbridge/via/vt8237r/vt8237r_lpc.c index 11b0279dcf..d53028128f 100644 --- a/src/southbridge/via/vt8237r/vt8237r_lpc.c +++ b/src/southbridge/via/vt8237r/vt8237r_lpc.c @@ -522,7 +522,7 @@ static void init_keyboard(struct device *dev) { u8 regval = pci_read_config8(dev, 0x51); if (regval & 0x1) - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); } static void southbridge_init_common(struct device *dev) diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c index e0007c56d6..9fd60425e1 100644 --- a/src/superio/ite/it8671f/superio.c +++ b/src/superio/ite/it8671f/superio.c @@ -53,7 +53,7 @@ static void init(device_t dev) case IT8671F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8671F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c index a5c99b1dba..4b986ded7e 100644 --- a/src/superio/ite/it8673f/superio.c +++ b/src/superio/ite/it8673f/superio.c @@ -55,7 +55,7 @@ static void init(device_t dev) case IT8673F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8673F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 1636d1987a..2d2a83a943 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -78,7 +78,7 @@ static void it8712f_init(device_t dev) res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); set_kbc_ps2_mode(); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8712F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c index 52d2fc0f00..6744850740 100644 --- a/src/superio/ite/it8716f/superio.c +++ b/src/superio/ite/it8716f/superio.c @@ -112,7 +112,7 @@ static void it8716f_init(device_t dev) case IT8716F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index 1d1d31fcd3..d0f971d233 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -55,7 +55,7 @@ static void init(device_t dev) case IT8718F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8718F_KBCM: /* TODO. */ break; diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c index 3fed62b096..0ea594a778 100644 --- a/src/superio/nsc/pc8374/superio.c +++ b/src/superio/nsc/pc8374/superio.c @@ -54,7 +54,7 @@ static void init(device_t dev) case PC8374_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c index ee84b66aa2..b4a47d523c 100644 --- a/src/superio/nsc/pc87309/superio.c +++ b/src/superio/nsc/pc87309/superio.c @@ -48,7 +48,7 @@ static void init(device_t dev) case PC87309_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c index 4ee740ac3f..2202f35438 100644 --- a/src/superio/nsc/pc87351/superio.c +++ b/src/superio/nsc/pc87351/superio.c @@ -60,7 +60,7 @@ static void init(device_t dev) case PC87351_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c index a0fa47a7af..d4874ff1a9 100644 --- a/src/superio/nsc/pc87360/superio.c +++ b/src/superio/nsc/pc87360/superio.c @@ -54,7 +54,7 @@ static void init(device_t dev) case PC87360_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c index f12b7d905d..22e26898d2 100644 --- a/src/superio/nsc/pc87366/superio.c +++ b/src/superio/nsc/pc87366/superio.c @@ -54,7 +54,7 @@ static void init(device_t dev) case PC87366_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 9af09f927c..d311714639 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -55,7 +55,7 @@ static void init(device_t dev) case PC87417_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c index e8ffe2a09f..f8e4483168 100644 --- a/src/superio/nsc/pc87427/superio.c +++ b/src/superio/nsc/pc87427/superio.c @@ -52,7 +52,7 @@ static void init(device_t dev) case PC87427_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c index 45dcbc9bdc..6ded3a07e3 100644 --- a/src/superio/nsc/pc97307/superio.c +++ b/src/superio/nsc/pc97307/superio.c @@ -55,7 +55,7 @@ static void init(device_t dev) res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case PC97307_FDC: diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c index 969698d600..96dfbef327 100644 --- a/src/superio/nsc/pc97317/superio.c +++ b/src/superio/nsc/pc97317/superio.c @@ -55,7 +55,7 @@ static void init(device_t dev) res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; #if 0 diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c index 3ed4943200..3a9a72c220 100644 --- a/src/superio/renesas/m3885x/superio.c +++ b/src/superio/renesas/m3885x/superio.c @@ -41,7 +41,7 @@ static void m3885x_init(device_t dev) printk_debug("Renesas M3885x: Initializing keyboard.\n"); set_kbc_ps2_mode(); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); m3885_configure_multikey(); } diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c index 1e595c6c8a..31767e0d5e 100644 --- a/src/superio/smsc/fdc37m60x/superio.c +++ b/src/superio/smsc/fdc37m60x/superio.c @@ -53,7 +53,7 @@ static void init(device_t dev) case FDC37M60X_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case FDC37M60X_AUX: /* TODO. */ break; diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index 93b39a370e..61ee12eaba 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -152,7 +152,7 @@ static void lpc47b272_init(device_t dev) case LPC47B272_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index 0fbe048a8f..237a131246 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -84,7 +84,7 @@ static void lpc47b397_init(device_t dev) case LPC47B397_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index 535dc394b6..916590d4cf 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -150,7 +150,7 @@ static void lpc47m10x_init(device_t dev) case LPC47M10X2_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index 28bbcfdaf2..789520f69e 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -119,7 +119,7 @@ static void lpc47m15x_init(device_t dev) case LPC47M15X_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index 26f507b695..50b11c1c90 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -164,7 +164,7 @@ static void lpc47n227_init(device_t dev) case LPC47N227_KBDC: printk_debug("LPC47N227: Initializing keyboard.\n"); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index ffbf82ae42..1a411e3439 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -232,7 +232,7 @@ static void smsc_init(device_t dev) } else if (ld == logical_device_table[i].devs[LD_KBC]) { res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); } } diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c index 998a097022..2a58ef774f 100644 --- a/src/superio/winbond/w83627dhg/superio.c +++ b/src/superio/winbond/w83627dhg/superio.c @@ -59,7 +59,7 @@ static void w83627dhg_init(device_t dev) case W83627DHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index daf4b7f261..393ea7086a 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -125,7 +125,7 @@ static void w83627ehg_init(device_t dev) case W83627EHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case W83627EHG_HWM: res0 = find_resource(dev, PNP_IDX_IO0); diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 1ad79194be..8bcc815bab 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -133,7 +133,7 @@ static void w83627hf_init(device_t dev) case W83627HF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case W83627HF_HWM: res0 = find_resource(dev, PNP_IDX_IO0); diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c index 8e32a2a4e8..515e7f08b8 100644 --- a/src/superio/winbond/w83627thf/superio.c +++ b/src/superio/winbond/w83627thf/superio.c @@ -66,7 +66,7 @@ static void w83627thf_init(device_t dev) case W83627THF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c index bedbea9d6d..d6a74a194e 100644 --- a/src/superio/winbond/w83627thg/superio.c +++ b/src/superio/winbond/w83627thg/superio.c @@ -64,7 +64,7 @@ static void w83627thg_init(device_t dev) case W83627THG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c index 4fc1cc559e..57c74b614d 100644 --- a/src/superio/winbond/w83627uhg/superio.c +++ b/src/superio/winbond/w83627uhg/superio.c @@ -113,7 +113,7 @@ static void w83627uhg_init(device_t dev) case W83627UHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c index d9e9c3f4df..7e797f3fdb 100644 --- a/src/superio/winbond/w83977f/superio.c +++ b/src/superio/winbond/w83977f/superio.c @@ -61,7 +61,7 @@ static void w83977f_init(device_t dev) case W83977F_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index 83dd90a982..58ad008c96 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -72,7 +72,7 @@ static void w83977tf_init(device_t dev) case W83977TF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } } |