diff options
Diffstat (limited to 'src/superio/ite/it8673f')
| -rw-r--r-- | src/superio/ite/it8673f/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/ite/it8673f/chip.h | 6 | ||||
| -rw-r--r-- | src/superio/ite/it8673f/it8673f.h | 5 | ||||
| -rw-r--r-- | src/superio/ite/it8673f/it8673f_early_serial.c | 27 | ||||
| -rw-r--r-- | src/superio/ite/it8673f/superio.c | 7 |
5 files changed, 21 insertions, 26 deletions
diff --git a/src/superio/ite/it8673f/Makefile.inc b/src/superio/ite/it8673f/Makefile.inc index 97bacd0061..13033a05a5 100644 --- a/src/superio/ite/it8673f/Makefile.inc +++ b/src/superio/ite/it8673f/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -#config chip.h ramstage-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.c + diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h index 6967059317..bfb6d72b37 100644 --- a/src/superio/ite/it8673f/chip.h +++ b/src/superio/ite/it8673f/chip.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_ITE_IT8673F -#define _SUPERIO_ITE_IT8673F +#ifndef SUPERIO_ITE_IT8673F_CHIP_H +#define SUPERIO_ITE_IT8673F_CHIP_H #include <device/device.h> #include <pc80/keyboard.h> @@ -32,4 +32,4 @@ struct superio_ite_it8673f_config { struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_ITE_IT8673F */ +#endif diff --git a/src/superio/ite/it8673f/it8673f.h b/src/superio/ite/it8673f/it8673f.h index 6734c0e259..f3b407ce5b 100644 --- a/src/superio/ite/it8673f/it8673f.h +++ b/src/superio/ite/it8673f/it8673f.h @@ -19,12 +19,11 @@ */ /* Datasheet: http://www.datasheet4u.com/html/I/T/8/IT8673F_ITE.pdf.html */ -/* Status: Untested on real hardware, but it compiles. */ #define IT8673F_FDC 0x00 /* Floppy */ #define IT8673F_SP1 0x01 /* Com1 */ #define IT8673F_SP2 0x02 /* Com2 */ #define IT8673F_PP 0x03 /* Parallel port */ #define IT8673F_FAN 0x04 /* Fan controller */ -#define IT8673F_KBCK 0x05 /* Keyboard */ -#define IT8673F_KBCM 0x06 /* Mouse */ +#define IT8673F_KBCK 0x05 /* PS/2 keyboard */ +#define IT8673F_KBCM 0x06 /* PS/2 mouse */ diff --git a/src/superio/ite/it8673f/it8673f_early_serial.c b/src/superio/ite/it8673f/it8673f_early_serial.c index 9edbfb9adc..37d4c74f1d 100644 --- a/src/superio/ite/it8673f/it8673f_early_serial.c +++ b/src/superio/ite/it8673f/it8673f_early_serial.c @@ -24,7 +24,7 @@ /* The base address is 0x3f0, 0x3bd, or 0x370, depending on config bytes. */ #define SIO_BASE 0x3f0 #define SIO_INDEX SIO_BASE -#define SIO_DATA SIO_BASE+1 +#define SIO_DATA (SIO_BASE + 1) /* Global configuration registers. */ #define IT8673F_CONFIG_REG_CC 0x02 /* Configure Control (write-only). */ @@ -34,18 +34,18 @@ #define IT8673F_CONFIGURATION_PORT 0x0279 /* Write-only. */ -/* Special values used for entering MB PnP mode. The first four bytes of - each line determine the address port, the last four are data. */ -static const uint8_t init_values[] = { +/* + * Special values used for entering MB PnP mode. The first four bytes of + * each line determine the address port, the last four are data. + */ +static const u8 init_values[] = { 0x6a, 0xb5, 0xda, 0xed, /**/ 0xf6, 0xfb, 0x7d, 0xbe, 0xdf, 0x6f, 0x37, 0x1b, /**/ 0x0d, 0x86, 0xc3, 0x61, 0xb0, 0x58, 0x2c, 0x16, /**/ 0x8b, 0x45, 0xa2, 0xd1, 0xe8, 0x74, 0x3a, 0x9d, /**/ 0xce, 0xe7, 0x73, 0x39, }; -/* The content of IT8673F_CONFIG_REG_LDN (index 0x07) must be set to the - LDN the register belongs to, before you can access the register. */ -static void it8673f_sio_write(uint8_t ldn, uint8_t index, uint8_t value) +static void it8673f_sio_write(u8 ldn, u8 index, u8 value) { outb(IT8673F_CONFIG_REG_LDN, SIO_BASE); outb(ldn, SIO_DATA); @@ -53,10 +53,10 @@ static void it8673f_sio_write(uint8_t ldn, uint8_t index, uint8_t value) outb(value, SIO_DATA); } -/* Enable the peripheral devices on the IT8673F Super I/O chip. */ -static void it8673f_enable_serial(device_t dev, unsigned iobase) +/* Enable the serial port(s). */ +static void it8673f_enable_serial(device_t dev, u16 iobase) { - uint8_t i; + int i; /* (1) Enter the configuration state (MB PnP mode). */ @@ -70,15 +70,14 @@ static void it8673f_enable_serial(device_t dev, unsigned iobase) outb(0x55, IT8673F_CONFIGURATION_PORT); /* Sequentially write the 32 special values. */ - for (i = 0; i < 32; i++) { + for (i = 0; i < 32; i++) outb(init_values[i], SIO_BASE); - } /* (2) Modify the data of configuration registers. */ /* Enable all devices. */ - it8673f_sio_write(IT8673F_SP1, 0x30, 0x1); /* Serial port 1 */ - it8673f_sio_write(IT8673F_SP2, 0x30, 0x1); /* Serial port 2 */ + it8673f_sio_write(IT8673F_SP1, 0x30, 0x1); /* Serial port 1 */ + it8673f_sio_write(IT8673F_SP2, 0x30, 0x1); /* Serial port 2 */ /* Select 24MHz CLKIN (clear bit 0). */ it8673f_sio_write(0x00, IT8673F_CONFIG_REG_CLOCKSEL, 0x00); diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c index 4b986ded7e..e1d2f50a0f 100644 --- a/src/superio/ite/it8673f/superio.c +++ b/src/superio/ite/it8673f/superio.c @@ -28,14 +28,11 @@ static void init(device_t dev) { - struct superio_ite_it8673f_config *conf; + struct superio_ite_it8673f_config *conf = dev->chip_info; struct resource *res0, *res1; - if (!dev->enabled) { + if (!dev->enabled) return; - } - - conf = dev->chip_info; switch (dev->path.pnp.device) { case IT8673F_FDC: /* TODO. */ |