From 8c85880236d57abf05fb2578a97a3e6dd52e7b7c Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 Jul 2018 20:22:08 +0200 Subject: superio/winbond: 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: I4311834f3970bd3471f2f5a73ca7da3c03936d37 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/27385 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Rudolph --- src/superio/winbond/w83627ehg/superio.c | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'src/superio/winbond/w83627ehg/superio.c') diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 9d1eb3d512..db1f98efc1 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -122,24 +122,25 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, W83627EHG_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, W83627EHG_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, W83627EHG_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83627EHG_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83627EHG_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops, W83627EHG_SFI, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83627EHG_WDTO_PLED, }, - { &ops, W83627EHG_ACPI, PNP_IRQ0, }, - { &ops, W83627EHG_HWM, PNP_IO0 | PNP_IRQ0, 0x07fe, }, - - { &ops, W83627EHG_GAME, PNP_IO0, 0x07ff, }, - { &ops, W83627EHG_MIDI, PNP_IO1 | PNP_IRQ0, 0, 0x07fe, }, - { &ops, W83627EHG_GPIO1, }, - { &ops, W83627EHG_GPIO2, }, - { &ops, W83627EHG_GPIO3, }, - { &ops, W83627EHG_GPIO4, }, - { &ops, W83627EHG_GPIO5, }, - { &ops, W83627EHG_GPIO6, }, + { NULL, W83627EHG_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, W83627EHG_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, W83627EHG_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83627EHG_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83627EHG_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL, W83627EHG_SFI, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83627EHG_WDTO_PLED, }, + { NULL, W83627EHG_ACPI, PNP_IRQ0, }, + { NULL, W83627EHG_HWM, PNP_IO0 | PNP_IRQ0, 0x07fe, }, + + { NULL, W83627EHG_GAME, PNP_IO0, 0x07ff, }, + { NULL, W83627EHG_MIDI, PNP_IO1 | PNP_IRQ0, 0, 0x07fe, }, + { NULL, W83627EHG_GPIO1, }, + { NULL, W83627EHG_GPIO2, }, + { NULL, W83627EHG_GPIO3, }, + { NULL, W83627EHG_GPIO4, }, + { NULL, W83627EHG_GPIO5, }, + { NULL, W83627EHG_GPIO6, }, }; static void enable_dev(struct device *dev) -- cgit v1.2.3