superio/*: Deal with some chip.h special cases

While backing out the empty pc80 keyboard struct we encountered some
special cases where chip.h is used for other purposes. Deal with these
cases.

Change-Id: Ib11a46cfd14d050d5daa213623b9d8a401c06410
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5621
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

7 files changed, 3 insertions, 83 deletions

diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h
index 9c9aaa6b1e..4a1b696996 100644
--- a/src/superio/ite/it8772f/chip.h
+++ b/src/superio/ite/it8772f/chip.h
@@ -22,11 +22,8 @@
 #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;
@@ -51,4 +48,4 @@ struct superio_ite_it8772f_config {
 	u8 fan3_enable;
 };
 
-#endif
+#endif /* SUPERIO_ITE_IT8772F_CHIP_H */
diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
deleted file mode 100644
index e0c133009d..0000000000
--- 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 af7ca777bf..6b15901803 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h" /* FIXME */
 #include "pc97307.h"
 
 static void init(device_t dev)
diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
deleted file mode 100644
index d8969165f6..0000000000
--- 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 6f39c5da8c..09c3b5eeba 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h" /* FIXME */
 #include "pc97317.h"
 
 static void init(device_t dev)
diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index df9ce4b236..5ca9b20fbb 100644
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -27,4 +27,4 @@ struct superio_winbond_w83697hf_config {
 	unsigned int hwmon_fan2_divisor;
 };
 
-#endif
+#endif /* SUPERIO_WINBOND_W83697HF_CHIP_H */
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 933da9554c..9d9742c75d 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -28,7 +28,7 @@
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h" /* FIXME */
+#include "chip.h"
 #include "w83697hf.h"
 
 static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divisor) {