[coreboot-gerrit] Patch set updated for coreboot: 71954af src/drivers/pc80: Remove empty struct keyboard

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Tue Apr 29 20:43:40 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5616

-gerrit

commit 71954af5012ec9effaef5bc5cdfcabe3d5869c3a
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Wed Apr 30 04:12:21 2014 +1000

    src/drivers/pc80: Remove empty struct keyboard
    
    This is a empty struct that has propogated though the superio's but
    really does nothing. Time to get rid of it before it adds yet more
    cruft.
    
    Change-Id: Icfa0a97373242573be2fbc07bffd760d6536245d
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/drivers/pc80/keyboard.c             |  2 +-
 src/include/pc80/keyboard.h             |  6 +---
 src/superio/fintek/f71863fg/chip.h      | 31 -------------------
 src/superio/fintek/f71863fg/superio.c   |  4 +--
 src/superio/fintek/f71869ad/chip.h      | 30 ------------------
 src/superio/fintek/f71869ad/superio.c   |  4 +--
 src/superio/fintek/f71872/chip.h        | 31 -------------------
 src/superio/fintek/f71872/superio.c     |  4 +--
 src/superio/fintek/f71889/chip.h        | 31 -------------------
 src/superio/fintek/f71889/superio.c     |  4 +--
 src/superio/fintek/f81865f/chip.h       | 33 --------------------
 src/superio/fintek/f81865f/superio.c    |  4 +--
 src/superio/ite/it8671f/chip.h          | 32 -------------------
 src/superio/ite/it8671f/superio.c       |  4 +--
 src/superio/ite/it8712f/chip.h          | 32 -------------------
 src/superio/ite/it8712f/superio.c       |  4 +--
 src/superio/ite/it8716f/chip.h          | 31 -------------------
 src/superio/ite/it8716f/superio.c       |  4 +--
 src/superio/ite/it8718f/chip.h          | 32 -------------------
 src/superio/ite/it8718f/superio.c       |  4 +--
 src/superio/ite/it8721f/chip.h          | 30 ------------------
 src/superio/ite/it8721f/superio.c       |  4 +--
 src/superio/ite/it8772f/chip.h          | 54 ---------------------------------
 src/superio/ite/it8772f/superio.c       |  4 +--
 src/superio/nsc/pc8374/chip.h           | 32 -------------------
 src/superio/nsc/pc8374/superio.c        |  4 +--
 src/superio/nsc/pc87309/chip.h          | 31 -------------------
 src/superio/nsc/pc87309/superio.c       |  4 +--
 src/superio/nsc/pc87351/chip.h          | 32 -------------------
 src/superio/nsc/pc87351/superio.c       |  4 +--
 src/superio/nsc/pc87360/chip.h          | 32 -------------------
 src/superio/nsc/pc87360/superio.c       |  4 +--
 src/superio/nsc/pc87366/chip.h          | 32 -------------------
 src/superio/nsc/pc87366/superio.c       |  4 +--
 src/superio/nsc/pc87417/chip.h          | 33 --------------------
 src/superio/nsc/pc87417/superio.c       |  4 +--
 src/superio/nsc/pc87427/chip.h          | 32 -------------------
 src/superio/nsc/pc87427/superio.c       |  4 +--
 src/superio/nsc/pc97307/chip.h          | 37 ----------------------
 src/superio/nsc/pc97307/superio.c       |  4 +--
 src/superio/nsc/pc97317/chip.h          | 38 -----------------------
 src/superio/nsc/pc97317/superio.c       |  4 +--
 src/superio/nuvoton/wpcm450/chip.h      | 31 -------------------
 src/superio/nuvoton/wpcm450/superio.c   |  4 +--
 src/superio/renesas/m3885x/chip.h       | 30 ------------------
 src/superio/renesas/m3885x/superio.c    |  4 +--
 src/superio/smsc/fdc37m60x/chip.h       | 32 -------------------
 src/superio/smsc/fdc37m60x/superio.c    |  4 +--
 src/superio/smsc/fdc37n972/chip.h       | 32 -------------------
 src/superio/smsc/fdc37n972/fdc37n972.c  |  2 +-
 src/superio/smsc/kbc1100/chip.h         | 30 ------------------
 src/superio/smsc/kbc1100/superio.c      |  4 +--
 src/superio/smsc/lpc47b272/chip.h       | 31 -------------------
 src/superio/smsc/lpc47b272/superio.c    |  4 +--
 src/superio/smsc/lpc47b397/chip.h       | 33 --------------------
 src/superio/smsc/lpc47b397/superio.c    |  4 +--
 src/superio/smsc/lpc47m10x/chip.h       | 35 ---------------------
 src/superio/smsc/lpc47m10x/superio.c    |  4 +--
 src/superio/smsc/lpc47m15x/chip.h       | 30 ------------------
 src/superio/smsc/lpc47m15x/superio.c    |  4 +--
 src/superio/smsc/lpc47n227/chip.h       | 31 -------------------
 src/superio/smsc/lpc47n227/superio.c    |  4 +--
 src/superio/smsc/mec1308/chip.h         | 29 ------------------
 src/superio/smsc/mec1308/superio.c      |  4 +--
 src/superio/smsc/sch4037/chip.h         | 30 ------------------
 src/superio/smsc/sch4037/superio.c      |  4 +--
 src/superio/smsc/sio1007/chip.h         | 26 ----------------
 src/superio/smsc/sio1036/chip.h         | 29 ------------------
 src/superio/smsc/sio1036/superio.c      |  2 --
 src/superio/smsc/sio10n268/chip.h       | 31 -------------------
 src/superio/smsc/sio10n268/sio10n268.c  |  2 +-
 src/superio/smsc/smscsuperio/chip.h     | 32 -------------------
 src/superio/smsc/smscsuperio/superio.c  |  4 +--
 src/superio/winbond/w83627dhg/chip.h    | 31 -------------------
 src/superio/winbond/w83627dhg/superio.c |  4 +--
 src/superio/winbond/w83627ehg/chip.h    | 32 -------------------
 src/superio/winbond/w83627ehg/superio.c |  4 +--
 src/superio/winbond/w83627hf/chip.h     | 33 --------------------
 src/superio/winbond/w83627hf/superio.c  |  4 +--
 src/superio/winbond/w83627thg/chip.h    | 33 --------------------
 src/superio/winbond/w83627thg/superio.c |  4 +--
 src/superio/winbond/w83627uhg/chip.h    | 31 -------------------
 src/superio/winbond/w83627uhg/superio.c |  4 +--
 src/superio/winbond/w83697hf/chip.h     | 30 ------------------
 src/superio/winbond/w83697hf/superio.c  |  2 --
 src/superio/winbond/w83977f/chip.h      | 31 -------------------
 src/superio/winbond/w83977f/superio.c   |  4 +--
 src/superio/winbond/w83977tf/chip.h     | 33 --------------------
 src/superio/winbond/w83977tf/superio.c  |  4 +--
 89 files changed, 43 insertions(+), 1541 deletions(-)

diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 5b68617..6a573d8 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/include/pc80/keyboard.h b/src/include/pc80/keyboard.h
index ce281bb..16cb959 100644
--- a/src/include/pc80/keyboard.h
+++ b/src/include/pc80/keyboard.h
@@ -1,11 +1,7 @@
 #ifndef PC80_KEYBOARD_H
 #define PC80_KEYBOARD_H
 
-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/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h
deleted file mode 100644
index a2c04d7..0000000
--- a/src/superio/fintek/f71863fg/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey at slightlyhackish.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_FINTEK_F71863FG_CHIP_H
-#define SUPERIO_FINTEK_F71863FG_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_fintek_f71863fg_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_FINTEK_F71863FG_CHIP_H */
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 29b5ab3..11bfbec 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -24,12 +24,10 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include "chip.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 +37,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/chip.h b/src/superio/fintek/f71869ad/chip.h
deleted file mode 100644
index ea2ee6e..0000000
--- a/src/superio/fintek/f71869ad/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Edward O'Callaghan <eocallaghan at alterapraxis.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_FINTEK_F71869AD_CHIP_H
-#define SUPERIO_FINTEK_F71869AD_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_fintek_f71869ad_config {
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_FINTEK_F71869AD_CHIP_H */
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 11ad6f8..db3c5c9 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -25,12 +25,10 @@
 #include <console/console.h>
 #include <stdlib.h>
 
-#include "chip.h"
 #include "f71869ad.h"
 
 static void f71869ad_init(device_t dev)
 {
-	struct superio_fintek_f71869ad_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
@@ -38,7 +36,7 @@ static void f71869ad_init(device_t dev)
 	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;
 	}
 }
diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h
deleted file mode 100644
index 3368ef2..0000000
--- a/src/superio/fintek/f71872/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey at slightlyhackish.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_FINTEK_F71872_CHIP_H
-#define SUPERIO_FINTEK_F71872_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_fintek_f71872_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_FINTEK_F71872_CHIP_H */
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 55a11b1..fb7cd72 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -24,12 +24,10 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include "chip.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 +35,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/chip.h b/src/superio/fintek/f71889/chip.h
deleted file mode 100644
index e5a15d3..0000000
--- a/src/superio/fintek/f71889/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Alec Ari <neotheuser at ymail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_FINTEK_F71889_CHIP_H
-#define SUPERIO_FINTEK_F71889_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_fintek_f71889_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_FINTEK_F71889_CHIP_H */
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 71edafc..3b6f3eb 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -24,12 +24,10 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include "chip.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 +35,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/chip.h b/src/superio/fintek/f81865f/chip.h
deleted file mode 100644
index ae4da18..0000000
--- a/src/superio/fintek/f81865f/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_FINTEK_F81865_CHIP_H
-#define SUPERIO_FINTEK_F81865_CHIP_H
-
-#include <pc80/keyboard.h>
-
-/* This chip doesn't have keyboard and mouse support. */
-
-struct superio_fintek_f81865f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_FINTEK_F81865_CHIP_H */
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 85ac7ba..32828d3 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -24,12 +24,10 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include "chip.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 +35,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/chip.h b/src/superio/ite/it8671f/chip.h
deleted file mode 100644
index 7d5c1d4..0000000
--- a/src/superio/ite/it8671f/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8671F_CHIP_H
-#define SUPERIO_ITE_IT8671F_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8671f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 21c70ec..9da8f1d 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/chip.h b/src/superio/ite/it8712f/chip.h
deleted file mode 100644
index 1f159cd..0000000
--- a/src/superio/ite/it8712f/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8712F_CHIP_H
-#define SUPERIO_ITE_IT8712F_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8712f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 2fd3440..769afe3 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/chip.h b/src/superio/ite/it8716f/chip.h
deleted file mode 100644
index afdcd96..0000000
--- a/src/superio/ite/it8716f/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8716F_CHIP_H
-#define SUPERIO_ITE_IT8716F_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8716f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_ITE_IT8716F_CHIP_H */
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 8cf3c5f..bd89a32 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/chip.h b/src/superio/ite/it8718f/chip.h
deleted file mode 100644
index a23687c..0000000
--- a/src/superio/ite/it8718f/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8718F_CHIP_H
-#define SUPERIO_ITE_IT8718F_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8718f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 998d271..d40407a 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/chip.h b/src/superio/ite/it8721f/chip.h
deleted file mode 100644
index e903cd6..0000000
--- a/src/superio/ite/it8721f/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 QingPei Wang <wangqingpei at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8721F_CHIP_H
-#define SUPERIO_ITE_IT8721F_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8721f_config {
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_ITE_IT8721F_CHIP_H */
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index 300a480..66e6ef7 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/chip.h b/src/superio/ite/it8772f/chip.h
deleted file mode 100644
index 9c9aaa6..0000000
--- a/src/superio/ite/it8772f/chip.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_ITE_IT8772F_CHIP_H
-#define SUPERIO_ITE_IT8772F_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_ite_it8772f_config {
-	struct pc_keyboard keyboard;
-
-	/* GPIO SimpleIO register values via devicetree.cb */
-	u8 gpio_set1;
-	u8 gpio_set2;
-	u8 gpio_set3;
-	u8 gpio_set4;
-	u8 gpio_set5;
-	u8 gpio_set6;
-
-	u8 skip_keyboard;
-
-	/*
-	 * Enable external temperature sensor to use PECI GetTemp()
-	 * command and store in register TMPIN 1, 2, or 3.
-	 */
-	u8 peci_tmpin;
-
-	/*
-	 * Enable a FAN for sofware control.
-	 */
-	u8 fan1_enable;
-	u8 fan2_enable;
-	u8 fan3_enable;
-};
-
-#endif
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index e7e82a8..cc69e41 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -23,7 +23,6 @@
 #include <pc80/keyboard.h>
 #include <arch/io.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "it8772f.h"
 
 static void pnp_enter_ext_func_mode(device_t dev)
@@ -133,7 +132,6 @@ static void it8772f_enable_fan(struct resource *res, int fan)
 
 static void it8772f_init(device_t dev)
 {
-	struct superio_ite_it8772f_config *conf = dev->chip_info;
 	struct resource *res;
 
 	if (!dev->enabled)
@@ -177,7 +175,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/chip.h b/src/superio/nsc/pc8374/chip.h
deleted file mode 100644
index 40a9b60..0000000
--- a/src/superio/nsc/pc8374/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC8374_CHIP_H
-#define SUPERIO_NSC_PC8374_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc8374_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 71cde2c..8b6f1ca 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/chip.h b/src/superio/nsc/pc87309/chip.h
deleted file mode 100644
index e769a85..0000000
--- a/src/superio/nsc/pc87309/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87309_CHIP_H
-#define SUPERIO_NSC_PC87309_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87309_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 52fc14f..f374e6a 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/chip.h b/src/superio/nsc/pc87351/chip.h
deleted file mode 100644
index 39faee4..0000000
--- a/src/superio/nsc/pc87351/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87351_CHIP_H
-#define SUPERIO_NSC_PC87351_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87351_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 4d9469e..7f395b4 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/chip.h b/src/superio/nsc/pc87360/chip.h
deleted file mode 100644
index e48c0f2..0000000
--- a/src/superio/nsc/pc87360/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87360_CHIP_H
-#define SUPERIO_NSC_PC87360_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87360_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 92731e7..a53cc35 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/chip.h b/src/superio/nsc/pc87366/chip.h
deleted file mode 100644
index 0ce8abd..0000000
--- a/src/superio/nsc/pc87366/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87366_CHIP_H
-#define SUPERIO_NSC_PC87366_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87366_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 1874ab3..27bdd6e 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/chip.h b/src/superio/nsc/pc87417/chip.h
deleted file mode 100644
index 8c1e8e0..0000000
--- a/src/superio/nsc/pc87417/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan by yhlu
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87417_CHIP_H
-#define SUPERIO_NSC_PC87417_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87417_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 3b91f36..99882a5 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/chip.h b/src/superio/nsc/pc87427/chip.h
deleted file mode 100644
index 4500aa9..0000000
--- a/src/superio/nsc/pc87427/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC87427_CHIP_H
-#define SUPERIO_NSC_PC87427_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc87427_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index ae02f01..0f6fa14 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -25,19 +25,17 @@
 #include <console/console.h>
 #include <string.h>
 #include <stdlib.h>
-#include "chip.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/chip.h b/src/superio/nsc/pc97307/chip.h
deleted file mode 100644
index e0c1330..0000000
--- a/src/superio/nsc/pc97307/chip.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC97307_CHIP_H
-#define SUPERIO_NSC_PC97307_CHIP_H
-
-#ifndef PNP_INDEX_REG
-#define PNP_INDEX_REG   0x15C
-#endif
-#ifndef PNP_DATA_REG
-#define PNP_DATA_REG    0x15D
-#endif
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc97307_config {
-
-	struct pc_keyboard keyboard;
-};
-#endif
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index c1cd5c1..2a2bb1f 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -23,12 +23,10 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include "chip.h"
 #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 +38,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/chip.h b/src/superio/nsc/pc97317/chip.h
deleted file mode 100644
index d896916..0000000
--- a/src/superio/nsc/pc97317/chip.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NSC_PC97317_CHIP_H
-#define SUPERIO_NSC_PC97317_CHIP_H
-
-#ifndef PNP_INDEX_REG
-#define PNP_INDEX_REG   0x15C
-#endif
-#ifndef PNP_DATA_REG
-#define PNP_DATA_REG    0x15D
-#endif
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc97317_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index a69dfe7..467805a 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -23,12 +23,10 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc97317.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc97317_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
@@ -39,7 +37,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/chip.h b/src/superio/nuvoton/wpcm450/chip.h
deleted file mode 100644
index cc4054f..0000000
--- a/src/superio/nuvoton/wpcm450/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_NUVOTON_WPCM450_CHIP_H
-#define SUPERIO_NUVOTON_WPCM450_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_nuvoton_wpcm450_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index fabb546..ff815cf 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/chip.h b/src/superio/renesas/m3885x/chip.h
deleted file mode 100644
index 8ca54c7..0000000
--- a/src/superio/renesas/m3885x/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_RENESAS_M3885X_CHIP_H
-#define SUPERIO_RENESAS_M3885X_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_renesas_m3885x_config {
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 34d7d11..26a7071 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -25,20 +25,18 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "chip.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/chip.h b/src/superio/smsc/fdc37m60x/chip.h
deleted file mode 100644
index a143f65..0000000
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_FDC37M60X_CHIP_H
-#define SUPERIO_SMSC_FDC37M60X_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_fdc37m60x_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index 92a1783..f5626ee 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/chip.h b/src/superio/smsc/fdc37n972/chip.h
deleted file mode 100644
index e4126a7..0000000
--- a/src/superio/smsc/fdc37n972/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_FDC37N972_CHIP_H
-#define SUPERIO_SMSC_FDC37N972_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_fdc37n972_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
-
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index cab4540..a5d1163 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -37,7 +37,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
 	}
diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h
deleted file mode 100644
index 59ffb42..0000000
--- a/src/superio/smsc/kbc1100/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_KBC1100_CHIP_H
-#define SUPERIO_SMSC_KBC1100_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_kbc1100_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
\ No newline at end of file
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 3a834a0..77777d0 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/chip.h b/src/superio/smsc/lpc47b272/chip.h
deleted file mode 100644
index 5a42f4a..0000000
--- a/src/superio/smsc/lpc47b272/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2005 Digital Design Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_LPC47B272_CHIP_H
-#define SUPERIO_SMSC_LPC47B272_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_lpc47b272_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index fb39c28..30e89a8 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/chip.h b/src/superio/smsc/lpc47b397/chip.h
deleted file mode 100644
index e4ad5b1..0000000
--- a/src/superio/smsc/lpc47b397/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_LPC47B397_CHIP_H
-#define SUPERIO_SMSC_LPC47B397_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_lpc47b397_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 3d81350..8a6c03e 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/chip.h b/src/superio/smsc/lpc47m10x/chip.h
deleted file mode 100644
index 2d947be..0000000
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- * Copyright (C) 2005 Digital Design Corporation
- * Copyright (C) 2006 Ron Minnich, LANL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
- */
-
-#ifndef SUPERIO_SMSC_LPC47M10X_CHIP_H
-#define SUPERIO_SMSC_LPC47M10X_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_lpc47m10x_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 1a697f2..a9583e4 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/chip.h b/src/superio/smsc/lpc47m15x/chip.h
deleted file mode 100644
index 757fa73..0000000
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_LPC47M15X_CHIP_H
-#define SUPERIO_SMSC_LPC47M15X_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_lpc47m15x_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index b142dde..91e77ba 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/chip.h b/src/superio/smsc/lpc47n227/chip.h
deleted file mode 100644
index 3f26d8b..0000000
--- a/src/superio/smsc/lpc47n227/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_LPC47N227_CHIP_H
-#define SUPERIO_SMSC_LPC47N227_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_lpc47n227_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index eda2622..e65d74d 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "lpc47n227.h"
 
 /* Forward declarations. */
@@ -128,7 +127,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 +134,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/chip.h b/src/superio/smsc/mec1308/chip.h
deleted file mode 100644
index 733cd34..0000000
--- a/src/superio/smsc/mec1308/chip.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_MEC1308_CHIP_H
-#define SUPERIO_SMSC_MEC1308_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_mec1308_config {
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 448800e..54d99fb 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/chip.h b/src/superio/smsc/sch4037/chip.h
deleted file mode 100644
index b1fee00..0000000
--- a/src/superio/smsc/sch4037/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SCH_4037_CHIP_H
-#define SUPERIO_SCH_4037_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_sch4037_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif //SUPERIO_SCH_4037_CHIP_H
\ No newline at end of file
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index b7f100a..35df431 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
deleted file mode 100644
index eee2811..0000000
--- a/src/superio/smsc/sio1007/chip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Sage Electronic Engineering LLC.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_1007_CHIP_H
-#define SUPERIO_SMSC_1007_CHIP_H
-
-void sio1007_setreg(u16 lpc_port, u8 reg, u8 value, u8 mask);
-int sio1007_enable_uart_at(u16 port);
-
-#endif
diff --git a/src/superio/smsc/sio1036/chip.h b/src/superio/smsc/sio1036/chip.h
deleted file mode 100644
index c19ce43..0000000
--- a/src/superio/smsc/sio1036/chip.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_SIO1036_CHIP_H
-#define SUPERIO_SMSC_SIO1036_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_smsc_sio1036_config {
-};
-
-#endif //SUPERIO_SMSC_SIO1036_CHIP_H
-
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 4980803..7fac79c 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/chip.h b/src/superio/smsc/sio10n268/chip.h
deleted file mode 100644
index cde51d1..0000000
--- a/src/superio/smsc/sio10n268/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_SIO10N268_CHIP_H
-#define SUPERIO_SMSC_SIO10N268_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_sio10n268_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index 690c160..6fb6e57 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -38,7 +38,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/chip.h b/src/superio/smsc/smscsuperio/chip.h
deleted file mode 100644
index 1e5acfe..0000000
--- a/src/superio/smsc/smscsuperio/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_SMSCSUPERIO_CHIP_H
-#define SUPERIO_SMSC_SMSCSUPERIO_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_smscsuperio_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 9990aa2..0d62a9a 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/chip.h b/src/superio/winbond/w83627dhg/chip.h
deleted file mode 100644
index 0bc5374..0000000
--- a/src/superio/winbond/w83627dhg/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83627DHG_CHIP_H
-#define SUPERIO_WINBOND_W83627DHG_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83627dhg_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 269e57c..fdab974 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/chip.h b/src/superio/winbond/w83627ehg/chip.h
deleted file mode 100644
index e073d7d..0000000
--- a/src/superio/winbond/w83627ehg/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghai.lu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83627EHG_CHIP_H
-#define SUPERIO_WINBOND_W83627EHG_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83627ehg_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 62d3311..aae0ac4 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/chip.h b/src/superio/winbond/w83627hf/chip.h
deleted file mode 100644
index ae527ea..0000000
--- a/src/superio/winbond/w83627hf/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83627HF_CHIP_H
-#define SUPERIO_WINBOND_W83627HF_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83627hf_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index c881743..5445b47 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/chip.h b/src/superio/winbond/w83627thg/chip.h
deleted file mode 100644
index 1677b97..0000000
--- a/src/superio/winbond/w83627thg/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83627THG_CHIP_H
-#define SUPERIO_WINBOND_W83627THG_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83627thg_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif /* SUPERIO_WINBOND_W83627THG_CHIP_H */
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index f6aba10..75186fa 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/chip.h b/src/superio/winbond/w83627uhg/chip.h
deleted file mode 100644
index cf8edfb..0000000
--- a/src/superio/winbond/w83627uhg/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Dynon Avionics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
- */
-
-#ifndef SUPERIO_WINBOND_W83627UHG_CHIP_H
-#define SUPERIO_WINBOND_W83627UHG_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83627uhg_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 5775ff5..f0d9aef 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/chip.h b/src/superio/winbond/w83697hf/chip.h
deleted file mode 100644
index df9ce4b..0000000
--- a/src/superio/winbond/w83697hf/chip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Sean Nelson <snelson at nmt.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83697HF_CHIP_H
-#define SUPERIO_WINBOND_W83697HF_CHIP_H
-
-
-struct superio_winbond_w83697hf_config {
-	unsigned int hwmon_fan1_divisor;
-	unsigned int hwmon_fan2_divisor;
-};
-
-#endif
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index f896078..64394ec 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -27,7 +27,6 @@
 #include <lib.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83697hf.h"
 
 static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divisor) {
@@ -52,7 +51,6 @@ static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divis
 static void w83697hf_init(device_t dev)
 {
 	struct resource *res0;
-	struct superio_winbond_w83697hf_config *cfg;
 
 	if (!dev->enabled)
 		return;
diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h
deleted file mode 100644
index 7363445..0000000
--- a/src/superio/winbond/w83977f/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Nikolay Petukhov <nikolay.petukhov at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83977F_CHIP_H
-#define SUPERIO_WINBOND_W83977F_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83977f_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 32ecf18..232f46a 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/chip.h b/src/superio/winbond/w83977tf/chip.h
deleted file mode 100644
index ddcf1b5..0000000
--- a/src/superio/winbond/w83977tf/chip.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_WINBOND_W83977TF_CHIP_H
-#define SUPERIO_WINBOND_W83977TF_CHIP_H
-
-#include <pc80/keyboard.h>
-
-struct superio_winbond_w83977tf_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 7f2dffb..a61770a 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;
 	}
 }



More information about the coreboot-gerrit mailing list