summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/pc80/keyboard.c2
-rw-r--r--src/ec/compal/ene932/ec.c5
-rw-r--r--src/ec/google/chromeec/ec_lpc.c5
-rw-r--r--src/ec/quanta/ene_kb3940q/ec.c4
-rw-r--r--src/ec/quanta/it8518/ec.c5
-rw-r--r--src/include/pc80/keyboard.h2
-rw-r--r--src/mainboard/emulation/qemu-i440fx/mainboard.c2
-rw-r--r--src/mainboard/emulation/qemu-q35/mainboard.c2
-rw-r--r--src/mainboard/lenovo/t530/mainboard.c2
-rw-r--r--src/mainboard/lenovo/x201/mainboard.c2
-rw-r--r--src/mainboard/lenovo/x230/mainboard.c2
-rw-r--r--src/mainboard/packardbell/ms2290/mainboard.c2
-rw-r--r--src/mainboard/roda/rk9/mainboard.c2
-rw-r--r--src/northbridge/via/cx700/lpc.c2
-rw-r--r--src/northbridge/via/vx800/lpc.c2
-rw-r--r--src/southbridge/dmp/vortex86ex/southbridge.c2
-rw-r--r--src/southbridge/sis/sis966/lpc.c16
-rw-r--r--src/southbridge/via/vt8231/vt8231.c2
-rw-r--r--src/southbridge/via/vt8235/vt8235.c2
-rw-r--r--src/southbridge/via/vt8237r/lpc.c2
-rw-r--r--src/superio/fintek/f71863fg/superio.c5
-rw-r--r--src/superio/fintek/f71869ad/superio.c4
-rw-r--r--src/superio/fintek/f71872/superio.c5
-rw-r--r--src/superio/fintek/f71889/superio.c5
-rw-r--r--src/superio/fintek/f81865f/superio.c5
-rw-r--r--src/superio/ite/it8671f/superio.c4
-rw-r--r--src/superio/ite/it8712f/superio.c4
-rw-r--r--src/superio/ite/it8716f/superio.c4
-rw-r--r--src/superio/ite/it8718f/superio.c4
-rw-r--r--src/superio/ite/it8721f/superio.c4
-rw-r--r--src/superio/ite/it8772f/superio.c4
-rw-r--r--src/superio/nsc/pc8374/superio.c4
-rw-r--r--src/superio/nsc/pc87309/superio.c4
-rw-r--r--src/superio/nsc/pc87351/superio.c4
-rw-r--r--src/superio/nsc/pc87360/superio.c4
-rw-r--r--src/superio/nsc/pc87366/superio.c4
-rw-r--r--src/superio/nsc/pc87417/superio.c4
-rw-r--r--src/superio/nsc/pc87427/superio.c5
-rw-r--r--src/superio/nsc/pc97307/superio.c6
-rw-r--r--src/superio/nsc/pc97317/superio.c6
-rw-r--r--src/superio/nuvoton/wpcm450/superio.c4
-rw-r--r--src/superio/renesas/m3885x/superio.c5
-rw-r--r--src/superio/smsc/fdc37m60x/superio.c4
-rw-r--r--src/superio/smsc/fdc37n972/fdc37n972.c5
-rw-r--r--src/superio/smsc/kbc1100/superio.c4
-rw-r--r--src/superio/smsc/lpc47b272/superio.c4
-rw-r--r--src/superio/smsc/lpc47b397/superio.c4
-rw-r--r--src/superio/smsc/lpc47m10x/superio.c4
-rw-r--r--src/superio/smsc/lpc47m15x/superio.c4
-rw-r--r--src/superio/smsc/lpc47n227/superio.c5
-rw-r--r--src/superio/smsc/mec1308/superio.c4
-rw-r--r--src/superio/smsc/sch4037/superio.c4
-rw-r--r--src/superio/smsc/sio1007/chip.h1
-rw-r--r--src/superio/smsc/sio1036/superio.c2
-rw-r--r--src/superio/smsc/sio10n268/sio10n268.c4
-rw-r--r--src/superio/smsc/smscsuperio/superio.c4
-rw-r--r--src/superio/winbond/w83627dhg/superio.c4
-rw-r--r--src/superio/winbond/w83627ehg/superio.c4
-rw-r--r--src/superio/winbond/w83627hf/superio.c4
-rw-r--r--src/superio/winbond/w83627thg/superio.c4
-rw-r--r--src/superio/winbond/w83627uhg/superio.c4
-rw-r--r--src/superio/winbond/w83697hf/superio.c3
-rw-r--r--src/superio/winbond/w83977f/superio.c4
-rw-r--r--src/superio/winbond/w83977tf/superio.c4
64 files changed, 84 insertions, 163 deletions
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 5b686170c6..6a573d8e08 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -193,7 +193,7 @@ static u8 send_keyboard(u8 command)
return regval;
}
-void pc_keyboard_init(struct pc_keyboard *keyboard)
+void pc_keyboard_init(void)
{
u8 retries;
u8 regval;
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index 3f4d1b99ba..e60a0ac9e0 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -133,14 +133,11 @@ static u8 ec_io_read(u16 addr)
#ifndef __SMM__
static void ene932_init(device_t dev)
{
- struct ec_compal_ene932_config *conf = dev->chip_info;
-
-
if (!dev->enabled)
return;
printk(BIOS_DEBUG, "Compal ENE932: Initializing keyboard.\n");
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
}
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index a445da87be..5f377c923e 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -138,11 +138,10 @@ int google_chromeec_command(struct chromeec_command *cec_command)
#ifndef __SMM__
static void lpc_ec_init(device_t dev)
{
- struct ec_google_chromeec_config *conf = dev->chip_info;
-
if (!dev->enabled)
return;
- pc_keyboard_init(&conf->keyboard);
+
+ pc_keyboard_init();
google_chromeec_init();
}
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 137aa8108d..57854d051f 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -141,13 +141,11 @@ static void ene_kb3940q_log_events(void)
static void ene_kb3940q_init(device_t dev)
{
- struct ec_quanta_ene_kb3940q_config *conf = dev->chip_info;
-
if (!dev->enabled)
return;
printk(BIOS_DEBUG, "Quanta EnE KB3940Q: Initializing keyboard.\n");
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
ene_kb3940q_log_events();
}
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 6516cee349..7588a1ea4a 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -162,14 +162,11 @@ void ec_it8518_enable_wake_events(void)
#ifndef __SMM__
static void it8518_init(device_t dev)
{
- struct ec_quanta_it8518_config *conf = dev->chip_info;
-
-
if (!dev->enabled)
return;
printk(BIOS_DEBUG, "Quanta IT8518: Initializing keyboard.\n");
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
}
diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h
index ce281bb56e..5f9772382c 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 pc_keyboard_init(struct pc_keyboard *keyboard);
+void pc_keyboard_init(void);
void set_kbc_ps2_mode(void);
#endif /* PC80_KEYBOARD_H */
diff --git a/src/mainboard/emulation/qemu-i440fx/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c
index 90ad2dbb49..a8a61c413d 100644
--- a/src/mainboard/emulation/qemu-i440fx/mainboard.c
+++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c
@@ -43,7 +43,7 @@ static void qemu_nb_init(device_t dev)
/* This sneaked in here, because Qemu does not
* emulate a SuperIO chip
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
/* setup IRQ routing */
for (i = 0; i < 32; i++)
diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c
index 78c92a9b38..e991b53b93 100644
--- a/src/mainboard/emulation/qemu-q35/mainboard.c
+++ b/src/mainboard/emulation/qemu-q35/mainboard.c
@@ -50,7 +50,7 @@ static void qemu_nb_init(device_t dev)
/* This sneaked in here, because Qemu does not
* emulate a SuperIO chip
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
/* setup IRQ routing for pci slots */
for (i = 0; i < 25; i++)
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index 5931d00ba5..6d21b31790 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -161,7 +161,7 @@ static void mainboard_init(device_t dev)
/* This sneaked in here, because X201 SuperIO chip isn't really
connected to anything and hence we don't init it.
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
/* Enable expresscard hotplug events. */
pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index cf42a9bf4a..d772d194a9 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -134,7 +134,7 @@ static void mainboard_init(device_t dev)
/* This sneaked in here, because X201 SuperIO chip isn't really
connected to anything and hence we don't init it.
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
/* Enable expresscard hotplug events. */
pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index 2e4bc4a6b7..01d1910159 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -161,7 +161,7 @@ static void mainboard_init(device_t dev)
/* This sneaked in here, because X201 SuperIO chip isn't really
connected to anything and hence we don't init it.
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
/* Enable expresscard hotplug events. */
pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index e54df191df..d7f45c05fb 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -169,7 +169,7 @@ static void mainboard_enable(device_t dev)
/* This sneaked in here, because EasyNote has no SuperIO chip.
*/
- pc_keyboard_init(0);
+ pc_keyboard_init();
verb_setup();
}
diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c
index 33e6bde566..0627a5eb35 100644
--- a/src/mainboard/roda/rk9/mainboard.c
+++ b/src/mainboard/roda/rk9/mainboard.c
@@ -133,7 +133,7 @@ static void mainboard_enable(device_t dev)
/* We have no driver for the embedded controller since the firmware
does most of the job. Hence, initialize keyboards here. */
- pc_keyboard_init(NULL);
+ pc_keyboard_init();
}
struct chip_operations mainboard_ops = {
diff --git a/src/northbridge/via/cx700/lpc.c b/src/northbridge/via/cx700/lpc.c
index 22e8743e8e..c09fbb4968 100644
--- a/src/northbridge/via/cx700/lpc.c
+++ b/src/northbridge/via/cx700/lpc.c
@@ -289,7 +289,7 @@ static void cx700_lpc_init(struct device *dev)
isa_dma_init();
/* Initialize keyboard controller */
- pc_keyboard_init(0);
+ pc_keyboard_init();
}
static struct device_operations cx700_lpc_ops = {
diff --git a/src/northbridge/via/vx800/lpc.c b/src/northbridge/via/vx800/lpc.c
index 9e1fa57837..1908a8a4ae 100644
--- a/src/northbridge/via/vx800/lpc.c
+++ b/src/northbridge/via/vx800/lpc.c
@@ -330,7 +330,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 */
- pc_keyboard_init(0);
+ pc_keyboard_init();
printk(BIOS_DEBUG, "ps2 usb lid, you set who can wakeup system from s3 sleep\n");
S3_ps2_kb_ms_wakeup(dev);
diff --git a/src/southbridge/dmp/vortex86ex/southbridge.c b/src/southbridge/dmp/vortex86ex/southbridge.c
index 2a68e4e4ea..b9432f0260 100644
--- a/src/southbridge/dmp/vortex86ex/southbridge.c
+++ b/src/southbridge/dmp/vortex86ex/southbridge.c
@@ -611,7 +611,7 @@ static void southbridge_init(struct device *dev)
retries--;
}
post_code(POST_DMP_KBD_IS_READY);
- pc_keyboard_init(0);
+ pc_keyboard_init();
}
static struct device_operations vortex_sb_ops = {
diff --git a/src/southbridge/sis/sis966/lpc.c b/src/southbridge/sis/sis966/lpc.c
index a4db1e5435..824bb6a174 100644
--- a/src/southbridge/sis/sis966/lpc.c
+++ b/src/southbridge/sis/sis966/lpc.c
@@ -89,16 +89,16 @@ static void lpc_usb_legacy_init(device_t dev)
static void lpc_init(device_t dev)
{
- uint8_t byte;
- uint8_t byte_old;
- int on;
- int nmi_option;
+ uint8_t byte;
+ uint8_t byte_old;
+ int on;
+ int nmi_option;
- printk(BIOS_DEBUG, "LPC_INIT -------->\n");
- pc_keyboard_init(0);
+ printk(BIOS_DEBUG, "LPC_INIT -------->\n");
+ pc_keyboard_init();
- lpc_usb_legacy_init(dev);
- lpc_common_init(dev);
+ lpc_usb_legacy_init(dev);
+ lpc_common_init(dev);
/* power after power fail */
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index 85f007a097..2011d8ab83 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -21,7 +21,7 @@ static void keyboard_on(void)
regval |= 0x0f;
pci_write_config8(lpc_dev, 0x51, regval);
}
- pc_keyboard_init(0);
+ pc_keyboard_init();
}
static void com_port_on(void)
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index 4fa2784661..6bc767ae34 100644
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -16,7 +16,7 @@ static void keyboard_on(struct device *dev)
regval &= 0xfd;
pci_write_config8(dev, 0x51, regval);
- pc_keyboard_init(0);
+ pc_keyboard_init();
}
#ifdef UNUSED_CODE
diff --git a/src/southbridge/via/vt8237r/lpc.c b/src/southbridge/via/vt8237r/lpc.c
index 4949de6560..5ddd816153 100644
--- a/src/southbridge/via/vt8237r/lpc.c
+++ b/src/southbridge/via/vt8237r/lpc.c
@@ -627,7 +627,7 @@ static void init_keyboard(struct device *dev)
{
u8 regval = pci_read_config8(dev, 0x51);
if (regval & 0x1)
- pc_keyboard_init(0);
+ pc_keyboard_init();
}
static void southbridge_init_common(struct device *dev)
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 29b5ab3307..83ccd38934 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -24,12 +24,11 @@
#include <superio/conf_mode.h>
#include <console/console.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "f71863fg.h"
static void f71863fg_init(device_t dev)
{
- struct superio_fintek_f71863fg_config *conf = dev->chip_info;
struct resource *res0;
if (!dev->enabled)
@@ -39,7 +38,7 @@ static void f71863fg_init(device_t dev)
/* TODO: Might potentially need code for HWM or FDC etc. */
case F71863FG_KBC:
res0 = find_resource(dev, PNP_IDX_IO0);
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 091fc65f1f..93ec33c9f0 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -31,15 +31,13 @@
static void f71869ad_init(device_t dev)
{
- struct superio_fintek_f71869ad_config *conf = dev->chip_info;
-
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
/* TODO: Might potentially need code for HWM or FDC etc. */
case F71869AD_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case F71869AD_HWM:
f71869ad_multifunc_init(dev);
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 55a11b1b99..c6fa7d06cb 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -24,12 +24,11 @@
#include <superio/conf_mode.h>
#include <console/console.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "f71872.h"
static void f71872_init(device_t dev)
{
- struct superio_fintek_f71872_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -37,7 +36,7 @@ static void f71872_init(device_t dev)
switch(dev->path.pnp.device) {
/* TODO: Might potentially need code for HWM or FDC etc. */
case F71872_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 71edafcd53..14bdd07a44 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -24,12 +24,11 @@
#include <superio/conf_mode.h>
#include <console/console.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "f71889.h"
static void f71889_init(device_t dev)
{
- struct superio_fintek_f71889_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -37,7 +36,7 @@ static void f71889_init(device_t dev)
switch (dev->path.pnp.device) {
/* TODO: Might potentially need code for HWM or FDC etc. */
case F71889_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 85ac7ba1a2..bfb53b46a4 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -24,12 +24,11 @@
#include <superio/conf_mode.h>
#include <console/console.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "f81865f.h"
static void f81865f_init(device_t dev)
{
- struct superio_fintek_f81865f_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -37,7 +36,7 @@ static void f81865f_init(device_t dev)
switch (dev->path.pnp.device) {
/* TODO: Might potentially need code for HWM or FDC etc. */
case F81865F_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 21c70ecb10..9da8f1d334 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -22,12 +22,10 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "it8671f.h"
static void init(device_t dev)
{
- struct superio_ite_it8671f_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -38,7 +36,7 @@ static void init(device_t dev)
case IT8671F_PP: /* TODO. */
break;
case IT8671F_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case IT8671F_KBCM: /* TODO. */
break;
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 2fd3440ecf..769afe35a2 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -24,7 +24,6 @@
#include <pc80/keyboard.h>
#include <arch/io.h>
#include <stdlib.h>
-#include "chip.h"
#include "it8712f.h"
static void pnp_enter_ext_func_mode(device_t dev)
@@ -44,7 +43,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;
if (!dev->enabled)
return;
@@ -58,7 +56,7 @@ static void it8712f_init(device_t dev)
break;
case IT8712F_KBCK:
set_kbc_ps2_mode();
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case IT8712F_KBCM: /* TODO. */
break;
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 8cf3c5f76b..bd89a32fce 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -27,7 +27,6 @@
#include <pc80/keyboard.h>
#include <arch/io.h>
#include <stdlib.h>
-#include "chip.h"
#include "it8716f.h"
static void pnp_enter_ext_func_mode(device_t dev)
@@ -76,7 +75,6 @@ static void init_ec(u16 base)
static void it8716f_init(device_t dev)
{
- struct superio_ite_it8716f_config *conf = dev->chip_info;
struct resource *res0;
if (!dev->enabled)
@@ -90,7 +88,7 @@ static void it8716f_init(device_t dev)
init_ec(res0->base + EC_INDEX_PORT);
break;
case IT8716F_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 998d271250..d40407af8d 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -22,12 +22,10 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "it8718f.h"
static void init(device_t dev)
{
- struct superio_ite_it8718f_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -40,7 +38,7 @@ static void init(device_t dev)
case IT8718F_EC: /* TODO. */
break;
case IT8718F_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case IT8718F_KBCM: /* TODO. */
break;
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index 300a480e60..66e6ef7e20 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -23,12 +23,10 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "it8721f.h"
static void init(device_t dev)
{
- struct superio_ite_it8721f_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -41,7 +39,7 @@ static void init(device_t dev)
case IT8721F_EC: /* TODO. */
break;
case IT8721F_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case IT8721F_KBCM: /* TODO. */
break;
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index e7e82a8e80..721e7f9422 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -23,7 +23,7 @@
#include <pc80/keyboard.h>
#include <arch/io.h>
#include <stdlib.h>
-#include "chip.h"
+#include "chip.h" /* FIXME */
#include "it8772f.h"
static void pnp_enter_ext_func_mode(device_t dev)
@@ -177,7 +177,7 @@ static void it8772f_init(device_t dev)
case IT8772F_KBCK:
if (!conf->skip_keyboard) {
set_kbc_ps2_mode();
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
}
break;
case IT8772F_KBCM:
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 71cde2ca04..8b6f1caf01 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -26,19 +26,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc8374.h"
static void init(device_t dev)
{
- struct superio_nsc_pc8374_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC8374_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 52fc14f4ef..f374e6aa20 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -23,19 +23,17 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc87309.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87309_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch (dev->path.pnp.device) {
case PC87309_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 4d9469ed63..7f395b4be8 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -26,19 +26,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc87351.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87351_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC87351_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 92731e72c1..a53cc35126 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -26,19 +26,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc87360.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87360_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC87360_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 1874ab3d2b..27bdd6ed3c 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -26,19 +26,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc87366.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87366_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC87366_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 3b91f369cd..99882a58c0 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -27,19 +27,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "pc87417.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87417_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC87417_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index ae02f012e2..170fd8544f 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -25,19 +25,18 @@
#include <console/console.h>
#include <string.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "pc87427.h"
static void init(device_t dev)
{
- struct superio_nsc_pc87427_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case PC87427_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index c1cd5c12d2..af7ca777bf 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -23,12 +23,12 @@
#include <device/device.h>
#include <device/pnp.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
#include "pc97307.h"
static void init(device_t dev)
{
- struct superio_nsc_pc97307_config *conf = dev->chip_info;
u8 reg8;
if (!dev->enabled)
@@ -40,7 +40,7 @@ static void init(device_t dev)
pnp_set_enable(dev, 0); /* Disable keyboard */
pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */
pnp_set_enable(dev, 1); /* Enable keyboard. */
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case PC97307_FDC:
/* Set up floppy in PS/2 mode. */
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index a69dfe7fad..6f39c5da8c 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -23,12 +23,12 @@
#include <device/device.h>
#include <device/pnp.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
#include "pc97317.h"
static void init(device_t dev)
{
- struct superio_nsc_pc97317_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -39,7 +39,7 @@ static void init(device_t dev)
pnp_set_enable(dev, 0); /* Disable keyboard */
pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */
pnp_set_enable(dev, 1); /* Enable keyboard */
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
default:
break;
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index fabb546783..ff815cf3ff 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -25,19 +25,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "wpcm450.h"
static void init(device_t dev)
{
- struct superio_nuvoton_wpcm450_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case WPCM450_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 34d7d11211..17bdadfac9 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -25,20 +25,19 @@
#include <string.h>
#include <assert.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
void m3885_configure_multikey(void);
static void m3885x_init(device_t dev)
{
- struct superio_renesas_m3885x_config *conf = dev->chip_info;
if (!dev->enabled)
return;
printk(BIOS_DEBUG, "Renesas M3885x: Initializing keyboard.\n");
set_kbc_ps2_mode();
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
m3885_configure_multikey();
}
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index 92a1783316..f5626ee3f3 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -22,12 +22,10 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "fdc37m60x.h"
static void init(device_t dev)
{
- struct superio_smsc_fdc37m60x_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -38,7 +36,7 @@ static void init(device_t dev)
case FDC37M60X_PP: /* TODO. */
break;
case FDC37M60X_KBCK:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case FDC37M60X_AUX: /* TODO. */
break;
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index cab454045f..f7ae697803 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -26,8 +26,6 @@
static void init(device_t dev)
{
- struct superio_smsc_fdc37n972_config *conf = dev->chip_info;
-
if (!dev->enabled)
return;
@@ -37,7 +35,7 @@ static void init(device_t dev)
case FDC37N972_PP: /* TODO. */
break;
case FDC37N972_KBDC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
// [..] The rest: TODO
}
@@ -67,4 +65,3 @@ struct chip_operations superio_smsc_fdc37n972_ops = {
CHIP_NAME("SMSC FDC37N972 Super I/O")
.enable_dev = enable_dev,
};
-
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 3a834a005d..77777d0949 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "kbc1100.h"
/* Forward declarations */
@@ -60,7 +59,6 @@ static void enable_dev(device_t dev)
static void kbc1100_init(device_t dev)
{
- struct superio_smsc_kbc1100_config *conf = dev->chip_info;
struct resource *res0, *res1;
@@ -74,7 +72,7 @@ static void kbc1100_init(device_t dev)
case KBC1100_KBC:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index fb39c28934..30e89a837f 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -32,7 +32,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "lpc47b272.h"
/* Forward declarations */
@@ -85,14 +84,13 @@ static void enable_dev(device_t dev)
*/
static void lpc47b272_init(device_t dev)
{
- struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case LPC47B272_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 3d81350ca9..8a6c03e3fe 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -29,7 +29,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "lpc47b397.h"
static void pnp_write_index(u16 port, u8 reg, u8 value)
@@ -56,14 +55,13 @@ static void enable_hwm_smbus(device_t dev)
static void lpc47b397_init(device_t dev)
{
- struct superio_smsc_lpc47b397_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case LPC47B397_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 1a697f2a0d..a9583e48c4 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -31,7 +31,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "lpc47m10x.h"
/* Forward declarations */
@@ -84,14 +83,13 @@ static void enable_dev(device_t dev)
*/
static void lpc47m10x_init(device_t dev)
{
- struct superio_smsc_lpc47m10x_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case LPC47M10X2_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index b142dde1ba..91e77bacd9 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "lpc47m15x.h"
/* Forward declarations */
@@ -65,14 +64,13 @@ static void enable_dev(device_t dev)
static void lpc47m15x_init(device_t dev)
{
- struct superio_smsc_lpc47m15x_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case LPC47M15X_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index eda2622ff6..b1ef18a5d2 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <assert.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
#include "lpc47n227.h"
/* Forward declarations. */
@@ -128,7 +128,6 @@ void lpc47n227_pnp_enable(device_t dev)
*/
static void lpc47n227_init(device_t dev)
{
- struct superio_smsc_lpc47n227_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -136,7 +135,7 @@ static void lpc47n227_init(device_t dev)
switch (dev->path.pnp.device) {
case LPC47N227_KBDC:
printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n");
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 448800ebec..54d99fb5c7 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "mec1308.h"
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
@@ -36,7 +35,6 @@
static void mec1308_init(device_t dev)
{
- struct superio_smsc_mec1308_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -47,7 +45,7 @@ static void mec1308_init(device_t dev)
if (acpi_slp_type == 3)
return;
#endif
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index b7f100ab7f..35df43126f 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "sch4037.h"
/* Forward declarations */
@@ -61,7 +60,6 @@ static void enable_dev(device_t dev)
static void sch4037_init(device_t dev)
{
- struct superio_smsc_sch4037_config *conf = dev->chip_info;
struct resource *res0, *res1;
if (!dev->enabled) {
@@ -73,7 +71,7 @@ static void sch4037_init(device_t dev)
case SCH4037_KBC:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/smsc/sio1007/chip.h b/src/superio/smsc/sio1007/chip.h
index eee2811826..345b40366f 100644
--- a/src/superio/smsc/sio1007/chip.h
+++ b/src/superio/smsc/sio1007/chip.h
@@ -20,6 +20,7 @@
#ifndef SUPERIO_SMSC_1007_CHIP_H
#define SUPERIO_SMSC_1007_CHIP_H
+/* FIXME: wrong place for this! */
void sio1007_setreg(u16 lpc_port, u8 reg, u8 value, u8 mask);
int sio1007_enable_uart_at(u16 port);
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 4980803731..7fac79c4b5 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "sio1036.h"
/* Forward declarations */
@@ -60,7 +59,6 @@ static void enable_dev(device_t dev)
static void sio1036_init(device_t dev)
{
- struct superio_smsc_sio1036_config *conf = dev->chip_info;
struct resource *res0, *res1;
diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index 690c1609c7..40c01b4bd8 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -26,8 +26,6 @@
static void init(device_t dev)
{
- struct superio_smsc_sio10n268_config *conf = dev->chip_info;
-
if (!dev->enabled)
return;
@@ -38,7 +36,7 @@ static void init(device_t dev)
break;
case SIO10N268_KBDC:
/* TODO: This is still hardcoded. */
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
// [..] The rest: TODO
}
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 9990aa2e59..0d62a9a1e8 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -41,7 +41,6 @@
#include <console/console.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
/* The following Super I/O chips are currently supported by this driver: */
#define LPC47M172 0x14
@@ -150,7 +149,6 @@ static const struct logical_devices {
*/
static void smsc_init(device_t dev)
{
- struct superio_smsc_smscsuperio_config *conf = dev->chip_info;
int i, ld;
/* Do not initialize disabled devices. */
@@ -169,7 +167,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_KBC]) {
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
}
}
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 269e57c869..fdab974b93 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -23,7 +23,6 @@
#include <superio/conf_mode.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "w83627dhg.h"
static void w83627dhg_enable_UR2(device_t dev)
@@ -39,7 +38,6 @@ static void w83627dhg_enable_UR2(device_t dev)
static void w83627dhg_init(device_t dev)
{
- struct superio_winbond_w83627dhg_config *conf = dev->chip_info;
if (!dev->enabled)
return;
@@ -49,7 +47,7 @@ static void w83627dhg_init(device_t dev)
w83627dhg_enable_UR2(dev);
break;
case W83627DHG_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 62d331126d..aae0ac453e 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -30,7 +30,6 @@
#include <pc80/keyboard.h>
#include <pc80/mc146818rtc.h>
#include <stdlib.h>
-#include "chip.h"
#include "w83627ehg.h"
static void pnp_write_index(u16 port, u8 reg, u8 value)
@@ -95,7 +94,6 @@ static void init_hwm(u16 base)
static void w83627ehg_init(device_t dev)
{
- struct superio_winbond_w83627ehg_config *conf = dev->chip_info;
struct resource *res0;
if (!dev->enabled)
@@ -103,7 +101,7 @@ static void w83627ehg_init(device_t dev)
switch(dev->path.pnp.device) {
case W83627EHG_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
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 c88174357c..5445b47a58 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -30,7 +30,6 @@
#include <pc80/keyboard.h>
#include <pc80/mc146818rtc.h>
#include <stdlib.h>
-#include "chip.h"
#include "w83627hf.h"
static void pnp_write_index(u16 port, u8 reg, u8 value)
@@ -102,7 +101,6 @@ static void init_hwm(u16 base)
static void w83627hf_init(device_t dev)
{
- struct superio_winbond_w83627hf_config *conf = dev->chip_info;
struct resource *res0;
if (!dev->enabled)
@@ -110,7 +108,7 @@ static void w83627hf_init(device_t dev)
switch(dev->path.pnp.device) {
case W83627HF_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
case W83627HF_HWM:
res0 = find_resource(dev, PNP_IDX_IO0);
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index f6aba10bf2..75186fae6c 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -27,19 +27,17 @@
#include <console/console.h>
#include <string.h>
#include <pc80/keyboard.h>
-#include "chip.h"
#include "w83627thg.h"
static void w83627thg_init(device_t dev)
{
- struct superio_winbond_w83627thg_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case W83627THG_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 5775ff5577..f0d9aefae4 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -27,7 +27,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <pc80/keyboard.h>
-#include "chip.h"
#include "w83627uhg.h"
/*
@@ -60,7 +59,6 @@ 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;
if (!dev->enabled)
return;
@@ -85,7 +83,7 @@ static void w83627uhg_init(device_t dev)
set_uart_clock_source(dev, 0);
break;
case W83627UHG_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index f89607857e..933da9554c 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -27,7 +27,8 @@
#include <lib.h>
#include <pc80/mc146818rtc.h>
#include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
#include "w83697hf.h"
static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divisor) {
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 32ecf1857c..232f46adc4 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -26,19 +26,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "w83977f.h"
static void w83977f_init(device_t dev)
{
- struct superio_winbond_w83977f_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case W83977F_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 7f2dffb836..a61770aa9f 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -28,19 +28,17 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "chip.h"
#include "w83977tf.h"
static void w83977tf_init(device_t dev)
{
- struct superio_winbond_w83977tf_config *conf = dev->chip_info;
if (!dev->enabled)
return;
switch(dev->path.pnp.device) {
case W83977TF_KBC:
- pc_keyboard_init(&conf->keyboard);
+ pc_keyboard_init();
break;
}
}