summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2018-07-06 20:55:53 +0200
committerFelix Held <felix-coreboot@felixheld.de>2018-07-18 11:40:20 +0000
commit9911d64b9edb8c055b37b0635e97b4c585aa4ae1 (patch)
treed823093f50b3945e11deba929f543a616113e57e /src
parentad417c9c7b20529d20a72c81b225c29953439acc (diff)
downloadcoreboot-9911d64b9edb8c055b37b0635e97b4c585aa4ae1.tar.xz
superio/nuvoton: remove LDN-specific ops overrides
The pnp ops struct is already passed to the pnp_enable_devices function and it is used if no override is supplied in the elements of the pnp_info struct array Change-Id: I18345d7cc50a7d46cb15584dfb54df28e8534f81 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/27386 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src')
-rw-r--r--src/superio/nuvoton/nct5104d/superio.c22
-rw-r--r--src/superio/nuvoton/nct5572d/superio.c44
-rw-r--r--src/superio/nuvoton/nct6776/superio.c54
-rw-r--r--src/superio/nuvoton/nct6779d/superio.c46
-rw-r--r--src/superio/nuvoton/nct6791d/superio.c60
-rw-r--r--src/superio/nuvoton/npcd378/superio.c26
-rw-r--r--src/superio/nuvoton/wpcm450/superio.c7
7 files changed, 132 insertions, 127 deletions
diff --git a/src/superio/nuvoton/nct5104d/superio.c b/src/superio/nuvoton/nct5104d/superio.c
index 76e1ffc1b3..47687e1122 100644
--- a/src/superio/nuvoton/nct5104d/superio.c
+++ b/src/superio/nuvoton/nct5104d/superio.c
@@ -147,17 +147,17 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NCT5104D_FDC, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, NCT5104D_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, NCT5104D_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, NCT5104D_SP3, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, NCT5104D_SP4, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, NCT5104D_GPIO_WDT},
- { &ops, NCT5104D_GPIO_PP_OD},
- { &ops, NCT5104D_GPIO0},
- { &ops, NCT5104D_GPIO1},
- { &ops, NCT5104D_GPIO6},
- { &ops, NCT5104D_PORT80},
+ { NULL, NCT5104D_FDC, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, NCT5104D_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, NCT5104D_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, NCT5104D_SP3, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, NCT5104D_SP4, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, NCT5104D_GPIO_WDT},
+ { NULL, NCT5104D_GPIO_PP_OD},
+ { NULL, NCT5104D_GPIO0},
+ { NULL, NCT5104D_GPIO1},
+ { NULL, NCT5104D_GPIO6},
+ { NULL, NCT5104D_PORT80},
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index 12b1c78e3a..10542d5591 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -95,27 +95,29 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NCT5572D_FDC}, /* no pins, removed from datasheet */
- { &ops, NCT5572D_PP}, /* no pins, removed from datasheet */
- { &ops, NCT5572D_SP1, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
- { &ops, NCT5572D_IR, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
- { &ops, NCT5572D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x0FFF, 0x0FFF, },
- { &ops, NCT5572D_CIR, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
- { &ops, NCT5572D_WDT1},
- { &ops, NCT5572D_ACPI},
- { &ops, NCT5572D_HWM_TSI_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0FFE, 0x0FFE, },
- { &ops, NCT5572D_PECI},
- { &ops, NCT5572D_SUSLED},
- { &ops, NCT5572D_CIRWKUP, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
- { &ops, NCT5572D_GPIO_PP_OD},
- { &ops, NCT5572D_GPIO2},
- { &ops, NCT5572D_GPIO3},
- { &ops, NCT5572D_GPIO4}, /* no pins, removed from datasheet */
- { &ops, NCT5572D_GPIO5},
- { &ops, NCT5572D_GPIO6},
- { &ops, NCT5572D_GPIO7}, /* no pins, removed from datasheet */
- { &ops, NCT5572D_GPIO8},
- { &ops, NCT5572D_GPIO9},
+ { NULL, NCT5572D_FDC}, /* no pins, removed from datasheet */
+ { NULL, NCT5572D_PP}, /* no pins, removed from datasheet */
+ { NULL, NCT5572D_SP1, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
+ { NULL, NCT5572D_IR, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
+ { NULL, NCT5572D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
+ 0x0FFF, 0x0FFF, },
+ { NULL, NCT5572D_CIR, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
+ { NULL, NCT5572D_WDT1},
+ { NULL, NCT5572D_ACPI},
+ { NULL, NCT5572D_HWM_TSI_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
+ 0x0FFE, 0x0FFE, },
+ { NULL, NCT5572D_PECI},
+ { NULL, NCT5572D_SUSLED},
+ { NULL, NCT5572D_CIRWKUP, PNP_IO0 | PNP_IRQ0, 0x0FF8, },
+ { NULL, NCT5572D_GPIO_PP_OD},
+ { NULL, NCT5572D_GPIO2},
+ { NULL, NCT5572D_GPIO3},
+ { NULL, NCT5572D_GPIO4}, /* no pins, removed from datasheet */
+ { NULL, NCT5572D_GPIO5},
+ { NULL, NCT5572D_GPIO6},
+ { NULL, NCT5572D_GPIO7}, /* no pins, removed from datasheet */
+ { NULL, NCT5572D_GPIO8},
+ { NULL, NCT5572D_GPIO9},
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nuvoton/nct6776/superio.c b/src/superio/nuvoton/nct6776/superio.c
index 1512d568fb..033f64666d 100644
--- a/src/superio/nuvoton/nct6776/superio.c
+++ b/src/superio/nuvoton/nct6776/superio.c
@@ -50,42 +50,42 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NCT6776_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
+ { NULL, NCT6776_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
0x0ff8, },
- { &ops, NCT6776_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
+ { NULL, NCT6776_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
0x0ff8, },
- { &ops, NCT6776_SP1, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6776_SP1, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6776_SP2, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6776_SP2, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6776_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
+ { NULL, NCT6776_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
0x0fff, 0x0fff, },
- { &ops, NCT6776_CIR, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6776_CIR, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6776_ACPI},
- { &ops, NCT6776_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
+ { NULL, NCT6776_ACPI},
+ { NULL, NCT6776_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
0x0ffe, 0x0ffe, },
- { &ops, NCT6776_VID},
- { &ops, NCT6776_CIRWKUP, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6776_VID},
+ { NULL, NCT6776_CIRWKUP, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6776_GPIO_PP_OD},
- { &ops, NCT6776_SVID},
- { &ops, NCT6776_DSLP},
- { &ops, NCT6776_GPIOA_LDN},
- { &ops, NCT6776_WDT1},
- { &ops, NCT6776_GPIOBASE, PNP_IO0,
+ { NULL, NCT6776_GPIO_PP_OD},
+ { NULL, NCT6776_SVID},
+ { NULL, NCT6776_DSLP},
+ { NULL, NCT6776_GPIOA_LDN},
+ { NULL, NCT6776_WDT1},
+ { NULL, NCT6776_GPIOBASE, PNP_IO0,
0x0ff8, },
- { &ops, NCT6776_GPIO0},
- { &ops, NCT6776_GPIO1},
- { &ops, NCT6776_GPIO2},
- { &ops, NCT6776_GPIO3},
- { &ops, NCT6776_GPIO4},
- { &ops, NCT6776_GPIO5},
- { &ops, NCT6776_GPIO6},
- { &ops, NCT6776_GPIO7},
- { &ops, NCT6776_GPIO8},
- { &ops, NCT6776_GPIO9},
- { &ops, NCT6776_GPIOA},
+ { NULL, NCT6776_GPIO0},
+ { NULL, NCT6776_GPIO1},
+ { NULL, NCT6776_GPIO2},
+ { NULL, NCT6776_GPIO3},
+ { NULL, NCT6776_GPIO4},
+ { NULL, NCT6776_GPIO5},
+ { NULL, NCT6776_GPIO6},
+ { NULL, NCT6776_GPIO7},
+ { NULL, NCT6776_GPIO8},
+ { NULL, NCT6776_GPIO9},
+ { NULL, NCT6776_GPIOA},
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nuvoton/nct6779d/superio.c b/src/superio/nuvoton/nct6779d/superio.c
index 887ce7ca3b..465ef6636a 100644
--- a/src/superio/nuvoton/nct6779d/superio.c
+++ b/src/superio/nuvoton/nct6779d/superio.c
@@ -50,28 +50,30 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NCT6779D_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, },
- { &ops, NCT6779D_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
- { &ops, NCT6779D_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
- { &ops, NCT6779D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x0fff, 0x0fff, },
- { &ops, NCT6779D_CIR, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
- { &ops, NCT6779D_ACPI},
- { &ops, NCT6779D_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ffe, 0x0ffe, },
- { &ops, NCT6779D_WDT1},
- { &ops, NCT6779D_CIRWKUP, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
- { &ops, NCT6779D_GPIO_PP_OD},
- { &ops, NCT6779D_PRT80},
- { &ops, NCT6779D_DSLP},
- { &ops, NCT6779D_GPIOBASE, PNP_IO0, 0x0ff8, },
- { &ops, NCT6779D_GPIO0},
- { &ops, NCT6779D_GPIO1},
- { &ops, NCT6779D_GPIO2},
- { &ops, NCT6779D_GPIO3},
- { &ops, NCT6779D_GPIO4},
- { &ops, NCT6779D_GPIO5},
- { &ops, NCT6779D_GPIO6},
- { &ops, NCT6779D_GPIO7},
- { &ops, NCT6779D_GPIO8},
+ { NULL, NCT6779D_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, },
+ { NULL, NCT6779D_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
+ { NULL, NCT6779D_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
+ { NULL, NCT6779D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
+ 0x0fff, 0x0fff, },
+ { NULL, NCT6779D_CIR, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
+ { NULL, NCT6779D_ACPI},
+ { NULL, NCT6779D_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
+ 0x0ffe, 0x0ffe, },
+ { NULL, NCT6779D_WDT1},
+ { NULL, NCT6779D_CIRWKUP, PNP_IO0 | PNP_IRQ0, 0x0ff8, },
+ { NULL, NCT6779D_GPIO_PP_OD},
+ { NULL, NCT6779D_PRT80},
+ { NULL, NCT6779D_DSLP},
+ { NULL, NCT6779D_GPIOBASE, PNP_IO0, 0x0ff8, },
+ { NULL, NCT6779D_GPIO0},
+ { NULL, NCT6779D_GPIO1},
+ { NULL, NCT6779D_GPIO2},
+ { NULL, NCT6779D_GPIO3},
+ { NULL, NCT6779D_GPIO4},
+ { NULL, NCT6779D_GPIO5},
+ { NULL, NCT6779D_GPIO6},
+ { NULL, NCT6779D_GPIO7},
+ { NULL, NCT6779D_GPIO8},
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index f66689eb56..c2d5f2e39a 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -50,44 +50,44 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NCT6791D_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
+ { NULL, NCT6791D_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0,
0x0ff8, },
- { &ops, NCT6791D_SP1, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6791D_SP1, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6791D_SP2, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6791D_SP2, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6791D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
+ { NULL, NCT6791D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1,
0x0fff, 0x0fff, },
- { &ops, NCT6791D_CIR, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6791D_CIR, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6791D_ACPI},
- { &ops, NCT6791D_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
+ { NULL, NCT6791D_ACPI},
+ { NULL, NCT6791D_HWM_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
0x0ffe, 0x0ffe, },
- { &ops, NCT6791D_BCLK_WDT2_WDTMEM},
- { &ops, NCT6791D_CIRWUP, PNP_IO0 | PNP_IRQ0,
+ { NULL, NCT6791D_BCLK_WDT2_WDTMEM},
+ { NULL, NCT6791D_CIRWUP, PNP_IO0 | PNP_IRQ0,
0x0ff8, },
- { &ops, NCT6791D_GPIO_PP_OD},
- { &ops, NCT6791D_PORT80},
- { &ops, NCT6791D_WDT1},
- { &ops, NCT6791D_WDTMEM},
- { &ops, NCT6791D_GPIOBASE, PNP_IO0,
+ { NULL, NCT6791D_GPIO_PP_OD},
+ { NULL, NCT6791D_PORT80},
+ { NULL, NCT6791D_WDT1},
+ { NULL, NCT6791D_WDTMEM},
+ { NULL, NCT6791D_GPIOBASE, PNP_IO0,
0x0ff8, },
- { &ops, NCT6791D_GPIO0},
- { &ops, NCT6791D_GPIO1},
- { &ops, NCT6791D_GPIO2},
- { &ops, NCT6791D_GPIO3},
- { &ops, NCT6791D_GPIO4},
- { &ops, NCT6791D_GPIO5},
- { &ops, NCT6791D_GPIO6},
- { &ops, NCT6791D_GPIO7},
- { &ops, NCT6791D_GPIO8},
- { &ops, NCT6791D_DS5},
- { &ops, NCT6791D_DS3},
- { &ops, NCT6791D_PCHDSW},
- { &ops, NCT6791D_DSWWOPT},
- { &ops, NCT6791D_DS3OPT},
- { &ops, NCT6791D_DSDSS},
- { &ops, NCT6791D_DSPU},
+ { NULL, NCT6791D_GPIO0},
+ { NULL, NCT6791D_GPIO1},
+ { NULL, NCT6791D_GPIO2},
+ { NULL, NCT6791D_GPIO3},
+ { NULL, NCT6791D_GPIO4},
+ { NULL, NCT6791D_GPIO5},
+ { NULL, NCT6791D_GPIO6},
+ { NULL, NCT6791D_GPIO7},
+ { NULL, NCT6791D_GPIO8},
+ { NULL, NCT6791D_DS5},
+ { NULL, NCT6791D_DS3},
+ { NULL, NCT6791D_PCHDSW},
+ { NULL, NCT6791D_DSWWOPT},
+ { NULL, NCT6791D_DS3OPT},
+ { NULL, NCT6791D_DSDSS},
+ { NULL, NCT6791D_DSPU},
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 013225de32..408429c08c 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -111,30 +111,30 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, NPCD378_FDC, PNP_IO0|PNP_IRQ0|PNP_DRQ0, 0x0ff8, },
- { &ops, NPCD378_PP, PNP_IO0|PNP_IRQ0|PNP_DRQ0, 0x0ff8, },
- { &ops, NPCD378_SP1, PNP_IO0|PNP_IRQ0, 0x0ff8, },
- { &ops, NPCD378_SP2, PNP_IO0|PNP_IRQ0, 0x0ff8, },
- { &ops, NPCD378_PWR, PNP_IO0|PNP_IO1|PNP_IRQ0|PNP_MSC0|
+ { NULL, NPCD378_FDC, PNP_IO0|PNP_IRQ0|PNP_DRQ0, 0x0ff8, },
+ { NULL, NPCD378_PP, PNP_IO0|PNP_IRQ0|PNP_DRQ0, 0x0ff8, },
+ { NULL, NPCD378_SP1, PNP_IO0|PNP_IRQ0, 0x0ff8, },
+ { NULL, NPCD378_SP2, PNP_IO0|PNP_IRQ0, 0x0ff8, },
+ { NULL, NPCD378_PWR, PNP_IO0|PNP_IO1|PNP_IRQ0|PNP_MSC0|
PNP_MSC1|PNP_MSC2|PNP_MSC3|PNP_MSC4|PNP_MSC5|PNP_MSC6|PNP_MSC7|
PNP_MSC8|PNP_MSC9|PNP_MSCA|PNP_MSCB|PNP_MSCC|PNP_MSCD|PNP_MSCE,
0x0ff8, 0x0ff8},
- { &ops, NPCD378_AUX, PNP_IRQ0, 0x0fff, 0x0fff, },
- { &ops, NPCD378_KBC, PNP_IO0|PNP_IO1|PNP_IRQ0,
+ { NULL, NPCD378_AUX, PNP_IRQ0, 0x0fff, 0x0fff, },
+ { NULL, NPCD378_KBC, PNP_IO0|PNP_IO1|PNP_IRQ0,
0x0fff, 0x0fff, },
- { &ops, NPCD378_WDT1, PNP_IO0|PNP_MSC8|PNP_MSC9|
+ { NULL, NPCD378_WDT1, PNP_IO0|PNP_MSC8|PNP_MSC9|
PNP_MSCA|PNP_MSCB|PNP_MSCC|PNP_MSCD|PNP_MSCE, 0x0ff8},
- { &ops, NPCD378_HWM, PNP_IO0|PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
+ { NULL, NPCD378_HWM, PNP_IO0|PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
PNP_MSC4|PNP_MSC5|PNP_MSC6|PNP_MSC7|PNP_IRQ0, 0x0ff8},
- { &ops, NPCD378_GPIO_PP_OD, PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
+ { NULL, NPCD378_GPIO_PP_OD, PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
PNP_MSC4|PNP_MSC5|PNP_MSC6|PNP_MSC7|PNP_MSC8|PNP_MSC9|PNP_MSCA|
PNP_MSCB|PNP_MSCC|PNP_MSCD|PNP_MSCE},
- { &ops, NPCD378_I2C, PNP_IO0|PNP_IO1|PNP_IRQ0|PNP_MSC0|
+ { NULL, NPCD378_I2C, PNP_IO0|PNP_IO1|PNP_IRQ0|PNP_MSC0|
PNP_MSC1|PNP_MSC2|PNP_MSC3|PNP_MSC4|PNP_MSC5|PNP_MSC6|PNP_MSC7|
PNP_MSC8|PNP_MSC9|PNP_MSCA|PNP_MSCB|PNP_MSCC|PNP_MSCD|PNP_MSCE,
0x0ff8, 0x0ff8},
- { &ops, NPCD378_SUSPEND, PNP_IO0, 0x0ff8 },
- { &ops, NPCD378_GPIOA, PNP_IO0|PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
+ { NULL, NPCD378_SUSPEND, PNP_IO0, 0x0ff8 },
+ { NULL, NPCD378_GPIOA, PNP_IO0|PNP_MSC0|PNP_MSC1|PNP_MSC2|PNP_MSC3|
PNP_MSC4, 0x0ff8},
};
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 0a42d137cc..05078ebd96 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -45,9 +45,10 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, WPCM450_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, },
- { &ops, WPCM450_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
- { &ops, WPCM450_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
+ { NULL, WPCM450_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1,
+ 0x07f8, },
+ { NULL, WPCM450_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, },
+ { NULL, WPCM450_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, },
};
static void enable_dev(struct device *dev)