summaryrefslogtreecommitdiff
path: root/src/superio/winbond/w83977tf
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio/winbond/w83977tf')
-rw-r--r--src/superio/winbond/w83977tf/Makefile.inc2
-rw-r--r--src/superio/winbond/w83977tf/chip.h2
-rw-r--r--src/superio/winbond/w83977tf/superio.c25
-rw-r--r--src/superio/winbond/w83977tf/w83977tf.h6
-rw-r--r--src/superio/winbond/w83977tf/w83977tf_early_serial.c10
5 files changed, 17 insertions, 28 deletions
diff --git a/src/superio/winbond/w83977tf/Makefile.inc b/src/superio/winbond/w83977tf/Makefile.inc
index 62a50fc698..91073cf2c8 100644
--- a/src/superio/winbond/w83977tf/Makefile.inc
+++ b/src/superio/winbond/w83977tf/Makefile.inc
@@ -20,5 +20,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-#config chip.h
ramstage-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.c
+
diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h
index 1af2f94d06..e50f00661f 100644
--- a/src/superio/winbond/w83977tf/chip.h
+++ b/src/superio/winbond/w83977tf/chip.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2000 AG Electronics Ltd.
* Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan By LYH change from PC87360
+ * 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
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 58ad008c96..3cfb1de543 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2000 AG Electronics Ltd.
* Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan By LYH change from PC87360
+ * 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
@@ -20,13 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* 2006-4-24
- * Adapted for the w83977 by rsmith <smithbone@gmail.com>
- * This is mostly just a search and replace on the part type
- * TODO: Actually see if all the sub functionis exist and are
- * setup correctly.
- */
-
#include <arch/io.h>
#include <device/device.h>
#include <device/pnp.h>
@@ -44,6 +37,7 @@ static void w83977tf_enter_ext_func_mode(device_t dev)
outb(0x87, dev->path.pnp.port);
outb(0x87, dev->path.pnp.port);
}
+
static void w83977tf_exit_ext_func_mode(device_t dev)
{
outb(0xaa, dev->path.pnp.port);
@@ -51,15 +45,12 @@ static void w83977tf_exit_ext_func_mode(device_t dev)
static void w83977tf_init(device_t dev)
{
- struct superio_winbond_w83977tf_config *conf;
+ struct superio_winbond_w83977tf_config *conf = dev->chip_info;
struct resource *res0, *res1;
- /* Wishlist handle well known programming interfaces more
- * generically.
- */
- if (!dev->enabled) {
+
+ if (!dev->enabled)
return;
- }
- conf = dev->chip_info;
+
switch(dev->path.pnp.device) {
case W83977TF_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
@@ -111,7 +102,6 @@ static struct pnp_info pnp_dev_info[] = {
{ &ops, W83977TF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
{ &ops, W83977TF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, W83977TF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
- /* No 4 { 0,}, */
{ &ops, W83977TF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
{ &ops, W83977TF_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, W83977TF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 4} },
@@ -120,8 +110,7 @@ static struct pnp_info pnp_dev_info[] = {
static void enable_dev(device_t dev)
{
- pnp_enable_devices(dev, &ops,
- ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+ pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
}
struct chip_operations superio_winbond_w83977tf_ops = {
diff --git a/src/superio/winbond/w83977tf/w83977tf.h b/src/superio/winbond/w83977tf/w83977tf.h
index 2e0e9232f0..8426c4accb 100644
--- a/src/superio/winbond/w83977tf/w83977tf.h
+++ b/src/superio/winbond/w83977tf/w83977tf.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2000 AG Electronics Ltd.
* Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan By LYH change from PC87360
+ * 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
@@ -24,10 +24,10 @@
#define SUPERIO_WINBOND_W83977TF_W83977TF_H
#define W83977TF_FDC 0 /* Floppy */
-#define W83977TF_PP 1 /* Parallel Port */
+#define W83977TF_PP 1 /* Parallel port */
#define W83977TF_SP1 2 /* Com1 */
#define W83977TF_SP2 3 /* Com2 */
-#define W83977TF_KBC 5 /* Keyboard & Mouse */
+#define W83977TF_KBC 5 /* PS/2 keyboard & mouse */
#define W83977TF_CIR 6
#define W83977TF_GAME_MIDI_GPIO1 7
#define W83977TF_GPIO2 8
diff --git a/src/superio/winbond/w83977tf/w83977tf_early_serial.c b/src/superio/winbond/w83977tf/w83977tf_early_serial.c
index dbc8dcbef1..fb4590b50a 100644
--- a/src/superio/winbond/w83977tf/w83977tf_early_serial.c
+++ b/src/superio/winbond/w83977tf/w83977tf_early_serial.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2000 AG Electronics Ltd.
* Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan By LYH change from PC87360
+ * 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
@@ -23,20 +23,20 @@
#include <arch/romcc_io.h>
#include "w83977tf.h"
-static inline void pnp_enter_ext_func_mode(device_t dev)
+static void pnp_enter_ext_func_mode(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0x87, port);
outb(0x87, port);
}
static void pnp_exit_ext_func_mode(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0xaa, port);
}
-static void w83977tf_enable_serial(device_t dev, unsigned int iobase)
+static void w83977tf_enable_serial(device_t dev, u16 iobase)
{
pnp_enter_ext_func_mode(dev);
pnp_set_logical_device(dev);