aboutsummaryrefslogtreecommitdiff
path: root/src/superio/nsc
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio/nsc')
-rw-r--r--src/superio/nsc/pc87309/superio.c10
-rw-r--r--src/superio/nsc/pc87360/superio.c20
-rw-r--r--src/superio/nsc/pc87366/superio.c20
-rw-r--r--src/superio/nsc/pc87382/superio.c8
-rw-r--r--src/superio/nsc/pc87384/superio.c8
-rw-r--r--src/superio/nsc/pc87392/superio.c12
-rw-r--r--src/superio/nsc/pc87417/superio.c18
-rw-r--r--src/superio/nsc/pc97317/superio.c16
8 files changed, 56 insertions, 56 deletions
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 361c4c59a2..ff362945b7 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -43,13 +43,13 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, },
- { &ops, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, },
- { &ops, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, },
- { &ops, PC87309_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+ { &ops, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
+ { &ops, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+ { &ops, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, },
+ { &ops, PC87309_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
/* TODO: PM. */
{ &ops, PC87309_KBCM, PNP_IRQ0, },
- { &ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x7f8, 4}, },
+ { &ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x7f8, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 8d91e79771..237023bb4b 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -45,17 +45,17 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87360_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, },
- { &ops, PC87360_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, },
- { &ops, PC87360_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, },
- { &ops, PC87360_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
- { &ops, PC87360_SWC, PNP_IO0 | PNP_IRQ0, {0xfff0, 0}, },
+ { &ops, PC87360_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
+ { &ops, PC87360_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+ { &ops, PC87360_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, },
+ { &ops, PC87360_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { &ops, PC87360_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
{ &ops, PC87360_KBCM, PNP_IRQ0, },
- { &ops, PC87360_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, },
- { &ops, PC87360_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87360_ACB, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87360_FSCM, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87360_WDT, PNP_IO0 | PNP_IRQ0, {0xfffc, 0}, },
+ { &ops, PC87360_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { &ops, PC87360_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87360_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87360_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87360_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index c02f53253f..8d5b291bfe 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -45,17 +45,17 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87366_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, },
- { &ops, PC87366_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, },
- { &ops, PC87366_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, },
- { &ops, PC87366_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
- { &ops, PC87366_SWC, PNP_IO0 | PNP_IRQ0, {0xfff0, 0}, },
+ { &ops, PC87366_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
+ { &ops, PC87366_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+ { &ops, PC87366_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, },
+ { &ops, PC87366_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { &ops, PC87366_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
{ &ops, PC87366_KBCM, PNP_IRQ0, },
- { &ops, PC87366_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, },
- { &ops, PC87366_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87366_ACB, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87366_FSCM, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87366_WDT, PNP_IO0 | PNP_IRQ0, {0xfffc, 0}, },
+ { &ops, PC87366_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { &ops, PC87366_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87366_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87366_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87366_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 377107efd5..7377c9e334 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -46,10 +46,10 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87382_IR, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x07f8, 0 } },
- { &ops, PC87382_SP1, PNP_IO0 | PNP_IRQ0, { 0x07f8, 0 } },
- { &ops, PC87382_GPIO, PNP_IO0 | PNP_IRQ0, { 0xfff0, 0 } },
- { &ops, PC87382_DOCK, PNP_IO0 | PNP_IRQ0, { 0xfffe, 0 } },
+ { &ops, PC87382_IR, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8 },
+ { &ops, PC87382_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { &ops, PC87382_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
+ { &ops, PC87382_DOCK, PNP_IO0 | PNP_IRQ0, 0xfffe },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index b9773a45ab..bd59a5b7a0 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -31,10 +31,10 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87384_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0} },
- { &ops, PC87384_SP1, PNP_IO0 | PNP_IRQ0, { 0x07f8, 0 } },
- { &ops, PC87384_SP2, PNP_IO0 | PNP_IRQ0, { 0x07f8, 0 } },
- { &ops, PC87384_GPIO, PNP_IO0 | PNP_IRQ0, { 0xfff0, 0 } },
+ { &ops, PC87384_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 },
+ { &ops, PC87384_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { &ops, PC87384_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { &ops, PC87384_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0 },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 6b425a5385..e75e0a41f2 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -37,12 +37,12 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87392_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0} },
- { &ops, PC87392_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0} },
- { &ops, PC87392_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0} },
- { &ops, PC87392_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0} },
- { &ops, PC87392_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0} },
- { &ops, PC87392_WDT, PNP_IO0 | PNP_IRQ0, {0xfffc, 0} },
+ { &ops, PC87392_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa },
+ { &ops, PC87392_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 },
+ { &ops, PC87392_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8 },
+ { &ops, PC87392_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 },
+ { &ops, PC87392_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8 },
+ { &ops, PC87392_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 7415025a66..6f9dfe8009 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -46,16 +46,16 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC87417_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, },
- { &ops, PC87417_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, },
- { &ops, PC87417_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, },
- { &ops, PC87417_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
- { &ops, PC87417_SWC, PNP_IO0 | PNP_IRQ0, {0xfff0, 0}, },
+ { &ops, PC87417_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, },
+ { &ops, PC87417_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, },
+ { &ops, PC87417_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, },
+ { &ops, PC87417_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { &ops, PC87417_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, },
{ &ops, PC87417_KBCM, PNP_IRQ0, },
- { &ops, PC87417_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, },
- { &ops, PC87417_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC87417_XBUS, PNP_IO0 | PNP_IRQ0, {0xffe0, 0}, },
- { &ops, PC87417_RTC, PNP_IO0 | PNP_IO1, {0xfffe, 0}, {0xfffe, 4}, },
+ { &ops, PC87417_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { &ops, PC87417_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC87417_XBUS, PNP_IO0 | PNP_IRQ0, 0xffe0, },
+ { &ops, PC87417_RTC, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 91a3c777f5..e007ef7f1c 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -49,15 +49,15 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0ffb, 0}, {0x0ffb, 4}, },
+ { &ops, PC97317_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ffb, 0x0ffb, },
{ &ops, PC97317_KBCM, PNP_IRQ0, },
- { &ops, PC97317_RTC, PNP_IO0 | PNP_IRQ0, {0xfffe, 0}, },
- { &ops, PC97317_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0xfffa, 0}, },
- { &ops, PC97317_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x03fc, 0}, },
- { &ops, PC97317_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0xfff8, 0}, },
- { &ops, PC97317_SP1, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
- { &ops, PC97317_GPIO, PNP_IO0, {0xfff8, 0}, },
- { &ops, PC97317_PM, PNP_IO0, {0xfffe, 0}, },
+ { &ops, PC97317_RTC, PNP_IO0 | PNP_IRQ0, 0xfffe, },
+ { &ops, PC97317_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0xfffa, },
+ { &ops, PC97317_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x03fc, },
+ { &ops, PC97317_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0xfff8, },
+ { &ops, PC97317_SP1, PNP_IO0 | PNP_IRQ0, 0xfff8, },
+ { &ops, PC97317_GPIO, PNP_IO0, 0xfff8, },
+ { &ops, PC97317_PM, PNP_IO0, 0xfffe, },
};
static void enable_dev(struct device *dev)