Author: uwe
Date: 2007-03-31 21:45:24 +0200 (Sat, 31 Mar 2007)
New Revision: 2574
Added:
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/Config.lb
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/chip.h
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309.h
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309_early_serial.c
trunk/LinuxBIOSv2/src/superio/nsc/pc87309/superio.c
Log:
Add support for the NSC PC87309 Super I/O.
Pre-RAM serial output on COM1 and COM2 has been tested. The rest is not
yet tested on real hardware.
Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan(a)coresystems.de>
Added: trunk/LinuxBIOSv2/src/superio/nsc/pc87309/Config.lb
===================================================================
--- trunk/LinuxBIOSv2/src/superio/nsc/pc87309/Config.lb (rev 0)
+++ trunk/LinuxBIOSv2/src/superio/nsc/pc87309/Config.lb 2007-03-31 19:45:24 UTC (rev 2574)
@@ -0,0 +1,23 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 Uwe Hermann <uwe(a)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
+##
+
+config chip.h
+object superio.o
+
Added: trunk/LinuxBIOSv2/src/superio/nsc/pc87309/chip.h
===================================================================
--- trunk/LinuxBIOSv2/src/superio/nsc/pc87309/chip.h (rev 0)
+++ trunk/LinuxBIOSv2/src/superio/nsc/pc87309/chip.h 2007-03-31 19:45:24 UTC (rev 2574)
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe(a)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 <pc80/keyboard.h>
+#include <uart8250.h>
+
+extern struct chip_operations superio_nsc_pc87309_ops;
+
+struct superio_nsc_pc87309_config {
+ struct uart8250 com1, com2;
+ struct pc_keyboard keyboard;
+};
Added: trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309.h
===================================================================
--- trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309.h (rev 0)
+++ trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309.h 2007-03-31 19:45:24 UTC (rev 2574)
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe(a)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: PC87309 SuperI/O Plug and Play Compatible Chip. */
+/* Status: Pre-RAM serial output is tested and works. The rest is untested. */
+
+#define PC87309_FDC 0x00 /* Floppy */
+#define PC87309_PP 0x01 /* Parallel port */
+#define PC87309_SP2 0x02 /* Com2 / IR */
+#define PC87309_SP1 0x03 /* Com1 */
+#define PC87309_PM 0x04 /* Power management */
+#define PC87309_KBCM 0x05 /* Mouse */
+#define PC87309_KBCK 0x06 /* Keyboard */
Added: trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309_early_serial.c
===================================================================
--- trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309_early_serial.c (rev 0)
+++ trunk/LinuxBIOSv2/src/superio/nsc/pc87309/pc87309_early_serial.c 2007-03-31 19:45:24 UTC (rev 2574)
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe(a)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 "pc87309.h"
+
+static void pc87309_enable_serial(device_t dev, unsigned int iobase)
+{
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 0);
+ pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
+ pnp_set_enable(dev, 1);
+}
Added: trunk/LinuxBIOSv2/src/superio/nsc/pc87309/superio.c
===================================================================
--- trunk/LinuxBIOSv2/src/superio/nsc/pc87309/superio.c (rev 0)
+++ trunk/LinuxBIOSv2/src/superio/nsc/pc87309/superio.c 2007-03-31 19:45:24 UTC (rev 2574)
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe(a)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/io.h>
+#include <device/device.h>
+#include <device/pnp.h>
+#include <uart8250.h>
+#include <pc80/keyboard.h>
+#include "chip.h"
+#include "pc87309.h"
+
+static void init(device_t dev)
+{
+ struct superio_nsc_pc87309_config *conf;
+ struct resource *res0, *res1;
+
+ if (!dev->enabled) {
+ return;
+ }
+ conf = dev->chip_info;
+ switch (dev->path.u.pnp.device) {
+ case PC87309_SP1:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ init_uart8250(res0->base, &conf->com1);
+ break;
+ case PC87309_SP2:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ init_uart8250(res0->base, &conf->com2);
+ break;
+ case PC87309_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;
+ }
+}
+
+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, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0},},
+ {&ops, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0},},
+ {&ops, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x7f8, 0},},
+ {&ops, PC87309_SP1, PNP_IO0 | PNP_IRQ0, {0x7f8, 0},},
+ // TODO: PM.
+ {&ops, PC87309_KBCM, PNP_IRQ0},
+ {&ops, PC87309_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_nsc_pc87309_ops = {
+ CHIP_NAME("NSC PC87309 Super I/O")
+ .enable_dev = enable_dev,
+};