the following patch was just integrated into master:
commit 6fb379a1dbd60fcdd8ad30550b708ed1b9e3fa7d
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Sun Jun 1 17:38:22 2014 +1000
mainboard: Remove #include early_serial.c from w83977tf boards
These non-ROMCC boards #include the model specific w83977tf Super I/O
romstage component. The generic winbond_early_serial() function serves
well here to further tighten integration into the new Super I/O
framework and drop dependence on #include'ing .c files, leaving only
ROMCC boards.
Change-Id: Ib63c0f29f994c54e6112702506f288535799706c
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5898
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5898 for details.
-gerrit
the following patch was just integrated into master:
commit aef5594f7409636cfbe2c7ebb23da041e36cd7f6
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Sun Jun 1 20:30:28 2014 +1000
superio/ite/it8772f: Depreciate early wdt functions
We have better written generic implementations of these functions
introduced in commit:
a7d14a1 ite/common: Introduce common watchdog and 3.3V VSB helpers
Change-Id: Ic93d78fce18c68d1d1bf3b537e8985a2532a8fcf
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5901
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5901 for details.
-gerrit
the following patch was just integrated into master:
commit 1b3acb13e49753e53192d3e5b939713329d0d205
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Sun Jun 1 18:04:05 2014 +1000
superio/ite/it8772f: Move towards removing #include .c
Move samsung/stumpy board towards generic romstage component and away
from poorly written hard-coded model specific Super I/O component. This
is an incremental step towards getting obj-level abstraction between
board and Super I/O.
Change-Id: I358c5abef85c2ffa1b7178025cde8834a35b0a51
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5899
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5899 for details.
-gerrit
the following patch was just integrated into master:
commit d235da108b38ad45f20c3e556e630b10fb16634e
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Tue Jun 3 00:15:30 2014 +0200
northbridge/intel/i945/gma.c: Add and use defines for `GMADR` and `GTTADR`
Change-Id: I0f39b35fbf8e053ba21454a2847d6bb3ac5d2e1c
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/5923
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5923 for details.
-gerrit
the following patch was just integrated into master:
commit 50684638bea678d6aec94c1345b45684a627fded
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Tue Jun 3 00:26:03 2014 +0200
northbridge/intel/i945/i945.h: Move define `BSM` to section D2F0
The Base of Stolen Memory (BSM) register belongs to device 2,
function 0.
Change-Id: I2381f87ffaccb2f8034c160fc30c1d92f8b19402
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/5922
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5922 for details.
-gerrit
Felix Held (felix-coreboot(a)felixheld.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5450
-gerrit
commit 6aaf1a8eb7907fc756a34a78e67a38f4b8f1cf07
Author: Felix Held <felix-coreboot(a)felixheld.de>
Date: Mon Jun 2 22:01:54 2014 +0200
superio/nuvoton: Add support for Nuvoton NCT6776D
The NCT6776F is the same chip in a different package.
Change-Id: If6686ea0a1cd6be537e286699b4ee8f88ba8ad7c
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
---
src/superio/nuvoton/Kconfig | 4 ++
src/superio/nuvoton/Makefile.inc | 1 +
src/superio/nuvoton/nct6776d/Makefile.inc | 22 +++++++++
src/superio/nuvoton/nct6776d/nct6776d.h | 60 +++++++++++++++++++++++
src/superio/nuvoton/nct6776d/superio.c | 80 +++++++++++++++++++++++++++++++
5 files changed, 167 insertions(+)
diff --git a/src/superio/nuvoton/Kconfig b/src/superio/nuvoton/Kconfig
index 350c8dd..f644259 100644
--- a/src/superio/nuvoton/Kconfig
+++ b/src/superio/nuvoton/Kconfig
@@ -28,3 +28,7 @@ config SUPERIO_NUVOTON_WPCM450
config SUPERIO_NUVOTON_NCT5104D
bool
select SUPERIO_NUVOTON_COMMON_ROMSTAGE
+
+config SUPERIO_NUVOTON_NCT6776D
+ bool
+ select SUPERIO_NUVOTON_COMMON_ROMSTAGE
diff --git a/src/superio/nuvoton/Makefile.inc b/src/superio/nuvoton/Makefile.inc
index 1ce6963..ad7cac7 100644
--- a/src/superio/nuvoton/Makefile.inc
+++ b/src/superio/nuvoton/Makefile.inc
@@ -22,3 +22,4 @@ romstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_ROMSTAGE) += common/early_serial.c
subdirs-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += wpcm450
subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += nct5104d
+subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT6776D) += nct6776d
diff --git a/src/superio/nuvoton/nct6776d/Makefile.inc b/src/superio/nuvoton/nct6776d/Makefile.inc
new file mode 100755
index 0000000..aacfa31
--- /dev/null
+++ b/src/superio/nuvoton/nct6776d/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2011 - 2012 Advanced Micro Devices, Inc.
+## Copyright (C) 2014 Felix Held <felix-coreboot(a)felixheld.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
+##
+
+ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT6776D) += superio.c
diff --git a/src/superio/nuvoton/nct6776d/nct6776d.h b/src/superio/nuvoton/nct6776d/nct6776d.h
new file mode 100755
index 0000000..abd908e
--- /dev/null
+++ b/src/superio/nuvoton/nct6776d/nct6776d.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2014 Felix Held <felix-coreboot(a)felixheld.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
+ */
+
+#ifndef SUPERIO_NUVOTON_NCT6776D_H
+#define SUPERIO_NUVOTON_NCT6776D_H
+
+/* Logical Device Numbers (LDN). */
+#define NCT6776D_FDC 0x00 /* Floppy */
+#define NCT6776D_PP 0x01 /* Parallel port */
+#define NCT6776D_SP1 0x02 /* Com1 */
+#define NCT6776D_SP2 0x03 /* Com2 & IR */
+#define NCT6776D_KBC 0x05 /* PS/2 keyboard and mouse */
+#define NCT6776D_CIR 0x06
+#define NCT6776D_GPIO6789_V 0x07
+#define NCT6776D_WDT1_GPIO01A_V 0x08
+#define NCT6776D_GPIO1234567_V 0x09
+#define NCT6776D_ACPI 0x0A
+#define NCT6776D_HWM_FPLED 0x0B /* Hardware monitor & front LED */
+#define NCT6776D_VID 0x0D
+#define NCT6776D_CIRWKUP 0x0E /* CIR wakeup */
+#define NCT6776D_GPIO_PP_OD 0x0F /* GPIO Push-Pull/Open drain select */
+#define NCT6776D_SVID 0x14
+#define NCT6776D_DSLP 0x16 /* Deep sleep */
+#define NCT6776D_GPIOA_LDN 0x17
+
+/* virtual LDN for GPIO and WDT */
+#define NCT6776D_WDT1 ((0 << 8) | NCT6776D_WDT1_GPIO01A_V)
+
+#define NCT6776D_GPIOBASE ((0 << 8) | NCT6776D_WDT1_GPIO01A_V) //?
+
+#define NCT6776D_GPIO0 ((1 << 8) | NCT6776D_WDT1_GPIO01A_V)
+#define NCT6776D_GPIO1 ((1 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO2 ((2 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO3 ((3 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO4 ((4 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO5 ((5 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO6 ((6 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO7 ((7 << 8) | NCT6776D_GPIO1234567_V)
+#define NCT6776D_GPIO8 ((0 << 8) | NCT6776D_GPIO6789_V)
+#define NCT6776D_GPIO9 ((1 << 8) | NCT6776D_GPIO6789_V)
+#define NCT6776D_GPIOA ((2 << 8) | NCT6776D_WDT1_GPIO01A_V)
+
+#endif /* SUPERIO_NUVOTON_NCT6776D_H */
diff --git a/src/superio/nuvoton/nct6776d/superio.c b/src/superio/nuvoton/nct6776d/superio.c
new file mode 100755
index 0000000..0c840f9
--- /dev/null
+++ b/src/superio/nuvoton/nct6776d/superio.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 Advanced Micro Devices, Inc.
+ * Copyright (C) 2014 Felix Held <felix-coreboot(a)felixheld.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/pnp.h>
+#include <superio/conf_mode.h>
+#include <stdlib.h>
+#include "nct6776d.h"
+
+static void nct6776d_init(device_t dev)
+{
+}
+
+static struct device_operations ops = {
+ .read_resources = pnp_read_resources,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
+ .init = nct6776d_init,
+ .ops_pnp_mode = &pnp_conf_mode_8787_aa,
+};
+
+static struct pnp_info pnp_dev_info[] = {
+ //TODO: set field from struct io_info seems to be unused. why set this to 0 or 4?
+ { &ops, NCT6776D_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_SP1, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_SP2, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x0fff, 0}, {0x0fff, 4}, },
+ { &ops, NCT6776D_CIR, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_ACPI},
+ { &ops, NCT6776D_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0ffe, 0}, {0x0ffe, 4}, },
+ { &ops, NCT6776D_VID},
+ { &ops, NCT6776D_CIRWKUP, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_GPIO_PP_OD},
+ { &ops, NCT6776D_SVID},
+ { &ops, NCT6776D_DSLP},
+ { &ops, NCT6776D_GPIOA_LDN},
+ { &ops, NCT6776D_WDT1},
+ { &ops, NCT6776D_GPIOBASE, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+ { &ops, NCT6776D_GPIO0},
+ { &ops, NCT6776D_GPIO1},
+ { &ops, NCT6776D_GPIO2},
+ { &ops, NCT6776D_GPIO3},
+ { &ops, NCT6776D_GPIO4},
+ { &ops, NCT6776D_GPIO5},
+ { &ops, NCT6776D_GPIO6},
+ { &ops, NCT6776D_GPIO7},
+ { &ops, NCT6776D_GPIO8},
+ { &ops, NCT6776D_GPIO9},
+ { &ops, NCT6776D_GPIOA},
+};
+
+static void enable_dev(struct device *dev)
+{
+ pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+}
+
+struct chip_operations superio_nuvoton_nct6776d_ops = {
+ CHIP_NAME("NUVOTON NCT6776D Super I/O")
+ .enable_dev = enable_dev,
+};