diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2017-12-27 22:51:29 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-07-18 18:52:12 +0000 |
| commit | faca0bc2fa5a347a98fc3ee8dd1a5dd9c9763459 (patch) | |
| tree | 7b67854003b7d50ed6b8f2829ebc222f00c22192 /src/superio/nsc/pc87417 | |
| parent | b0d868e8fe3f9a13f9be109fc3b73dfa949bec15 (diff) | |
superio/nsc: 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: I0c820254e97e3f80470d148552af06940e147b74
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/23008
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/superio/nsc/pc87417')
| -rw-r--r-- | src/superio/nsc/pc87417/superio.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 6f9dfe8009..73b7655712 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -46,22 +46,22 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, PC87417_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, }, - { &ops, PC87417_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, }, - { &ops, PC87417_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, - { &ops, PC87417_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, PC87417_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, }, - { &ops, PC87417_KBCM, PNP_IRQ0, }, - { &ops, PC87417_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, - { &ops, PC87417_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, }, - { &ops, PC87417_XBUS, PNP_IO0 | PNP_IRQ0, 0xffe0, }, - { &ops, PC87417_RTC, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, }, + { NULL, PC87417_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, }, + { NULL, PC87417_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, }, + { NULL, PC87417_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, + 0x07f8, }, + { NULL, PC87417_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, PC87417_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, }, + { NULL, PC87417_KBCM, PNP_IRQ0, }, + { NULL, PC87417_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, PC87417_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, }, + { NULL, PC87417_XBUS, PNP_IO0 | PNP_IRQ0, 0xffe0, }, + { NULL, PC87417_RTC, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, }, }; 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_nsc_pc87417_ops = { |