[coreboot-gerrit] Change in ...coreboot[master]: superio/nsc: fix IO masks

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30954 )

Change subject: superio/nsc: fix IO masks
......................................................................

superio/nsc: fix IO masks

The IO mask shouldn't contain zeros inside the block of ones.

Change-Id: Icfebbf1d1d88ceef58800339bf899931fdc61ab7
Signed-off-by: Felix Held 
Reviewed-on: https://review.coreboot.org/c/30954
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
---
M src/superio/nsc/pc87309/superio.c
M src/superio/nsc/pc87360/superio.c
M src/superio/nsc/pc87366/superio.c
M src/superio/nsc/pc87384/superio.c
M src/superio/nsc/pc87392/superio.c
M src/superio/nsc/pc87417/superio.c
M src/superio/nsc/pc97317/superio.c
7 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index ba5d97a..458c501 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -43,8 +43,8 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87309_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
-	{ NULL, PC87309_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+	{ NULL, PC87309_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+	{ NULL, PC87309_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
    { NULL, PC87309_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0x07f8, },
    { NULL, PC87309_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8, },
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index a9eba4b..cf5c7ca 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -44,8 +44,8 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87360_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
-	{ NULL, PC87360_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+	{ NULL, PC87360_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+	{ NULL, PC87360_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
    { NULL, PC87360_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0x07f8, },
    { NULL, PC87360_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8, },
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index dbb763d..e1cba17 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -44,8 +44,8 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87366_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
-	{ NULL, PC87366_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+	{ NULL, PC87366_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+	{ NULL, PC87366_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
    { NULL, PC87366_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0x07f8, },
    { NULL, PC87366_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8, },
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index d2a518a..f34acd5 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -29,7 +29,7 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87384_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 },
+	{ NULL, PC87384_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
    { NULL, PC87384_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8 },
    { NULL, PC87384_SP2,  PNP_IO0 | PNP_IRQ0, 0x07f8 },
    { NULL, PC87384_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 0a46f4a..edd4619 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -36,8 +36,8 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87392_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa },
-	{ NULL, PC87392_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 },
+	{ NULL, PC87392_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
+	{ NULL, PC87392_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8 },
    { NULL, PC87392_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0x07f8 },
    { NULL, PC87392_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8 },
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index bf33d69..f0e0bb1 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -45,8 +45,8 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC87417_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
-	{ NULL, PC87417_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+	{ NULL, PC87417_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
+	{ NULL, PC87417_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, },
    { NULL, PC87417_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0x07f8, },
    { NULL, PC87417_SP1,  PNP_IO0 | PNP_IRQ0, 0x07f8, },
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 9b2cbac..a7e83ad 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -48,10 +48,10 @@
 };

static struct pnp_info pnp_dev_info[] = {
-	{ NULL, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ffb, 0x0ffb, },
+	{ NULL, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, },
    { NULL, PC97317_KBCM, PNP_IRQ0, },
    { NULL, PC97317_RTC,  PNP_IO0 | PNP_IRQ0, 0xfffe, },
-	{ NULL, PC97317_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0xfffa, },
+	{ NULL, PC97317_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0xfff8, },
    { NULL, PC97317_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x03fc, },
    { NULL, PC97317_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
    	0xfff8, },