diff options
Diffstat (limited to 'src/superio/nsc/pc97317')
| -rw-r--r-- | src/superio/nsc/pc97317/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/nsc/pc97317/pc97317_early_serial.c | 16 | ||||
| -rw-r--r-- | src/superio/nsc/pc97317/superio.c | 52 |
3 files changed, 23 insertions, 47 deletions
diff --git a/src/superio/nsc/pc97317/Makefile.inc b/src/superio/nsc/pc97317/Makefile.inc index 6afa133075..129688d044 100644 --- a/src/superio/nsc/pc97317/Makefile.inc +++ b/src/superio/nsc/pc97317/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -#config chip.h ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.c + diff --git a/src/superio/nsc/pc97317/pc97317_early_serial.c b/src/superio/nsc/pc97317/pc97317_early_serial.c index 175d490f1b..00a92b3be6 100644 --- a/src/superio/nsc/pc97317/pc97317_early_serial.c +++ b/src/superio/nsc/pc97317/pc97317_early_serial.c @@ -24,28 +24,24 @@ #define PM_DEV PNP_DEV(0x2e, PC97317_PM) #define PM_BASE 0xe8 -/* The pc97317 needs clocks to be set up before the serial port will operate */ - -static void pc97317_enable_serial(device_t dev, unsigned iobase) +/* The PC97317 needs clocks to be set up before the serial port will operate. */ +static void pc97317_enable_serial(device_t dev, u16 iobase) { - /* Set base address of power management unit */ - + /* Set base address of power management unit. */ pnp_set_logical_device(PM_DEV); pnp_set_enable(dev, 0); pnp_set_iobase(dev, PNP_IDX_IO0, PM_BASE); pnp_set_enable(dev, 1); - /* Use on-chip clock multiplier */ - + /* Use on-chip clock multiplier. */ outb(0x03, PM_BASE); outb(inb(PM_BASE + 1) | 0x07, PM_BASE + 1); - /* Wait for the clock to stabilise */ + /* Wait for the clock to stabilise. */ while(!(inb(PM_BASE + 1) & 0x80)) ; - /* Set the base address of the port */ - + /* Set the base address of the port. */ pnp_set_logical_device(dev); pnp_set_enable(dev, 0); pnp_set_iobase(dev, PNP_IDX_IO0, iobase); diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c index 2dced41898..5d7824f117 100644 --- a/src/superio/nsc/pc97317/superio.c +++ b/src/superio/nsc/pc97317/superio.c @@ -28,47 +28,28 @@ static void init(device_t dev) { - struct superio_nsc_pc97317_config *conf; + struct superio_nsc_pc97317_config *conf = dev->chip_info; struct resource *res0; - if (!dev->enabled) { + if (!dev->enabled) return; - } - conf = dev->chip_info; + switch(dev->path.pnp.device) { case PC97317_SP1: res0 = find_resource(dev, PNP_IDX_IO0); init_uart8250(res0->base, &conf->com1); break; - case PC97317_SP2: res0 = find_resource(dev, PNP_IDX_IO0); init_uart8250(res0->base, &conf->com2); break; - case PC97317_KBCK: - /* Enable keyboard */ pnp_set_logical_device(dev); - pnp_set_enable(dev, 0); /* Disable keyboard */ - pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */ - pnp_set_enable(dev, 1); /* Enable keyboard */ - + pnp_set_enable(dev, 0); /* Disable keyboard */ + pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */ + pnp_set_enable(dev, 1); /* Enable keyboard */ pc_keyboard_init(&conf->keyboard); break; - -#if 0 - case PC97317_FDC: - { - unsigned reg; - /* Set up floppy in PS/2 mode */ - outb(0x09, SIO_CONFIG_RA); - reg = inb(SIO_CONFIG_RD); - reg = (reg & 0x3F) | 0x40; - outb(reg, SIO_CONFIG_RD); - outb(reg, SIO_CONFIG_RD); /* Have to write twice to change! */ - break; - } -#endif default: break; } @@ -83,21 +64,20 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0xffb, 0 }, { 0xffb, 0x4}, }, - { &ops, PC97317_KBCM, PNP_IRQ0 }, - { &ops, PC97317_RTC, PNP_IO0 | PNP_IRQ0, { 0xfffe, 0}, }, - { &ops, PC97317_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0xfffa, 0}, }, - { &ops, PC97317_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x03fc, 0}, }, - { &ops, PC97317_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0xfff8, 0 }, }, - { &ops, PC97317_SP1, PNP_IO0 | PNP_IRQ0, { 0xfff8, 0 }, }, - { &ops, PC97317_GPIO, PNP_IO0, { 0xfff8, 0 } }, - { &ops, PC97317_PM, PNP_IO0, { 0xfffe, 0 } }, + { &ops, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0ffb, 0}, {0x0ffb, 4}, }, + { &ops, PC97317_KBCM, PNP_IRQ0, }, + { &ops, PC97317_RTC, PNP_IO0 | PNP_IRQ0, {0xfffe, 0}, }, + { &ops, PC97317_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0xfffa, 0}, }, + { &ops, PC97317_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x03fc, 0}, }, + { &ops, PC97317_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0xfff8, 0}, }, + { &ops, PC97317_SP1, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, + { &ops, PC97317_GPIO, PNP_IO0, {0xfff8, 0}, }, + { &ops, PC97317_PM, PNP_IO0, {0xfffe, 0}, }, }; static void enable_dev(struct device *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_nsc_pc97317_ops = { |