From a2c49b02998a805e87acddbf11ccf2d4b311c8c2 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 Jul 2018 21:56:22 +0200 Subject: superio/via: 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: I14dbeda9832a25116cf53c36197615e9d02d5134 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/27391 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/superio/via/vt1211/superio.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/superio/via') diff --git a/src/superio/via/vt1211/superio.c b/src/superio/via/vt1211/superio.c index 28586baa22..3468b6398b 100644 --- a/src/superio/via/vt1211/superio.c +++ b/src/superio/via/vt1211/superio.c @@ -167,18 +167,18 @@ struct device_operations ops = { /* TODO: Check if 0x07f8 is correct for FDC/PP/SP1/SP2, the rest is correct. */ static struct pnp_info pnp_dev_info[] = { - { &ops, VT1211_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, VT1211_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, VT1211_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, VT1211_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, VT1211_MIDI, PNP_IO0 | PNP_IRQ0, 0xfffc, }, - { &ops, VT1211_GAME, PNP_IO0, 0xfff8, }, - { &ops, VT1211_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0, }, - { &ops, VT1211_WDG, PNP_IO0 | PNP_IRQ0, 0xfff0, }, - { &ops, VT1211_WUC, PNP_IO0 | PNP_IRQ0, 0xfff0, }, - { &ops, VT1211_HWM, PNP_IO0 | PNP_IRQ0, 0xff00, }, - { &ops, VT1211_FIR, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0xff00, }, - { &ops, VT1211_ROM, }, + { NULL, VT1211_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, VT1211_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, VT1211_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, VT1211_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, VT1211_MIDI, PNP_IO0 | PNP_IRQ0, 0xfffc, }, + { NULL, VT1211_GAME, PNP_IO0, 0xfff8, }, + { NULL, VT1211_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff0, }, + { NULL, VT1211_WDG, PNP_IO0 | PNP_IRQ0, 0xfff0, }, + { NULL, VT1211_WUC, PNP_IO0 | PNP_IRQ0, 0xfff0, }, + { NULL, VT1211_HWM, PNP_IO0 | PNP_IRQ0, 0xff00, }, + { NULL, VT1211_FIR, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0xff00, }, + { NULL, VT1211_ROM, }, }; static void enable_dev(struct device *dev) -- cgit v1.2.3