aboutsummaryrefslogtreecommitdiff
path: root/src/superio/fintek/f71805f
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2010-11-05 00:07:13 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2010-11-05 00:07:13 +0000
commit7d3418849de907b82e3a5cca9969d261553f61a0 (patch)
tree3d3be4679f4e77d29f213a203f7150dc1586e92c /src/superio/fintek/f71805f
parente4870474b9026ad6b2ccabe59a8623e28722007f (diff)
Fintek and Intel i3100 Super I/O cleanups.
- Drop commented out "config chip.h" and a duplicate link to a datasheet. - F71805F -> F71805F/FG, to mention all variants. - Use u8/u16/ etc. everywhere. - Add a missing (C) line. - Fix up a bunch of pnp_dev_info[] structs according to the datasheets. - Fintek F71889: Drop res1/PNP_IO1 from KBC, there's no 0x62/0x63 register pair on this Super I/O. - Fintek F71863FG: This Super I/O _does_ have a keyboard/mouse LDN, add the respective code in superio.c. Also: Add missing LDNs to f71863fg.h. - i3100: Add some more comments and datasheet infos. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6020 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/fintek/f71805f')
-rw-r--r--src/superio/fintek/f71805f/Makefile.inc2
-rw-r--r--src/superio/fintek/f71805f/f71805f.h4
-rw-r--r--src/superio/fintek/f71805f/f71805f_early_serial.c8
-rw-r--r--src/superio/fintek/f71805f/superio.c4
4 files changed, 8 insertions, 10 deletions
diff --git a/src/superio/fintek/f71805f/Makefile.inc b/src/superio/fintek/f71805f/Makefile.inc
index a2f3b3e497..28075fd56e 100644
--- a/src/superio/fintek/f71805f/Makefile.inc
+++ b/src/superio/fintek/f71805f/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-#config chip.h
ramstage-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.c
+
diff --git a/src/superio/fintek/f71805f/f71805f.h b/src/superio/fintek/f71805f/f71805f.h
index 587746093e..00e284ebb5 100644
--- a/src/superio/fintek/f71805f/f71805f.h
+++ b/src/superio/fintek/f71805f/f71805f.h
@@ -30,7 +30,7 @@
#define F71805F_FDC 0x00 /* Floppy */
#define F71805F_SP1 0x01 /* UART1 */
#define F71805F_SP2 0x02 /* UART2 */
-#define F71805F_PP 0x03 /* Parallel Port */
-#define F71805F_HWM 0x04 /* Hardware Monitor */
+#define F71805F_PP 0x03 /* Parallel port */
+#define F71805F_HWM 0x04 /* Hardware monitor */
#define F71805F_GPIO 0x06 /* General Purpose I/O (GPIO) */
#define F71805F_PME 0x0a /* Power Management Events (PME) */
diff --git a/src/superio/fintek/f71805f/f71805f_early_serial.c b/src/superio/fintek/f71805f/f71805f_early_serial.c
index f81a3f17c0..de30cbb48b 100644
--- a/src/superio/fintek/f71805f/f71805f_early_serial.c
+++ b/src/superio/fintek/f71805f/f71805f_early_serial.c
@@ -23,19 +23,19 @@
#include <arch/romcc_io.h>
#include "f71805f.h"
-static inline void pnp_enter_conf_state(device_t dev)
+static void pnp_enter_conf_state(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0x87, port);
}
static void pnp_exit_conf_state(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0xaa, port);
}
-static void f71805f_enable_serial(device_t dev, unsigned int iobase)
+static void f71805f_enable_serial(device_t dev, u16 iobase)
{
pnp_enter_conf_state(dev);
pnp_set_logical_device(dev);
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index 6cf2f621ec..50801dda22 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* Datasheet: http://www.fintek.com.tw/files/productfiles/F71805F_V025.pdf */
-
#include <arch/io.h>
#include <device/device.h>
#include <device/pnp.h>
@@ -107,6 +105,6 @@ static void enable_dev(device_t dev)
}
struct chip_operations superio_fintek_f71805f_ops = {
- CHIP_NAME("Fintek F71805F Super I/O")
+ CHIP_NAME("Fintek F71805F/FG Super I/O")
.enable_dev = enable_dev
};