Peter Lemenkov has uploaded this change for review.
superio/nsc: Use common defines for NSC PC8xxxx chips
* Some common NSC defines moved to superio/nsc/common
* All NSC's pc8xxxx chips uses these common definitions
* Lenovo T60/X60/Z61t/T400 docking updated to use these common defines
* HP ProLiant DL165 G6 Fam10 updated to use this common code
Build tested - Lenovo T60/X60/Z61t/T400, HP ProLiant DL165 G6 Fam10
builds fine.
Change-Id: Iffdb4752f3075b1a1b391d4cf8d4416748bfe485
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
M src/mainboard/hp/dl165_g6_fam10/romstage.c
M src/mainboard/lenovo/t400/dock.c
M src/mainboard/lenovo/t60/dock.c
M src/mainboard/lenovo/x60/dock.c
M src/mainboard/lenovo/z61t/dock.c
A src/superio/nsc/common/superio_defs.h
D src/superio/nsc/pc87309/pc87309.h
M src/superio/nsc/pc87309/superio.c
D src/superio/nsc/pc87360/pc87360.h
M src/superio/nsc/pc87360/superio.c
D src/superio/nsc/pc87366/pc87366.h
M src/superio/nsc/pc87366/superio.c
D src/superio/nsc/pc87382/pc87382.h
M src/superio/nsc/pc87382/superio.c
D src/superio/nsc/pc87384/pc87384.h
M src/superio/nsc/pc87384/superio.c
D src/superio/nsc/pc87392/pc87392.h
M src/superio/nsc/pc87392/superio.c
M src/superio/nsc/pc87417/pc87417.h
M src/superio/nsc/pc87417/superio.c
20 files changed, 219 insertions(+), 369 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/31427/1
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 6d2eed4..7f5411e 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -34,6 +34,7 @@
#include <spd.h>
#include <delay.h>
#include <superio/serverengines/pilot/pilot.h>
+#include <superio/nsc/common/superio_defs.h>
#include <superio/nsc/pc87417/pc87417.h>
#include <cpu/x86/bist.h>
#include <cpu/amd/car.h>
@@ -50,7 +51,7 @@
#include "cpu/amd/quadcore/quadcore.c"
#define SERIAL_DEV PNP_DEV(0x2e, PILOT_SP1)
-#define RTC_DEV PNP_DEV(0x4e, PC87417_RTC)
+#define RTC_DEV PNP_DEV(0x4e, PC8XXXX_RTC)
void activate_spd_rom(const struct mem_controller *ctrl);
int spd_read_byte(unsigned int device, unsigned int address);
diff --git a/src/mainboard/lenovo/t400/dock.c b/src/mainboard/lenovo/t400/dock.c
index 6d1a80c..58788e7 100644
--- a/src/mainboard/lenovo/t400/dock.c
+++ b/src/mainboard/lenovo/t400/dock.c
@@ -23,7 +23,7 @@
#include <device/pnp.h>
#include <delay.h>
#include "dock.h"
-#include <superio/nsc/pc87382/pc87382.h>
+#include <superio/nsc/common/superio_defs.h>
#include <southbridge/intel/i82801ix/i82801ix.h>
#include <ec/lenovo/h8/h8.h>
@@ -64,8 +64,8 @@
return 0;
}
-static const pnp_devfn_t l_dlpc = PNP_DEV(0x164e, PC87382_DOCK);
-static const pnp_devfn_t l_gpio = PNP_DEV(0x164e, PC87382_GPIO);
+static const pnp_devfn_t l_dlpc = PNP_DEV(0x164e, PC8XXXX_DOCK);
+static const pnp_devfn_t l_gpio = PNP_DEV(0x164e, PC8XXXX_GPIO);
static int pc87382_init(pnp_devfn_t dlpc, u16 dlpc_base)
{
@@ -170,20 +170,18 @@
/* Docking station side. */
-#include <superio/nsc/pc87384/pc87384.h>
-
-static const pnp_devfn_t r_gpio = PNP_DEV(SUPERIO_DEV, PC87384_GPIO);
-static const pnp_devfn_t r_serial = PNP_DEV(SUPERIO_DEV, PC87384_SP1);
+static const pnp_devfn_t r_gpio = PNP_DEV(SUPERIO_DEV, PC8XXXX_GPIO);
+static const pnp_devfn_t r_serial = PNP_DEV(SUPERIO_DEV, PC8XXXX_SP1);
static const struct pin_config remote_gpio[] = {
- {0x00, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
- {0x01, PC87384_GPIO_PIN_TYPE_PUSH_PULL | PC87384_GPIO_PIN_OE},
- {0x02, PC87384_GPIO_PIN_TYPE_PUSH_PULL | PC87384_GPIO_PIN_OE},
- {0x03, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
- {0x04, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
- {0x05, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
- {0x06, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
- {0x07, PC87384_GPIO_PIN_DEBOUNCE | PC87384_GPIO_PIN_PULLUP},
+ {0x00, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
+ {0x01, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL | PC8XXXX_GPIO_PIN_OE},
+ {0x02, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL | PC8XXXX_GPIO_PIN_OE},
+ {0x03, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
+ {0x04, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
+ {0x05, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
+ {0x06, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
+ {0x07, PC8XXXX_GPIO_PIN_DEBOUNCE | PC8XXXX_GPIO_PIN_PULLUP},
};
static int pc87384_init(void)
diff --git a/src/mainboard/lenovo/t60/dock.c b/src/mainboard/lenovo/t60/dock.c
index 05dd65e..57a5a00 100644
--- a/src/mainboard/lenovo/t60/dock.c
+++ b/src/mainboard/lenovo/t60/dock.c
@@ -18,7 +18,7 @@
#include <arch/io.h>
#include <delay.h>
#include "dock.h"
-#include <superio/nsc/pc87384/pc87384.h>
+#include <superio/nsc/common/superio_defs.h>
#include "ec/acpi/ec.h"
#include "ec/lenovo/pmh7/pmh7.h"
#include <southbridge/intel/i82801gx/i82801gx.h>
@@ -128,38 +128,38 @@
dock_write_register(0x22, 0xa9);
/* enable serial port */
- dock_write_register(0x07, PC87384_SP1);
+ dock_write_register(0x07, PC8XXXX_SP1);
dock_write_register(0x30, 0x01);
- dock_write_register(0x07, PC87384_GPIO);
+ dock_write_register(0x07, PC8XXXX_GPIO);
dock_write_register(0x60, 0x16);
dock_write_register(0x61, 0x20);
/* enable GPIO */
dock_write_register(0x30, 0x01);
- dock_gpio_set_mode(0x00, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x00, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x01, PC87384_GPIO_PIN_TYPE_PUSH_PULL |
- PC87384_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x01, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x02, PC87384_GPIO_PIN_TYPE_PUSH_PULL |
- PC87384_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x02, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x03, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x03, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x04, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x04, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x05, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x05, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x06, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x06, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x07, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x07, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
/* no GPIO events enabled for PORT0 */
diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c
index b94d818..cf5e71d 100644
--- a/src/mainboard/lenovo/x60/dock.c
+++ b/src/mainboard/lenovo/x60/dock.c
@@ -20,7 +20,7 @@
#include <delay.h>
#include "dock.h"
#include <southbridge/intel/i82801gx/i82801gx.h>
-#include <superio/nsc/pc87392/pc87392.h>
+#include <superio/nsc/common/superio_defs.h>
static void dlpc_write_register(int reg, int value)
{
@@ -165,58 +165,58 @@
dock_write_register(0x61, 0x20);
/* init GPIO pins */
- dock_gpio_set_mode(0x00, PC87392_GPIO_PIN_DEBOUNCE |
- PC87392_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x00, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x01, PC87392_GPIO_PIN_DEBOUNCE |
- PC87392_GPIO_PIN_PULLUP,
- PC87392_GPIO_PIN_TRIGGERS_SMI);
+ dock_gpio_set_mode(0x01, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP,
+ PC8XXXX_GPIO_PIN_TRIGGERS_SMI);
- dock_gpio_set_mode(0x02, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x03, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x04, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x05, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x06, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x07, PC87392_GPIO_PIN_PULLUP, 0x02);
+ dock_gpio_set_mode(0x02, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x03, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x04, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x05, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x06, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x07, PC8XXXX_GPIO_PIN_PULLUP, 0x02);
- dock_gpio_set_mode(0x10, PC87392_GPIO_PIN_DEBOUNCE |
- PC87392_GPIO_PIN_PULLUP,
- PC87392_GPIO_PIN_TRIGGERS_SMI);
+ dock_gpio_set_mode(0x10, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP,
+ PC8XXXX_GPIO_PIN_TRIGGERS_SMI);
- dock_gpio_set_mode(0x11, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x12, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x13, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x14, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x15, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x16, PC87392_GPIO_PIN_PULLUP |
- PC87392_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x11, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x12, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x13, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x14, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x15, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x16, PC8XXXX_GPIO_PIN_PULLUP |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x17, PC87392_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x17, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x20, PC87392_GPIO_PIN_TYPE_PUSH_PULL |
- PC87392_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x20, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x21, PC87392_GPIO_PIN_TYPE_PUSH_PULL |
- PC87392_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x21, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x22, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x23, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x24, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x25, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x26, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x27, PC87392_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x22, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x23, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x24, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x25, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x26, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x27, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x30, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x31, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x32, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x33, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x34, PC87392_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x30, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x31, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x32, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x33, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x34, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x35, PC87392_GPIO_PIN_PULLUP |
- PC87392_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x35, PC8XXXX_GPIO_PIN_PULLUP |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x36, PC87392_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x37, PC87392_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x36, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x37, PC8XXXX_GPIO_PIN_PULLUP, 0x00);
/* enable GPIO */
dock_write_register(0x30, 0x01);
diff --git a/src/mainboard/lenovo/z61t/dock.c b/src/mainboard/lenovo/z61t/dock.c
index 05dd65e..57a5a00 100644
--- a/src/mainboard/lenovo/z61t/dock.c
+++ b/src/mainboard/lenovo/z61t/dock.c
@@ -18,7 +18,7 @@
#include <arch/io.h>
#include <delay.h>
#include "dock.h"
-#include <superio/nsc/pc87384/pc87384.h>
+#include <superio/nsc/common/superio_defs.h>
#include "ec/acpi/ec.h"
#include "ec/lenovo/pmh7/pmh7.h"
#include <southbridge/intel/i82801gx/i82801gx.h>
@@ -128,38 +128,38 @@
dock_write_register(0x22, 0xa9);
/* enable serial port */
- dock_write_register(0x07, PC87384_SP1);
+ dock_write_register(0x07, PC8XXXX_SP1);
dock_write_register(0x30, 0x01);
- dock_write_register(0x07, PC87384_GPIO);
+ dock_write_register(0x07, PC8XXXX_GPIO);
dock_write_register(0x60, 0x16);
dock_write_register(0x61, 0x20);
/* enable GPIO */
dock_write_register(0x30, 0x01);
- dock_gpio_set_mode(0x00, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x00, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x01, PC87384_GPIO_PIN_TYPE_PUSH_PULL |
- PC87384_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x01, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x02, PC87384_GPIO_PIN_TYPE_PUSH_PULL |
- PC87384_GPIO_PIN_OE, 0x00);
+ dock_gpio_set_mode(0x02, PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL |
+ PC8XXXX_GPIO_PIN_OE, 0x00);
- dock_gpio_set_mode(0x03, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x03, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x04, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x04, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x05, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x05, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x06, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x06, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
- dock_gpio_set_mode(0x07, PC87384_GPIO_PIN_DEBOUNCE |
- PC87384_GPIO_PIN_PULLUP, 0x00);
+ dock_gpio_set_mode(0x07, PC8XXXX_GPIO_PIN_DEBOUNCE |
+ PC8XXXX_GPIO_PIN_PULLUP, 0x00);
/* no GPIO events enabled for PORT0 */
diff --git a/src/superio/nsc/common/superio_defs.h b/src/superio/nsc/common/superio_defs.h
new file mode 100644
index 0000000..cc35508
--- /dev/null
+++ b/src/superio/nsc/common/superio_defs.h
@@ -0,0 +1,59 @@
+/*
+ * 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) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
+ *
+ * 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.
+ */
+
+#ifndef SUPERIO_NSC_COMMON_SUPERIO_DEFS_H
+#define SUPERIO_NSC_COMMON_SUPERIO_DEFS_H
+
+#define PC8XXXX_FDC 0x00 /* Floppy */
+#define PC8XXXX_PP 0x01 /* Parallel port */
+#define PC8XXXX_SP2 0x02 /* COM 2 / IR */
+#define PC8XXXX_SP1 0x03 /* COM 1 */
+#define PC8XXXX_SWC 0x04 /* System wakeup control */
+//#define PC8XXXX_PM 0x04 /* Power management */
+#define PC8XXXX_KBCM 0x05 /* Mouse */
+#define PC8XXXX_KBCK 0x06 /* Keyboard */
+#define PC8XXXX_GPIO 0x07 /* General purpose IO */
+//#define PC8XXXX_HM 0x08
+#define PC8XXXX_FSD 0x08 /* Fan speed device */
+#define PC8XXXX_ACB 0x08
+#define PC8XXXX_FSCM 0x09
+#define PC8XXXX_FMC 0x09
+#define PC8XXXX_WDT 0x0A
+#define PC8XXXX_GMP 0x0B
+#define PC8XXXX_MIDI 0x0C
+#define PC8XXXX_VLM 0x0D
+#define PC8XXXX_TMS 0x0E
+#define PC8XXXX_XBUS 0x0F
+#define PC8XXXX_RTC 0x10
+#define PC8XXXX_MHC 0x14
+#define PC8XXXX_DOCK 0x19
+
+#define PC8XXXX_GPIO_PIN_OE 0x01
+#define PC8XXXX_GPIO_PIN_TYPE_PUSH_PULL 0x02
+#define PC8XXXX_GPIO_PIN_PULLUP 0x04
+#define PC8XXXX_GPIO_PIN_LOCK 0x08
+#define PC8XXXX_GPIO_PIN_TRIG_LEVEL 0x10
+#define PC8XXXX_GPIO_PIN_TRIG_LOW 0x20
+#define PC8XXXX_GPIO_PIN_DEBOUNCE 0x40
+
+#define PC8XXXX_GPIO_PIN_TRIGGERS_IRQ 0x01
+#define PC8XXXX_GPIO_PIN_TRIGGERS_SMI 0x02
+
+#endif /* SUPERIO_NSC_COMMON_SUPERIO_DEFS_H */
diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
deleted file mode 100644
index 3b912ea..0000000
--- a/src/superio/nsc/pc87309/pc87309.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@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.
- */
-
-#ifndef SUPERIO_NSC_PC87309_H
-#define SUPERIO_NSC_PC87309_H
-
-/* Datasheet: PC87309 SuperI/O Plug and Play Compatible Chip. */
-
-#define PC87309_FDC 0x00 /* Floppy */
-#define PC87309_PP 0x01 /* Parallel port */
-#define PC87309_SP2 0x02 /* Com2 / IR */
-#define PC87309_SP1 0x03 /* Com1 */
-#define PC87309_PM 0x04 /* Power management */
-#define PC87309_KBCM 0x05 /* Mouse */
-#define PC87309_KBCK 0x06 /* Keyboard */
-
-#endif /* SUPERIO_NSC_PC87309_H */
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 458c501..f63bea9 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -19,7 +19,7 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "pc87309.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -28,7 +28,7 @@
return;
switch (dev->path.pnp.device) {
- case PC87309_KBCK:
+ case PC8XXXX_KBCK:
pc_keyboard_init(NO_AUX_DEVICE);
break;
}
@@ -43,14 +43,14 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8, },
- { NULL, PC87309_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
/* TODO: PM. */
- { NULL, PC87309_KBCM, PNP_IRQ0, },
- { NULL, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x7f8, },
+ { NULL, PC8XXXX_KBCM, PNP_IRQ0, },
+ { NULL, PC8XXXX_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x7f8, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h
deleted file mode 100644
index c969746..0000000
--- a/src/superio/nsc/pc87360/pc87360.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
- *
- * 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.
- */
-
-#ifndef SUPERIO_NSC_PC87360_H
-#define SUPERIO_NSC_PC87360_H
-
-#define PC87360_FDC 0x00 /* Floppy */
-#define PC87360_PP 0x01 /* Parallel port */
-#define PC87360_SP2 0x02 /* Com2 */
-#define PC87360_SP1 0x03 /* Com1 */
-#define PC87360_SWC 0x04
-#define PC87360_KBCM 0x05 /* Mouse */
-#define PC87360_KBCK 0x06 /* Keyboard */
-#define PC87360_GPIO 0x07
-#define PC87360_ACB 0x08
-#define PC87360_FSCM 0x09
-#define PC87360_WDT 0x0A
-
-#endif /* SUPERIO_NSC_PC87360_H */
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index cf5c7ca..85f21a2 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "pc87360.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -29,7 +29,7 @@
return;
switch (dev->path.pnp.device) {
- case PC87360_KBCK:
+ case PC8XXXX_KBCK:
pc_keyboard_init(NO_AUX_DEVICE);
break;
}
@@ -44,18 +44,18 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87360_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87360_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87360_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8, },
- { NULL, PC87360_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { NULL, PC87360_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
- { NULL, PC87360_KBCM, PNP_IRQ0, },
- { NULL, PC87360_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
- { NULL, PC87360_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87360_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87360_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87360_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
+ { NULL, PC8XXXX_KBCM, PNP_IRQ0, },
+ { NULL, PC8XXXX_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87366/pc87366.h b/src/superio/nsc/pc87366/pc87366.h
deleted file mode 100644
index b1df69f..0000000
--- a/src/superio/nsc/pc87366/pc87366.h
+++ /dev/null
@@ -1,37 +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.
- */
-
-#ifndef SUPERIO_NSC_PC87366_H
-#define SUPERIO_NSC_PC87366_H
-
-#define PC87366_FDC 0x00 /* Floppy */
-#define PC87366_PP 0x01 /* Parallel port */
-#define PC87366_SP2 0x02 /* Com2 */
-#define PC87366_SP1 0x03 /* Com1 */
-#define PC87366_SWC 0x04
-#define PC87366_KBCM 0x05 /* Mouse */
-#define PC87366_KBCK 0x06 /* Keyboard */
-#define PC87366_GPIO 0x07
-#define PC87366_ACB 0x08
-#define PC87366_FSCM 0x09
-#define PC87366_WDT 0x0A
-#define PC87366_GMP 0x0b
-#define PC87366_MIDI 0x0C
-#define PC87366_VLM 0x0D
-#define PC87366_TMS 0x0E
-
-#endif /* SUPERIO_NSC_PC87366_H */
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index e1cba17..60e5e23 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "pc87366.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -29,7 +29,7 @@
return;
switch (dev->path.pnp.device) {
- case PC87366_KBCK:
+ case PC8XXXX_KBCK:
pc_keyboard_init(NO_AUX_DEVICE);
break;
}
@@ -44,18 +44,18 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87366_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87366_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87366_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8, },
- { NULL, PC87366_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { NULL, PC87366_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
- { NULL, PC87366_KBCM, PNP_IRQ0, },
- { NULL, PC87366_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
- { NULL, PC87366_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87366_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87366_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87366_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
+ { NULL, PC8XXXX_KBCM, PNP_IRQ0, },
+ { NULL, PC8XXXX_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87382/pc87382.h b/src/superio/nsc/pc87382/pc87382.h
deleted file mode 100644
index 6826f45..0000000
--- a/src/superio/nsc/pc87382/pc87382.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
- *
- * 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.
- */
-
-#ifndef SUPERIO_NSC_PC87382_H
-#define SUPERIO_NSC_PC87382_H
-
-#define PC87382_IR 0x02
-#define PC87382_SP1 0x03
-#define PC87382_GPIO 0x07
-#define PC87382_DOCK 0x19
-#endif
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 688f08c..6a21f51 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -19,7 +19,7 @@
#include <device/pnp.h>
#include <string.h>
#include <stdlib.h>
-#include "pc87382.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -27,10 +27,10 @@
return;
switch (dev->path.pnp.device) {
- case PC87382_DOCK:
+ case PC8XXXX_DOCK:
break;
- case PC87382_GPIO:
+ case PC8XXXX_GPIO:
break;
}
}
@@ -44,11 +44,11 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87382_IR, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8 },
- { NULL, PC87382_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
- { NULL, PC87382_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
- { NULL, PC87382_DOCK, PNP_IO0 | PNP_IRQ0, 0xfffe },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
+ { NULL, PC8XXXX_DOCK, PNP_IO0 | PNP_IRQ0, 0xfffe },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87384/pc87384.h b/src/superio/nsc/pc87384/pc87384.h
deleted file mode 100644
index 2184584..0000000
--- a/src/superio/nsc/pc87384/pc87384.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
- *
- * 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.
- */
-
-#ifndef SUPERIO_NSC_PC87384_H
-#define SUPERIO_NSC_PC87384_H
-
-#define PC87384_PP 0x01
-#define PC87384_SP2 0x02
-#define PC87384_SP1 0x03
-#define PC87384_GPIO 0x07
-
-#define PC87384_GPIO_PIN_OE 0x01
-#define PC87384_GPIO_PIN_TYPE_PUSH_PULL 0x02
-#define PC87384_GPIO_PIN_PULLUP 0x04
-#define PC87384_GPIO_PIN_LOCK 0x08
-#define PC87384_GPIO_PIN_TRIG_LEVEL 0x10
-#define PC87384_GPIO_PIN_TRIG_LOW 0x20
-#define PC87384_GPIO_PIN_DEBOUNCE 0x40
-
-#define PC87384_GPIO_PIN_TRIGGERS_IRQ 0x01
-
-#endif
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index f34acd5..9548d2c 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -19,7 +19,7 @@
#include <device/pnp.h>
#include <string.h>
#include <stdlib.h>
-#include "pc87384.h"
+#include <superio/nsc/common/superio_defs.h>
static struct device_operations ops = {
.read_resources = pnp_read_resources,
@@ -29,10 +29,10 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87384_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
- { NULL, PC87384_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
- { NULL, PC87384_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8 },
- { NULL, PC87384_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87392/pc87392.h b/src/superio/nsc/pc87392/pc87392.h
deleted file mode 100644
index 5832435..0000000
--- a/src/superio/nsc/pc87392/pc87392.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
- *
- * 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.
- */
-
-#ifndef SUPERIO_NSC_PC87392_H
-#define SUPERIO_NSC_PC87392_H
-
-#define PC87392_FDC 0x00
-#define PC87392_PP 0x01
-#define PC87392_SP2 0x02
-#define PC87392_SP1 0x03
-#define PC87392_GPIO 0x07
-#define PC87392_WDT 0x0A
-
-#define PC87392_GPIO_PIN_OE 0x01
-#define PC87392_GPIO_PIN_TYPE_PUSH_PULL 0x02
-#define PC87392_GPIO_PIN_PULLUP 0x04
-#define PC87392_GPIO_PIN_LOCK 0x08
-#define PC87392_GPIO_PIN_TRIG_LEVEL 0x10
-#define PC87392_GPIO_PIN_TRIG_LOW 0x20
-#define PC87392_GPIO_PIN_DEBOUNCE 0x40
-
-#define PC87392_GPIO_PIN_TRIGGERS_IRQ 0x01
-#define PC87392_GPIO_PIN_TRIGGERS_SMI 0x02
-
-#endif
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index edd4619..9971b5c 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -19,7 +19,7 @@
#include <device/pnp.h>
#include <string.h>
#include <stdlib.h>
-#include "pc87392.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -36,13 +36,13 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87392_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
- { NULL, PC87392_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
- { NULL, PC87392_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8 },
- { NULL, PC87392_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
- { NULL, PC87392_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8 },
- { NULL, PC87392_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8 },
+ { NULL, PC8XXXX_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h
index b50a920..e6c7f79 100644
--- a/src/superio/nsc/pc87417/pc87417.h
+++ b/src/superio/nsc/pc87417/pc87417.h
@@ -19,17 +19,6 @@
#ifndef SUPERIO_NSC_PC87417_H
#define SUPERIO_NSC_PC87417_H
-#define PC87417_FDC 0x00 /* Floppy */
-#define PC87417_PP 0x01 /* Parallel Port */
-#define PC87417_SP2 0x02 /* Com2 */
-#define PC87417_SP1 0x03 /* Com1 */
-#define PC87417_SWC 0x04 /* System Wake-Up Controller (SWC) */
-#define PC87417_KBCM 0x05 /* Mouse */
-#define PC87417_KBCK 0x06 /* Keyboard */
-#define PC87417_GPIO 0x07
-#define PC87417_XBUS 0x0F
-#define PC87417_RTC 0x10
-
#define PC87417_GPIO_DEV PNP_DEV(0x2e, PC87417_GPIO)
/* This is to get around a romcc bug */
/* #define PC87417_XBUS_DEV PNP_DEV(0x2e, PC87417_XBUS) */
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index f0e0bb1..a4e8022 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <pc80/keyboard.h>
#include <stdlib.h>
-#include "pc87417.h"
+#include <superio/nsc/common/superio_defs.h>
static void init(struct device *dev)
{
@@ -30,7 +30,7 @@
return;
switch (dev->path.pnp.device) {
- case PC87417_KBCK:
+ case PC8XXXX_KBCK:
pc_keyboard_init(NO_AUX_DEVICE);
break;
}
@@ -45,17 +45,17 @@
};
static struct pnp_info pnp_dev_info[] = {
- { NULL, PC87417_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87417_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
- { NULL, PC87417_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ { NULL, PC8XXXX_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
0x07f8, },
- { NULL, PC87417_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { NULL, PC87417_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
- { NULL, PC87417_KBCM, PNP_IRQ0, },
- { NULL, PC87417_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
- { NULL, PC87417_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
- { NULL, PC87417_XBUS, PNP_IO0 | PNP_IRQ0, 0xffe0, },
- { NULL, PC87417_RTC, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, },
+ { NULL, PC8XXXX_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, PC8XXXX_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
+ { NULL, PC8XXXX_KBCM, PNP_IRQ0, },
+ { NULL, PC8XXXX_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { NULL, PC8XXXX_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { NULL, PC8XXXX_XBUS, PNP_IO0 | PNP_IRQ0, 0xffe0, },
+ { NULL, PC8XXXX_RTC, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, },
};
static void enable_dev(struct device *dev)
To view, visit change 31427. To unsubscribe, or for help writing mail filters, visit settings.