merge latest code from Uwe Hermann

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2394 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2006-08-29 17:41:14 +00:00
parent abaf71a2d5
commit 61be08bd3e
8 changed files with 275 additions and 32 deletions

View File

@ -16,11 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* TODO: Find datasheet and check for correct values. */
#define IT8671F_FDC 0x00 /* Floppy */
/* #define IT8671F_PP 0x01 */ /* Parallel port */
#define IT8671F_SP1 0x01 /* Com1 */
#define IT8671F_SP2 0x02 /* Com2 */
#define IT8671F_SP1 0x03 /* Com1 */
#define IT8671F_KBCK 0x06 /* Keyboard */
/* #define IT8671F_FAN 0x09 */
#define IT8671F_PP 0x03 /* Parallel port */
#define IT8671F_KBCK 0x05 /* Keyboard */
#define IT8671F_KBCM 0x06 /* Mouse */

View File

@ -24,14 +24,14 @@
#define SIO_INDEX SIO_BASE
#define SIO_DATA SIO_BASE+1
/* TODO: These values are actually from the IT8673F datasheet; check if
they're also valid for the IT8671F. */
#define IT8671F_CONFIG_REG_CC 0x02 /* Configure Control. */
/* Global Configuration Registers. */
#define IT8671F_CONFIG_REG_CC 0x02 /* Configure Control (write-only). */
#define IT8671F_CONFIG_REG_LDN 0x07 /* Logical Device Number. */
#define IT8671F_CONFIG_REG_CLOCKSEL 0x23 /* Clock Selection. */
#define IT8671F_CONFIG_REG_LDE 0x23 /* PnP Logical Device Enable. */
#define IT8671F_CONFIG_REG_SWSUSP 0x24 /* Software Suspend. */
#define IT8671F_ADDRESS_PORT 0x279
#define IT8671F_CONFIGURATION_PORT 0x0279 /* Write-only. */
#define IT8671F_WRITE_DATA_PORT 0x0A79 /* 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. */
@ -42,7 +42,7 @@ static const uint8_t init_values[] = {
0xe8, 0x74, 0x3a, 0x9d, /**/ 0xce, 0xe7, 0x73, 0x39,
};
/* The content of IT8671F_CONFIG_REG_LDN (index 07h) must be set to the
/* The content of IT8671F_CONFIG_REG_LDN (index 0x07) must be set to the
* LDN the register belongs to, before you can access the register. */
static void it8671f_sio_write(uint8_t ldn, uint8_t index, uint8_t value)
{
@ -63,10 +63,10 @@ static void it8671f_enable_serial(device_t dev, unsigned iobase)
/* Base address 0x3f0: 0x86 0x80 0x55 0x55. */
/* Base address 0x3bd: 0x86 0x80 0x55 0xaa. */
/* Base address 0x370: 0x86 0x80 0xaa 0x55. */
outb(0x86, IT8671F_ADDRESS_PORT);
outb(0x80, IT8671F_ADDRESS_PORT);
outb(0x55, IT8671F_ADDRESS_PORT);
outb(0x55, IT8671F_ADDRESS_PORT);
outb(0x86, IT8671F_CONFIGURATION_PORT);
outb(0x80, IT8671F_CONFIGURATION_PORT);
outb(0x55, IT8671F_CONFIGURATION_PORT);
outb(0x55, IT8671F_CONFIGURATION_PORT);
/* Sequentially write the 32 special values. */
for (i = 0; i < 32; i++) {
@ -75,14 +75,20 @@ static void it8671f_enable_serial(device_t dev, unsigned iobase)
/* (2) Modify the data of configuration registers. */
/* Enable parallel port, serial port 1, serial port 2, floppy. */
it8671f_sio_write(0x00, 0x23, 0x0f);
/* Allow all devices to be enabled. Bits: FDC (0), Com1 (1), Com2 (2),
PP (3), Reserved (4), KBCK (5), KBCM (6), Reserved (7). */
it8671f_sio_write(0x00, IT8671F_CONFIG_REG_LDE, 0x6f);
/* Activate serial port 1 and 2. */
it8671f_sio_write(0x01, 0x30, 0x1);
it8671f_sio_write(0x02, 0x30, 0x1);
/* Activate all devices. */
it8671f_sio_write(IT8671F_FDC, 0x30, 0x01); /* Floppy */
it8671f_sio_write(IT8671F_SP1, 0x30, 0x01); /* Serial port 1 */
it8671f_sio_write(IT8671F_SP2, 0x30, 0x01); /* Serial port 2 */
it8671f_sio_write(IT8671F_PP, 0x30, 0x01); /* Parallel port */
it8671f_sio_write(IT8671F_KBCK, 0x30, 0x01); /* Keyboard */
it8671f_sio_write(IT8671F_KBCM, 0x30, 0x01); /* Mouse */
/* Select 24MHz CLKIN and clear software suspend mode. */
/* Select 24MHz CLKIN (clear bit 6) and clear software suspend
mode (clear bit 0). */
it8671f_sio_write(0x00, IT8671F_CONFIG_REG_SWSUSP, 0x00);
/* (3) Exit the configuration state (MB PnP mode). */

View File

@ -33,8 +33,7 @@ static void init(device_t dev)
conf = dev->chip_info;
switch (dev->path.u.pnp.device) {
case IT8671F_FDC:
/* TODO. */
case IT8671F_FDC: /* TODO. */
break;
case IT8671F_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
@ -44,11 +43,15 @@ static void init(device_t dev)
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com2);
break;
case IT8671F_PP: /* TODO. */
break;
case IT8671F_KBCK:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
break;
case IT8671F_KBCM: /* TODO. */
break;
}
}
@ -60,12 +63,10 @@ static struct device_operations ops = {
.init = init,
};
/* TODO: Find and check datasheet. */
/* TODO: FDC, PP, KBCM. */
static struct pnp_info pnp_dev_info[] = {
{ &ops, IT8671F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07fa, 0}, },
/* { &ops, IT8671F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x04f8, 0}, }, */
{ &ops, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
{ &ops, IT8671F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
{ &ops, IT8671F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, },
};

View File

@ -0,0 +1,2 @@
config chip.h
object superio.o

View File

@ -0,0 +1,33 @@
/*
* Copyright (C) 2006 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.
*
* 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_ITE_IT8718F
#define _SUPERIO_ITE_IT8718F
#include <pc80/keyboard.h>
#include <uart8250.h>
extern struct chip_operations superio_ITE_it8718f_ops;
struct superio_ITE_it8718f_config {
struct uart8250 com1, com2;
struct pc_keyboard keyboard;
};
#endif /* _SUPERIO_ITE_IT8718F */

View File

@ -0,0 +1,30 @@
/*
* Copyright (C) 2006 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.
*
* 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
*/
/* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8718_2.asp */
/* Status: untested on real hardware, but it compiles. */
#define IT8718F_FDC 0x00 /* Floppy */
#define IT8718F_SP1 0x01 /* Com1 */
#define IT8718F_SP2 0x02 /* Com2 */
#define IT8718F_PP 0x03 /* Parallel port */
#define IT8718F_EC 0x04 /* Environment controller */
#define IT8718F_KBCK 0x05 /* Keyboard */
#define IT8718F_KBCM 0x06 /* Mouse */
#define IT8718F_IR 0x0a /* Consumer IR */

View File

@ -0,0 +1,85 @@
/*
* Copyright (C) 2006 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.
*
* 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
*/
#include <arch/romcc_io.h>
#include "it8718f.h"
/* The base address is 0x2e or 0x4e, depending on config bytes. */
#define SIO_BASE 0x2e
#define SIO_INDEX SIO_BASE
#define SIO_DATA SIO_BASE+1
/* Global Configuration Registers. */
#define IT8718F_CONFIG_REG_CC 0x02 /* Configure Control (write-only). */
#define IT8718F_CONFIG_REG_LDN 0x07 /* Logical Device Number. */
#define IT8718F_CONFIG_REG_CONFIGSEL 0x22 /* Configuration Select. */
#define IT8718F_CONFIG_REG_CLOCKSEL 0x23 /* Clock Selection. */
#define IT8718F_CONFIG_REG_SWSUSP 0x24 /* Software Suspend, Flash I/F. */
#define IT8718F_CONFIGURATION_PORT 0x2e /* Write-only. */
/* The content of IT8718F_CONFIG_REG_LDN (index 0x07) must be set to the
* LDN the register belongs to, before you can access the register. */
static void it8718f_sio_write(uint8_t ldn, uint8_t index, uint8_t value)
{
outb(IT8718F_CONFIG_REG_LDN, SIO_BASE);
outb(ldn, SIO_DATA);
outb(index, SIO_BASE);
outb(value, SIO_DATA);
}
/* Enable the peripheral devices on the IT8718F Super IO chip. */
static void it8718f_enable_serial(device_t dev, unsigned iobase)
{
/* (1) Enter the configuration state (MB PnP mode). */
/* Perform MB PnP setup to put the SIO chip at 0x2e. */
/* Base address 0x2e: 0x87 0x01 0x55 0x55. */
/* Base address 0x4e: 0x87 0x01 0x55 0xaa. */
outb(0x87, IT8718F_CONFIGURATION_PORT);
outb(0x01, IT8718F_CONFIGURATION_PORT);
outb(0x55, IT8718F_CONFIGURATION_PORT);
outb(0x55, IT8718F_CONFIGURATION_PORT);
/* (2) Modify the data of configuration registers. */
/* Select the chip to configure (if there's more than one).
* Set bit 7 to select JP3=1, clear bit 7 to select JP3=0.
* If this register is not written, both chips are configured. */
/* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CONFIGSEL, 0x00); */
/* Enable all devices. */
it8718f_sio_write(IT8718F_FDC, 0x30, 0x1); /* Floppy */
it8718f_sio_write(IT8718F_SP1, 0x30, 0x1); /* Serial port 1 */
it8718f_sio_write(IT8718F_SP2, 0x30, 0x1); /* Serial port 2 */
it8718f_sio_write(IT8718F_PP, 0x30, 0x1); /* Parallel port */
it8718f_sio_write(IT8718F_EC, 0x30, 0x1); /* Environment controller */
it8718f_sio_write(IT8718F_KBCK, 0x30, 0x1); /* Keyboard */
it8718f_sio_write(IT8718F_KBCM, 0x30, 0x1); /* Mouse */
it8718f_sio_write(IT8718F_IR, 0x30, 0x1); /* Consumer IR */
/* Select 24MHz/48MHz CLKIN (set/clear bit 0). TODO: Needed? */
/* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CLOCKSEL, 0x00); */
/* Clear software suspend mode (clear bit 0). TODO: Needed? */
/* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_SWSUSP, 0x00); */
/* (3) Exit the configuration state (MB PnP mode). */
it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CC, 0x02);
}

View File

@ -0,0 +1,87 @@
/*
* Copyright (C) 2006 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.
*
* 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
*/
#include <uart8250.h>
#include <pc80/keyboard.h>
#include "chip.h"
#include "it8718f.h"
static void init(device_t dev)
{
struct superio_ITE_it8718f_config *conf;
struct resource *res0, *res1;
if (!dev->enabled) {
return;
}
conf = dev->chip_info;
switch (dev->path.u.pnp.device) {
case IT8718F_FDC: /* TODO. */
break;
case IT8718F_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
break;
case IT8718F_SP2:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com2);
break;
case IT8718F_PP: /* TODO. */
break;
case IT8718F_EC: /* TODO. */
break;
case IT8718F_KBCK:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
break;
case IT8718F_KBCM: /* TODO. */
break;
case IT8718F_IR: /* TODO. */
break;
}
}
static struct device_operations ops = {
.read_resources = pnp_read_resources,
.set_resources = pnp_set_resources,
.enable_resources = pnp_enable_resources,
.enable = pnp_enable,
.init = init,
};
/* TODO: FDC, PP, EC, KBCM, IR. */
static struct pnp_info pnp_dev_info[] = {
{ &ops, IT8718F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, IT8718F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
{ &ops, IT8718F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, },
};
static void enable_dev(struct device *dev)
{
pnp_enable_devices(dev, &pnp_ops,
sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
}
struct chip_operations superio_ITE_it8718f_ops = {
CHIP_NAME("ITE it8718f")
.enable_dev = enable_dev,
};