Philip Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32292
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
mb/google/hatch: Pull up GPP_C13
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/1
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c index 0391dfe..ce9953f 100644 --- a/src/mainboard/google/hatch/variants/baseboard/gpio.c +++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c @@ -147,7 +147,7 @@ * TODO Configure it back to invert mode, when * ITSS IPCx configuration is fixed in FSP. */ - PAD_CFG_GPI_APIC(GPP_C13, NONE, DEEP, LEVEL, NONE), + PAD_CFG_GPI_APIC(GPP_C13, 20K_PU, DEEP, LEVEL, NONE), /* C14 : BT_DISABLE_L */ PAD_CFG_GPO(GPP_C14, 1, DEEP), /* C15 : WWAN_DPR_SAR_ODL @@ -429,7 +429,7 @@ PAD_CFG_GPO(GPP_A18, 0, DEEP), /* EN_PP3300_WWAN */ };
-const struct pad_config * __weak +const struct pad_config *__weak variant_sleep_gpio_table(u8 slp_typ, size_t *num) { if (slp_typ == ACPI_S5) {
Philip Chen has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
mb/google/hatch: Pull up GPP_C13
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/2
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32292
to look at the new patch set (#3).
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
mb/google/hatch: Pull up GPP_C13
On EC end, we want to change this pin from push-pull to open-drain. And since there is no external pull-up resistor on the board, we'll have to configure this pin as internal-pull-up on AP end.
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/3
Shelley Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/32292/3/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/baseboard/gpio.c:
https://review.coreboot.org/#/c/32292/3/src/mainboard/google/hatch/variants/... PS3, Line 150: 20K_PU UP_20K ?
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32292
to look at the new patch set (#4).
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
mb/google/hatch: Pull up GPP_C13
On EC end, we want to change this pin from push-pull to open-drain. And since there is no external pull-up resistor on the board, we'll have to configure this pin as internal-pull-up on AP end.
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/4
Philip Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/#/c/32292/3/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/baseboard/gpio.c:
https://review.coreboot.org/#/c/32292/3/src/mainboard/google/hatch/variants/... PS3, Line 150: 20K_PU
UP_20K ?
yeah, I just found the error and fixed it
Philip Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Patch Set 4:
Ping, can we merge this change?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Patch Set 4: Code-Review+2
Furquan Shaikh has removed a vote on this change.
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Removed Code-Review+2 by Furquan Shaikh furquan@google.com
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/#/c/32292/4/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/baseboard/gpio.c:
https://review.coreboot.org/#/c/32292/4/src/mainboard/google/hatch/variants/... PS4, Line 150: UP_20K Actually can you add the pull-up to override table in hatch and hatch_whl. I don't think any of the other variants will need this.
Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32292
to look at the new patch set (#5).
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl
On EC end, we want to change this pin from push-pull to open-drain. And since there is no external pull-up resistor on the board, we'll have to configure this pin as internal-pull-up on AP end.
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c A src/mainboard/google/hatch/variants/hatch/gpio.c A src/mainboard/google/hatch/variants/hatch_whl/gpio.c 3 files changed, 65 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/5
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
Patch Set 5:
gpio.c files need to be added to Makefile.inc in respective folders.
Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32292
to look at the new patch set (#6).
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl
On EC end, we want to change this pin from push-pull to open-drain. And since there is no external pull-up resistor on the board, we'll have to configure this pin as internal-pull-up on AP end.
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c M src/mainboard/google/hatch/variants/hatch/Makefile.inc A src/mainboard/google/hatch/variants/hatch/gpio.c M src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc A src/mainboard/google/hatch/variants/hatch_whl/gpio.c 5 files changed, 69 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32292/6
Philip Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
Patch Set 6:
(1 comment)
Patch Set 5:
gpio.c files need to be added to Makefile.inc in respective folders.
Ah, yes, thanks for pointing this out.
https://review.coreboot.org/#/c/32292/4/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/baseboard/gpio.c:
https://review.coreboot.org/#/c/32292/4/src/mainboard/google/hatch/variants/... PS4, Line 150: UP_20K
Actually can you add the pull-up to override table in hatch and hatch_whl. […]
Done
Philip Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
Patch Set 6:
Any more comments?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
Patch Set 6: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32292 )
Change subject: mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl ......................................................................
mb/google/hatch: Pull up GPP_C13 for hatch and hatch_whl
On EC end, we want to change this pin from push-pull to open-drain. And since there is no external pull-up resistor on the board, we'll have to configure this pin as internal-pull-up on AP end.
BUG=b:129306003 TEST=None
Change-Id: Ibc1f89fc25773220db009c6571400b01390dd756 Signed-off-by: Philip Chen philipchen@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32292 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/hatch/variants/baseboard/gpio.c M src/mainboard/google/hatch/variants/hatch/Makefile.inc A src/mainboard/google/hatch/variants/hatch/gpio.c M src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc A src/mainboard/google/hatch/variants/hatch_whl/gpio.c 5 files changed, 69 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c index 7e82b9b..df1c65e 100644 --- a/src/mainboard/google/hatch/variants/baseboard/gpio.c +++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c @@ -428,7 +428,7 @@ PAD_CFG_GPO(GPP_A18, 0, DEEP), /* EN_PP3300_WWAN */ };
-const struct pad_config * __weak variant_sleep_gpio_table( +const struct pad_config *__weak variant_sleep_gpio_table( u8 slp_typ, size_t *num) { if (slp_typ == ACPI_S5) { diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.inc b/src/mainboard/google/hatch/variants/hatch/Makefile.inc index cf6ee5a..555cbb4 100644 --- a/src/mainboard/google/hatch/variants/hatch/Makefile.inc +++ b/src/mainboard/google/hatch/variants/hatch/Makefile.inc @@ -18,3 +18,5 @@ SPD_SOURCES += 8G_2666 # 0b011 SPD_SOURCES += 16G_2400 # 0b100 SPD_SOURCES += 16G_2666 # 0b101 + +ramstage-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/hatch/gpio.c b/src/mainboard/google/hatch/variants/hatch/gpio.c new file mode 100644 index 0000000..7e73724 --- /dev/null +++ b/src/mainboard/google/hatch/variants/hatch/gpio.c @@ -0,0 +1,32 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + */ + +#include <arch/acpi.h> +#include <baseboard/gpio.h> +#include <baseboard/variants.h> +#include <commonlib/helpers.h> + +static const struct pad_config gpio_table[] = { + /* C13 : EC_PCH_INT_L + * TODO Configure it back to invert mode, when + * ITSS IPCx configuration is fixed in FSP. + */ + PAD_CFG_GPI_APIC(GPP_C13, UP_20K, PLTRST, LEVEL, NONE)}; + +const struct pad_config *override_gpio_table(size_t *num) +{ + *num = ARRAY_SIZE(gpio_table); + return gpio_table; +} diff --git a/src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc b/src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc index 4fa98ea..ecf5c2f 100644 --- a/src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc +++ b/src/mainboard/google/hatch/variants/hatch_whl/Makefile.inc @@ -18,3 +18,5 @@ SPD_SOURCES += empty_ddr4 # 0b011 SPD_SOURCES += empty_ddr4 # 0b100 SPD_SOURCES += 8G_2666 # 0b101 + +ramstage-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/hatch_whl/gpio.c b/src/mainboard/google/hatch/variants/hatch_whl/gpio.c new file mode 100644 index 0000000..7e73724 --- /dev/null +++ b/src/mainboard/google/hatch/variants/hatch_whl/gpio.c @@ -0,0 +1,32 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + */ + +#include <arch/acpi.h> +#include <baseboard/gpio.h> +#include <baseboard/variants.h> +#include <commonlib/helpers.h> + +static const struct pad_config gpio_table[] = { + /* C13 : EC_PCH_INT_L + * TODO Configure it back to invert mode, when + * ITSS IPCx configuration is fixed in FSP. + */ + PAD_CFG_GPI_APIC(GPP_C13, UP_20K, PLTRST, LEVEL, NONE)}; + +const struct pad_config *override_gpio_table(size_t *num) +{ + *num = ARRAY_SIZE(gpio_table); + return gpio_table; +}