Change all occurences of NSC to nsc in the code. The next commit

[coreboot.git] / src / superio / NSC / pc97307 / superio.c

diff --git a/src/superio/NSC/pc97307/superio.c b/src/superio/NSC/pc97307/superio.c
index 1f7a3b1d98e324368e1268ea6a8c1490a9828f77..b2de76a4c113ee014bdfd388869ed6226c667234 100644 (file)
--- a/src/superio/NSC/pc97307/superio.c
+++ b/src/superio/NSC/pc97307/superio.c
@@ -2,36 +2,87 @@
 /* This code is distributed without warranty under the GPL v2 (see COPYING) */
 
 #include <arch/io.h>
-#include <device/chip.h>
+#include <console/console.h>
+#include <device/device.h>
+#include <device/pnp.h>
 #include "chip.h"
+#include "pc97307.h"
 
-void pnp_output(char address, char data)
+static void init(device_t dev)
 {
-       outb(address, PNP_INDEX_REG);
-       outb(data, PNP_DATA_REG);
-}
+       struct superio_nsc_pc97307_config *conf;
+       struct resource *res0, *res1;
 
-void sio_enable(struct chip *chip, enum chip_pass pass)
-{
+       if (!dev->enabled) {
+               return;
+       }
+       conf = dev->chip_info;
+       switch(dev->path.u.pnp.device) {
+       case PC97307_SP1:
+               res0 = find_resource(dev, PNP_IDX_IO0);
+               init_uart8250(res0->base, &conf->com1);
+               break;
 
-       struct superio_NSC_pc97307_config *conf = (struct superio_NSC_pc97307_config *)chip->chip_info;
+       case PC97307_SP2:
+               res0 = find_resource(dev, PNP_IDX_IO0);
+               init_uart8250(res0->base, &conf->com2);
+               break;
+
+       case PC97307_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 */
+
+               res0 = find_resource(dev, PNP_IDX_IO0);
+               res1 = find_resource(dev, PNP_IDX_IO1);
+               init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+               break;
 
-       switch (pass) {
-       case CONF_PASS_PRE_CONSOLE:
-               /* Enable Super IO Chip */
-               pnp_output(0x07, 6); /* LD 6 = UART1 */
-               pnp_output(0x30, 0); /* Dectivate */
-               pnp_output(0x60, conf->port >> 8); /* IO Base */
-               pnp_output(0x61, conf->port & 0xFF); /* IO Base */
-               pnp_output(0x30, 1); /* Activate */
+       case PC97307_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;
+       }
        default:
-               /* nothing yet */
                break;
        }
 }
 
-struct chip_control superio_NSC_pc97307_control = {
-       enable: sio_enable,
-       name:   "NSC 87307"
+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,
+};
+
+static struct pnp_info pnp_dev_info[] = {
+ { &ops, PC97307_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0xffb, 0 }, { 0xffb, 0x4}, },
+ { &ops, PC97307_KBCM, PNP_IRQ0 },
+ { &ops, PC97307_RTC,  PNP_IO0 | PNP_IRQ0, { 0xfffe, 0}, },
+ { &ops, PC97307_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0xfffa, 0}, },
+ { &ops, PC97307_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x03fc, 0}, },
+ { &ops, PC97307_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0xfff8, 0 }, },
+ { &ops, PC97307_SP1,  PNP_IO0 | PNP_IRQ0, { 0xfff8, 0 }, },
+ { &ops, PC97307_GPIO, PNP_IO0, { 0xfff8, 0 } },
+ { &ops, PC97307_PM,   PNP_IO0, { 0xfffe, 0 } },
+};
+
+static void enable_dev(struct device *dev)
+{
+       pnp_enable_devices(dev, &ops,
+               sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
+}
+
+struct chip_operations superio_nsc_pc97307_ops = {
+       CHIP_NAME("NSC 97307")
+       .enable_dev = enable_dev,
 };