From c40275bce0efb8b79792c7a6f846204b4c317124 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 27 Dec 2017 22:11:30 +0100 Subject: superio/ite: pass the chip-specific ops struct to pnp_enable_devices Pass the address of the chip-specific ops struct instead of the one of the generic pnp_ops struct to the PNP device enable function. This allows the removal of the LDN-specific ops overrides which is also done in this patch. Change-Id: I5f03a4064778c419f4b9c50e70db1296addf6c9e Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/23006 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/superio/ite/it8772f/superio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/superio/ite/it8772f/superio.c') diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 015db80cdd..ed46e73559 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -267,29 +267,28 @@ static struct device_operations ops = { static struct pnp_info pnp_dev_info[] = { /* Floppy Disk Controller */ - { &ops, IT8772F_FDC, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_FDC, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, /* Serial Port 1 */ - { &ops, IT8772F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, /* Environmental Controller */ - { &ops, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | + { NULL, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC4 | PNP_MSCA, 0x0ff8, 0x0ffc, }, /* KBC Keyboard */ - { &ops, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, + { NULL, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, /* KBC Mouse */ - { &ops, IT8772F_KBCM, PNP_IRQ0, }, + { NULL, IT8772F_KBCM, PNP_IRQ0, }, /* 27 GPIOs */ - { &ops, IT8772F_GPIO, PNP_IO0 | PNP_IO1, + { NULL, IT8772F_GPIO, PNP_IO0 | PNP_IO1, 0x0fff, 0x0ff8, }, /* Infrared */ - { &ops, IT8772F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, }; static void enable_dev(struct device *dev) { - pnp_enable_devices(dev, &pnp_ops, - ARRAY_SIZE(pnp_dev_info), pnp_dev_info); + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_ite_it8772f_ops = { -- cgit v1.2.3