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/w83667hg-a/superio.c | 43 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'src/superio/winbond/w83667hg-a/superio.c') diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c index 1a3be44941..ceb783dee0 100644 --- a/src/superio/winbond/w83667hg-a/superio.c +++ b/src/superio/winbond/w83667hg-a/superio.c @@ -95,27 +95,28 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, W83667HG_A_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, - { &ops, W83667HG_A_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, - { &ops, W83667HG_A_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, W83667HG_A_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, W83667HG_A_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x0fff, 0x0fff, }, - { &ops, W83667HG_A_SPI1, PNP_IO1, 0, 0x0ff8}, - { &ops, W83667HG_A_WDT1}, - { &ops, W83667HG_A_ACPI}, - { &ops, W83667HG_A_HWM_TSI, PNP_IO0 | PNP_IRQ0, 0x0ffe, }, - { &ops, W83667HG_A_PECI}, - { &ops, W83667HG_A_VID_BUSSEL}, - { &ops, W83667HG_A_GPIO_PP_OD}, - { &ops, W83667HG_A_GPIO1}, - { &ops, W83667HG_A_GPIO2}, - { &ops, W83667HG_A_GPIO3}, - { &ops, W83667HG_A_GPIO4}, - { &ops, W83667HG_A_GPIO5}, - { &ops, W83667HG_A_GPIO6}, - { &ops, W83667HG_A_GPIO7}, - { &ops, W83667HG_A_GPIO8}, - { &ops, W83667HG_A_GPIO9}, + { NULL, W83667HG_A_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, + { NULL, W83667HG_A_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, + { NULL, W83667HG_A_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, W83667HG_A_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, W83667HG_A_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x0fff, 0x0fff, }, + { NULL, W83667HG_A_SPI1, PNP_IO1, 0, 0x0ff8}, + { NULL, W83667HG_A_WDT1}, + { NULL, W83667HG_A_ACPI}, + { NULL, W83667HG_A_HWM_TSI, PNP_IO0 | PNP_IRQ0, 0x0ffe, }, + { NULL, W83667HG_A_PECI}, + { NULL, W83667HG_A_VID_BUSSEL}, + { NULL, W83667HG_A_GPIO_PP_OD}, + { NULL, W83667HG_A_GPIO1}, + { NULL, W83667HG_A_GPIO2}, + { NULL, W83667HG_A_GPIO3}, + { NULL, W83667HG_A_GPIO4}, + { NULL, W83667HG_A_GPIO5}, + { NULL, W83667HG_A_GPIO6}, + { NULL, W83667HG_A_GPIO7}, + { NULL, W83667HG_A_GPIO8}, + { NULL, W83667HG_A_GPIO9}, }; static void enable_dev(struct device *dev) -- cgit v1.2.3