summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2016-04-06 23:56:51 -0500
committerTimothy Pearson <tpearson@raptorengineeringinc.com>2016-04-08 18:36:14 +0200
commitbdd9df76379243bee5b5ba39f2f7034e31b8a762 (patch)
treed5de2b92bebea98d8cc084877d19c503370bfeca
parent0a4b47ee2d5fabec468aebbfbd0f27dc50ebf231 (diff)
downloadcoreboot-bdd9df76379243bee5b5ba39f2f7034e31b8a762.tar.xz
superio/winbond/w83667hg-a: Set SPI device mask correctly
This resolves error messages of the form: ERROR: device PNP: 002e.6 index 98 has no mask. Change-Id: I6a368b902d051c8da6f74cbde54f5d12a3e52c2f Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Reviewed-on: https://review.coreboot.org/14272 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r--src/superio/winbond/w83667hg-a/superio.c2
-rw-r--r--src/superio/winbond/w83667hg-a/w83667hg-a.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c
index 6cd54ef9fc..43b4674419 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -99,7 +99,7 @@ static struct pnp_info pnp_dev_info[] = {
{ &ops, W83667HG_A_SP1, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
{ &ops, W83667HG_A_SP2, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
{ &ops, W83667HG_A_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x0fff, 0}, {0x0fff, 4}, },
- { &ops, W83667HG_A_SPI, PNP_IO1, {0x0ff8, 0}},
+ { &ops, W83667HG_A_SPI1, PNP_IO1, {}, {0x0ff8, 0}},
{ &ops, W83667HG_A_WDT1},
{ &ops, W83667HG_A_ACPI},
{ &ops, W83667HG_A_HWM_TSI, PNP_IO0 | PNP_IRQ0, {0x0ffe, 0}, },
diff --git a/src/superio/winbond/w83667hg-a/w83667hg-a.h b/src/superio/winbond/w83667hg-a/w83667hg-a.h
index 2a8c5110b0..0c0d427d03 100644
--- a/src/superio/winbond/w83667hg-a/w83667hg-a.h
+++ b/src/superio/winbond/w83667hg-a/w83667hg-a.h
@@ -2,7 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2014 Felix Held <felix-coreboot@felixheld.de>
- * Copyright (C) 2015 Raptor Engineering
+ * Copyright (C) 2015 - 2016 Raptor Engineering, LLC
*
* 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
@@ -34,7 +34,8 @@
#define W83667HG_A_VID_BUSSEL 0x0D /* VID and BUSSEL */
#define W83667HG_A_GPIO_PP_OD 0x0F /* GPIO Push-Pull/Open drain select */
-/* virtual LDN for GPIO */
+/* Virtual LDN for GPIO and SPI */
+#define W83667HG_A_SPI1 ((1 << 8) | W83667HG_A_SPI)
#define W83667HG_A_GPIO1 ((1 << 8) | W83667HG_A_WDT1)
#define W83667HG_A_GPIO2 ((0 << 8) | W83667HG_A_GPIO2345_V)
#define W83667HG_A_GPIO3 ((1 << 8) | W83667HG_A_GPIO2345_V)