Patchwork support for two SMSC superios

login
register
about
Submitter Stefan Reinauer
Date 2010-05-14 19:24:29
Message ID <4BEDA36D.90102@coresystems.de>
Download mbox | patch
Permalink /patch/1335/
State Accepted
Headers show

Comments

Stefan Reinauer - 2010-05-14 19:24:29
See patch.
Uwe Hermann - 2010-05-14 20:20:33
On Fri, May 14, 2010 at 09:24:29PM +0200, Stefan Reinauer wrote:
> Index: superio/smsc/fdc37n972/fdc37n972.c
> ===================================================================
> --- superio/smsc/fdc37n972/fdc37n972.c	(revision 0)
> +++ superio/smsc/fdc37n972/fdc37n972.c	(revision 0)
> @@ -0,0 +1,74 @@
[...]
> +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);

Use ARRAY_SIZE here, please.


> Index: superio/smsc/sio10n268/sio10n268.c
> ===================================================================
> --- superio/smsc/sio10n268/sio10n268.c	(revision 0)
> +++ superio/smsc/sio10n268/sio10n268.c	(revision 0)
> @@ -0,0 +1,74 @@
[...]
> +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);

Ditto, ARRAY_SIZE please.


Other than that:
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


Uwe.

Patch

Index: superio/smsc/Kconfig
===================================================================
--- superio/smsc/Kconfig	(revision 5551)
+++ superio/smsc/Kconfig	(working copy)
@@ -1,5 +1,7 @@ 
 config SUPERIO_SMSC_FDC37M60X
 	bool
+config SUPERIO_SMSC_FDC37N972
+	bool
 config SUPERIO_SMSC_LPC47B272
 	bool
 config SUPERIO_SMSC_LPC47B397
@@ -12,5 +14,7 @@ 
 	bool
 config SUPERIO_SMSC_LPC47N227
 	bool
+config SUPERIO_SMSC_SIO10N268
+	bool
 config SUPERIO_SMSC_SMSCSUPERIO
 	bool
Index: superio/smsc/Makefile.inc
===================================================================
--- superio/smsc/Makefile.inc	(revision 5551)
+++ superio/smsc/Makefile.inc	(working copy)
@@ -1,8 +1,10 @@ 
 subdirs-y += fdc37m60x
+subdirs-y += fdc37n972
 subdirs-y += lpc47b272
 subdirs-y += lpc47b397
 subdirs-y += lpc47m10x
 subdirs-y += lpc47m15x
 subdirs-y += lpc47n217
 subdirs-y += lpc47n227
+subdirs-y += sio10n268
 subdirs-y += smscsuperio
Index: superio/smsc/fdc37n972/Makefile.inc
===================================================================
--- superio/smsc/fdc37n972/Makefile.inc	(revision 0)
+++ superio/smsc/fdc37n972/Makefile.inc	(revision 0)
@@ -0,0 +1,20 @@ 
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 coresystems GmbH
+##
+## 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
+##
+
+obj-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.o
Index: superio/smsc/fdc37n972/fdc37n972.c
===================================================================
--- superio/smsc/fdc37n972/fdc37n972.c	(revision 0)
+++ superio/smsc/fdc37n972/fdc37n972.c	(revision 0)
@@ -0,0 +1,74 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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 <device/device.h>
+#include <device/pnp.h>
+#include <uart8250.h>
+#include <pc80/keyboard.h>
+#include "chip.h"
+#include "fdc37n972.h"
+
+static void init(device_t dev)
+{
+	struct superio_smsc_fdc37n972_config *conf;
+
+	if (!dev->enabled) {
+		return;
+	}
+
+	conf = dev->chip_info;
+
+	switch (dev->path.pnp.device) {
+	case FDC37N972_FDC: /* TODO. */
+		break;
+	case FDC37N972_PP: /* TODO. */
+		break;
+	case FDC37N972_KBDC:
+		pc_keyboard_init(&conf->keyboard);
+		break;
+	// [..] The rest: TODO
+	}
+}
+
+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, FDC37N972_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, FDC37N972_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
+ { &ops, FDC37N972_KBDC, 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_smsc_fdc37n972_ops = {
+	CHIP_NAME("SMSC FDC37N972 Super I/O")
+	.enable_dev = enable_dev,
+};
+
Index: superio/smsc/fdc37n972/chip.h
===================================================================
--- superio/smsc/fdc37n972/chip.h	(revision 0)
+++ superio/smsc/fdc37n972/chip.h	(revision 0)
@@ -0,0 +1,36 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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_SMSC_FDC37N972
+#define _SUPERIO_SMSC_FDC37N972
+
+#include <device/device.h>
+#include <pc80/keyboard.h>
+#include <uart8250.h>
+
+extern struct chip_operations superio_smsc_fdc37n972_ops;
+
+struct superio_smsc_fdc37n972_config {
+	struct uart8250 com1, com2;
+	struct pc_keyboard keyboard;
+};
+
+#endif /* _SUPERIO_SMSC_FDC37N972 */
+
Index: superio/smsc/fdc37n972/fdc37n972.h
===================================================================
--- superio/smsc/fdc37n972/fdc37n972.h	(revision 0)
+++ superio/smsc/fdc37n972/fdc37n972.h	(revision 0)
@@ -0,0 +1,29 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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
+ */
+
+#define FDC37N972_FDC  0x00 /* Floppy */
+#define FDC37N972_PP   0x03 /* Parallel port */
+#define FDC37N972_SP1  0x04 /* Serial port 1 */
+#define FDC37N972_SP2  0x05 /* Serial port 2 */
+#define FDC37N972_RTC  0x06 /* Real Time Clock */
+#define FDC37N972_KBDC 0x07 /* Keyboard */
+#define FDC37N972_EC   0x08 /* Environmental Controller */
+#define FDC37N972_MBX  0x09 /* Mailbox register */
+
Index: superio/smsc/sio10n268/sio10n268.h
===================================================================
--- superio/smsc/sio10n268/sio10n268.h	(revision 0)
+++ superio/smsc/sio10n268/sio10n268.h	(revision 0)
@@ -0,0 +1,26 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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
+ */
+
+// XXX the SIO10N268 has no logical devices.
+
+#define SIO10N268_FDC  0x00 /* Floppy */
+#define SIO10N268_PP   0x03 /* Parallel port */
+#define SIO10N268_KBDC 0x05 /* Keyboard */
+
Index: superio/smsc/sio10n268/Makefile.inc
===================================================================
--- superio/smsc/sio10n268/Makefile.inc	(revision 0)
+++ superio/smsc/sio10n268/Makefile.inc	(revision 0)
@@ -0,0 +1,20 @@ 
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 coresystems GmbH
+##
+## 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
+##
+
+obj-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.o
Index: superio/smsc/sio10n268/chip.h
===================================================================
--- superio/smsc/sio10n268/chip.h	(revision 0)
+++ superio/smsc/sio10n268/chip.h	(revision 0)
@@ -0,0 +1,36 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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_SMSC_SIO10N268
+#define _SUPERIO_SMSC_SIO10N268
+
+#include <device/device.h>
+#include <pc80/keyboard.h>
+#include <uart8250.h>
+
+extern struct chip_operations superio_smsc_sio10n268_ops;
+
+struct superio_smsc_sio10n268_config {
+	struct uart8250 com1, com2;
+	struct pc_keyboard keyboard;
+};
+
+#endif /* _SUPERIO_SMSC_SIO10N268 */
+
Index: superio/smsc/sio10n268/sio10n268.c
===================================================================
--- superio/smsc/sio10n268/sio10n268.c	(revision 0)
+++ superio/smsc/sio10n268/sio10n268.c	(revision 0)
@@ -0,0 +1,74 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * 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 <device/device.h>
+#include <device/pnp.h>
+#include <uart8250.h>
+#include <pc80/keyboard.h>
+#include "chip.h"
+#include "sio10n268.h"
+
+static void init(device_t dev)
+{
+	struct superio_smsc_sio10n268_config *conf;
+
+	if (!dev->enabled) {
+		return;
+	}
+
+	conf = dev->chip_info;
+
+	switch (dev->path.pnp.device) {
+	case SIO10N268_FDC: /* TODO. */
+		break;
+	case SIO10N268_PP: /* TODO. */
+		break;
+	case SIO10N268_KBDC:
+		/* TODO: This is still hardcoded. */
+		pc_keyboard_init(&conf->keyboard);
+		break;
+	// [..] The rest: TODO
+	}
+}
+
+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, AUX. */
+static struct pnp_info pnp_dev_info[] = {
+ { &ops, SIO10N268_KBDC, PNP_IO0 | PNP_IO1, { 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_smsc_sio10n268_ops = {
+	CHIP_NAME("SMSC SIO10N268 Super I/O")
+	.enable_dev = enable_dev,
+};
+