summaryrefslogtreecommitdiff
path: root/src/superio/smsc
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio/smsc')
-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
14 files changed, 14 insertions, 39 deletions
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();
}
}