superio/smsc/kbc1100: Virtually rewrite support and fix mainboards

1. Remove #include .c in romstage.
2. Make romstage component symbols linker-time.
3. Provide header guards and prototypes in superio romstage support.
4. Correct function type-signatures to be static/non-static where
appropriate, avoid 'pretend optimisations' by unnecessarily inlining
functions.
5. Separate out UART enable from various other PNP hard coding

Change-Id: I9b8dad7c02d802e97db73ddf2913d5c6bb33a419
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5916
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

1 files changed, 79 insertions, 0 deletions

diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c
new file mode 100644
index 0000000000..d075f9c2f7
--- /dev/null
+++ b/src/superio/smsc/kbc1100/early_init.c
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 Advanced Micro Devices, Inc.
+ * Copyright (C) 2014 Edward O'Callaghan <eocallaghan@alterapraxis.com>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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
+ */
+
+/* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */
+
+#include <arch/io.h>
+#include <device/pnp.h>
+#include <stdint.h>
+
+#include "kbc1100.h"
+
+static void pnp_enter_conf_state(device_t dev)
+{
+	u16 port = dev >> 8;
+	outb(0x55, port);
+}
+
+static void pnp_exit_conf_state(device_t dev)
+{
+	u16 port = dev >> 8;
+	outb(0xaa, port);
+}
+
+void kbc1100_early_serial(device_t dev, u16 iobase)
+{
+	pnp_enter_conf_state(dev);
+	pnp_set_logical_device(dev);
+	pnp_set_enable(dev, 0);
+	pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
+	pnp_set_enable(dev, 1);
+	pnp_exit_conf_state(dev);
+}
+
+void kbc1100_early_init(u16 port)
+{
+  device_t dev;
+  dev = PNP_DEV (port, KBC1100_KBC);
+  pnp_enter_conf_state(dev);
+
+  /* Serial IRQ enabled */
+  outb(0x25, port);
+  outb(0x04, port + 1);
+
+  /* Enable keyboard */
+  pnp_set_logical_device(dev);
+  pnp_set_enable(dev, 0);
+  pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);
+  pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);
+  pnp_set_irq(dev, 0x70, 1);   /* IRQ 1 */
+  pnp_set_irq(dev, 0x72, 12);   /* IRQ 12 */
+  pnp_set_enable(dev, 1);
+
+  /* Enable EC Channel 0 */
+  dev = PNP_DEV (port, KBC1100_EC0);
+  pnp_set_logical_device(dev);
+  pnp_set_enable(dev, 1);
+
+  pnp_exit_conf_state(dev);
+
+  /* disable the 1s timer */
+  outb(0xE7, 0x64);
+}