Attention is currently required from: Damien Zammit, Angel Pons. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/62759 )
Change subject: hp/z220_cmt_workstation: Add variant of z220_sff_workstation ......................................................................
Patch Set 2:
(1 comment)
File src/mainboard/hp/z220_sff_workstation/variants/z220_cmt_workstation/gpio.c:
PS1:
There's a handful of gpios that are different, not many. […]
Angel, thank you for looking into this. Here you go:
``` $ diff -u src/mainboard/hp/z220_sff_workstation/variants/z220_sff_workstation/gpio.c src/mainboard/hp/z220_sff_workstation/variants/z220_cmt_workstation/gpio.c --- src/mainboard/hp/z220_sff_workstation/variants/z220_sff_workstation/gpio.c 2022-03-12 08:51:03.024153261 +0100 +++ src/mainboard/hp/z220_sff_workstation/variants/z220_cmt_workstation/gpio.c 2022-03-12 08:51:03.024153261 +0100 @@ -10,7 +10,7 @@ .gpio4 = GPIO_MODE_NATIVE, .gpio5 = GPIO_MODE_NATIVE, .gpio6 = GPIO_MODE_GPIO, - .gpio7 = GPIO_MODE_GPIO, + .gpio7 = GPIO_MODE_NATIVE, .gpio8 = GPIO_MODE_GPIO, .gpio9 = GPIO_MODE_NATIVE, .gpio10 = GPIO_MODE_NATIVE, @@ -41,7 +41,6 @@ .gpio0 = GPIO_DIR_INPUT, .gpio1 = GPIO_DIR_INPUT, .gpio6 = GPIO_DIR_INPUT, - .gpio7 = GPIO_DIR_INPUT, .gpio8 = GPIO_DIR_INPUT, .gpio13 = GPIO_DIR_INPUT, .gpio15 = GPIO_DIR_OUTPUT, @@ -63,20 +62,16 @@ .gpio29 = GPIO_LEVEL_HIGH, };
-static const struct pch_gpio_set1 pch_gpio_set1_reset = { +static const struct pch_gpio_set1 pch_gpio_set1_blink = { };
static const struct pch_gpio_set1 pch_gpio_set1_invert = { .gpio0 = GPIO_INVERT, .gpio1 = GPIO_INVERT, .gpio6 = GPIO_INVERT, - .gpio7 = GPIO_INVERT, .gpio13 = GPIO_INVERT, };
-static const struct pch_gpio_set1 pch_gpio_set1_blink = { -}; - static const struct pch_gpio_set2 pch_gpio_set2_mode = { .gpio32 = GPIO_MODE_GPIO, .gpio33 = GPIO_MODE_GPIO, @@ -92,7 +87,7 @@ .gpio43 = GPIO_MODE_GPIO, .gpio44 = GPIO_MODE_NATIVE, .gpio45 = GPIO_MODE_NATIVE, - .gpio46 = GPIO_MODE_GPIO, + .gpio46 = GPIO_MODE_NATIVE, .gpio47 = GPIO_MODE_NATIVE, .gpio48 = GPIO_MODE_GPIO, .gpio49 = GPIO_MODE_GPIO, @@ -113,7 +108,7 @@ };
static const struct pch_gpio_set2 pch_gpio_set2_direction = { - .gpio32 = GPIO_DIR_INPUT, + .gpio32 = GPIO_DIR_OUTPUT, .gpio33 = GPIO_DIR_INPUT, .gpio34 = GPIO_DIR_INPUT, .gpio35 = GPIO_DIR_INPUT, @@ -122,7 +117,6 @@ .gpio38 = GPIO_DIR_INPUT, .gpio39 = GPIO_DIR_INPUT, .gpio43 = GPIO_DIR_INPUT, - .gpio46 = GPIO_DIR_INPUT, .gpio48 = GPIO_DIR_INPUT, .gpio49 = GPIO_DIR_INPUT, .gpio54 = GPIO_DIR_INPUT, @@ -132,9 +126,7 @@ };
static const struct pch_gpio_set2 pch_gpio_set2_level = { -}; - -static const struct pch_gpio_set2 pch_gpio_set2_reset = { + .gpio32 = GPIO_LEVEL_LOW, };
static const struct pch_gpio_set3 pch_gpio_set3_mode = { @@ -164,9 +156,6 @@ .gpio71 = GPIO_LEVEL_LOW, };
-static const struct pch_gpio_set3 pch_gpio_set3_reset = { -}; - const struct pch_gpio_map mainboard_gpio_map = { .set1 = { .mode = &pch_gpio_set1_mode, @@ -174,18 +163,15 @@ .level = &pch_gpio_set1_level, .blink = &pch_gpio_set1_blink, .invert = &pch_gpio_set1_invert, - .reset = &pch_gpio_set1_reset, }, .set2 = { .mode = &pch_gpio_set2_mode, .direction = &pch_gpio_set2_direction, .level = &pch_gpio_set2_level, - .reset = &pch_gpio_set2_reset, }, .set3 = { .mode = &pch_gpio_set3_mode, .direction = &pch_gpio_set3_direction, .level = &pch_gpio_set3_level, - .reset = &pch_gpio_set3_reset, }, }; ```