From e88dacfa433840339355b7a634cd63f3fd22c5f7 Mon Sep 17 00:00:00 2001 From: Michael Niewöhner Date: Mon, 23 Nov 2020 13:36:52 +0100 Subject: mb/supermicro/x11-lga1151-series: switch from dev.init to mb_ops.init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GPIO needs to be initialized before the IPMI device gets initialized, so the GPIOs can be read/set by the code in CB:48096 and CB:48094. Thus, use mainboard_ops.init for GPIO configuration instead of using the indirection via a mainboard_enable function. To make it more visible, that we use chip.init, rename `mainboard_init` to `mainboard_chip_init`. Tested successfully on X11SSM-F including the IPMI changes. Signed-off-by: Michael Niewöhner Change-Id: I192e69a34fa262b38bc40a95fb11c22a4041d0ae Reviewed-on: https://review.coreboot.org/c/coreboot/+/48083 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- .../supermicro/x11-lga1151-series/include/mainboard.h | 2 +- src/mainboard/supermicro/x11-lga1151-series/mainboard.c | 13 ++++--------- .../x11-lga1151-series/variants/x11ssm-f/mainboard.c | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h b/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h index c63b434597..cad75f4baf 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h +++ b/src/mainboard/supermicro/x11-lga1151-series/include/mainboard.h @@ -5,6 +5,6 @@ #include -void variant_mainboard_init(struct device *dev); +void variant_mainboard_init(void *chip_info); #endif /* _BASEBOARD_X11_LGA1151_SERIES_H */ diff --git a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c index 92718e8c0d..1377a874fe 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c +++ b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c @@ -5,24 +5,19 @@ #include #include -__weak void variant_mainboard_init(struct device *dev) +__weak void variant_mainboard_init(void *chip_info) { } -static void mainboard_init(struct device *dev) +static void mainboard_chip_init(void *chip_info) { /* do common init */ gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); /* do variant init */ - variant_mainboard_init(dev); -} - -static void mainboard_enable(struct device *dev) -{ - dev->ops->init = mainboard_init; + variant_mainboard_init(chip_info); } struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, + .init = mainboard_chip_init, }; diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c index 0b26e06aa4..75351eb6de 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c +++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssm-f/mainboard.c @@ -5,7 +5,7 @@ #include #include -void variant_mainboard_init(struct device *dev) +void variant_mainboard_init(void *chip_info) { // TODO: NMI; is this needed? vendor sets it pcr_write32(0xae, 0x01e4, 0x00000004); -- cgit v1.2.3