Josie Nordrum has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: Ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Ezkinil: Fix stylus GPIO to enable suspend
Make GPIO_4 and GPIO_5 PAD_NC in ezkinil/gpio.c. Move interrupt status and wake status clearing to after GPIO config.
BUG=b:164892883, b:165342107 TEST=None BRANCH=None
Signed-off-by: Josie Nordrum josienordrum@google.com Change-Id: I7557575cf8b8e0f849e05bda1d69acf61e91a157 --- M src/mainboard/google/zork/variants/ezkinil/gpio.c M src/soc/amd/common/block/gpio_banks/gpio.c 2 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/44629/1
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c index f8664bb..60fb6a4 100644 --- a/src/mainboard/google/zork/variants/ezkinil/gpio.c +++ b/src/mainboard/google/zork/variants/ezkinil/gpio.c @@ -8,6 +8,10 @@ #include <ec/google/chromeec/ec.h>
static const struct soc_amd_gpio ezkinil_bid1_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN */ + PAD_NC(GPIO_5), /* DMIC_SEL */ PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic /* USB_OC4_L - USB_A1 */ @@ -29,6 +33,10 @@ };
static const struct soc_amd_gpio ezkinil_bid2_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN */ + PAD_NC(GPIO_5), /* FPMCU_RST_L Change NC */ PAD_NC(GPIO_11), /* DMIC_SEL */ @@ -50,6 +58,10 @@ };
static const struct soc_amd_gpio ezkinil_bid3_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN */ + PAD_NC(GPIO_5), /* FPMCU_RST_L Change NC */ PAD_NC(GPIO_11), /* FPMCU_BOOT0 Change NC */ diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio_banks/gpio.c index 7fb6622..1909f99 100644 --- a/src/soc/amd/common/block/gpio_banks/gpio.c +++ b/src/soc/amd/common/block/gpio_banks/gpio.c @@ -214,10 +214,10 @@
soc_gpio_hook(gpio, mux);
- /* Clear interrupt and wake status (write 1-to-clear bits) */ - control |= GPIO_INT_STATUS | GPIO_WAKE_STATUS; __gpio_setbits32(gpio, PAD_CFG_MASK, control); - + /* Clear interrupt and wake status (write 1-to-clear bits) */ + __gpio_or32(gpio, GPIO_INT_STATUS | GPIO_WAKE_STATUS); + if (control_flags == 0) continue;
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: Ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Patch Set 1:
(5 comments)
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG@9 PS1, Line 9: . It would be good to add reason: None of the Ezkinil SKUs use internal stylus and hence pen pads are configured as NC.
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG@9 PS1, Line 9: Move interrupt status : and wake status clearing to after GPIO config. This should go in as a separate change.
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/ezkinil/gpio.c:
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... PS1, Line 11: PEN_DETECT_ODL Maybe "PEN_DETECT_ODL - Not used" or "PEN_DETECT_ODL - Not connected"
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... PS1, Line 13: Same here.
https://review.coreboot.org/c/coreboot/+/44629/1/src/soc/amd/common/block/gp... File src/soc/amd/common/block/gpio_banks/gpio.c:
PS1: This is not related to the GPIO_4/GPIO_5 change. Should go in as a separate CL.
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: Ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44629/1/src/soc/amd/common/block/gp... File src/soc/amd/common/block/gpio_banks/gpio.c:
https://review.coreboot.org/c/coreboot/+/44629/1/src/soc/amd/common/block/gp... PS1, Line 220: trailing whitespace
Hello build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44629
to look at the new patch set (#2).
Change subject: Ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Ezkinil: Fix stylus GPIO to enable suspend
Make GPIO_4 and GPIO_5 PAD_NC in ezkinil/gpio.c. None of the Ezkinil SKUs use internal stylus and hence pen pads are configured as NC.
BUG=b:164892883, b:165342107 TEST=None BRANCH=None
Signed-off-by: Josie Nordrum josienordrum@google.com Change-Id: I7557575cf8b8e0f849e05bda1d69acf61e91a157 --- M src/mainboard/google/zork/variants/ezkinil/gpio.c 1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/44629/2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: Ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Patch Set 2: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG@7 PS2, Line 7: Ezkinil mb/google/zork/var/ezkinil
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG@13 PS2, Line 13: None Verified that pen detect GPIO does not cause spurious wakes?
Hello build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44629
to look at the new patch set (#3).
Change subject: mb/google/zork/var/ezkinil: Fix stylus GPIO to enable suspend ......................................................................
mb/google/zork/var/ezkinil: Fix stylus GPIO to enable suspend
Make GPIO_4 and GPIO_5 PAD_NC in ezkinil/gpio.c. None of the Ezkinil SKUs use internal stylus and hence pen pads are configured as NC.
BUG=b:164892883, b:165342107 TEST=Verified taht pen detect GPIO does not cause spurious wakes. BRANCH=None
Signed-off-by: Josie Nordrum josienordrum@google.com Change-Id: I7557575cf8b8e0f849e05bda1d69acf61e91a157 --- M src/mainboard/google/zork/variants/ezkinil/gpio.c 1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/44629/3
Josie Nordrum has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: mb/google/zork/var/ezkinil: Fix stylus GPIO to enable suspend ......................................................................
Patch Set 3:
(7 comments)
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG@9 PS1, Line 9: .
It would be good to add reason: None of the Ezkinil SKUs use internal stylus and hence pen pads are […]
Done
https://review.coreboot.org/c/coreboot/+/44629/1//COMMIT_MSG@9 PS1, Line 9: Move interrupt status : and wake status clearing to after GPIO config.
This should go in as a separate change.
Done
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG@7 PS2, Line 7: Ezkinil
mb/google/zork/var/ezkinil
Done
https://review.coreboot.org/c/coreboot/+/44629/2//COMMIT_MSG@13 PS2, Line 13: None
Verified that pen detect GPIO does not cause spurious wakes?
Done
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/ezkinil/gpio.c:
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... PS1, Line 11: PEN_DETECT_ODL
Maybe "PEN_DETECT_ODL - Not used" or "PEN_DETECT_ODL - Not connected"
Done
https://review.coreboot.org/c/coreboot/+/44629/1/src/mainboard/google/zork/v... PS1, Line 13:
Same here.
Done
https://review.coreboot.org/c/coreboot/+/44629/1/src/soc/amd/common/block/gp... File src/soc/amd/common/block/gpio_banks/gpio.c:
PS1:
This is not related to the GPIO_4/GPIO_5 change. Should go in as a separate CL.
Done
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44629 )
Change subject: mb/google/zork/var/ezkinil: Fix stylus GPIO to enable suspend ......................................................................
mb/google/zork/var/ezkinil: Fix stylus GPIO to enable suspend
Make GPIO_4 and GPIO_5 PAD_NC in ezkinil/gpio.c. None of the Ezkinil SKUs use internal stylus and hence pen pads are configured as NC.
BUG=b:164892883, b:165342107 TEST=Verified taht pen detect GPIO does not cause spurious wakes. BRANCH=None
Signed-off-by: Josie Nordrum josienordrum@google.com Change-Id: I7557575cf8b8e0f849e05bda1d69acf61e91a157 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44629 Reviewed-by: Furquan Shaikh furquan@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/zork/variants/ezkinil/gpio.c 1 file changed, 12 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c index f8664bb..108a134 100644 --- a/src/mainboard/google/zork/variants/ezkinil/gpio.c +++ b/src/mainboard/google/zork/variants/ezkinil/gpio.c @@ -8,6 +8,10 @@ #include <ec/google/chromeec/ec.h>
static const struct soc_amd_gpio ezkinil_bid1_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL - Not connected */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN - Not connected */ + PAD_NC(GPIO_5), /* DMIC_SEL */ PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic /* USB_OC4_L - USB_A1 */ @@ -29,6 +33,10 @@ };
static const struct soc_amd_gpio ezkinil_bid2_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL - Not connected */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN - Not connected */ + PAD_NC(GPIO_5), /* FPMCU_RST_L Change NC */ PAD_NC(GPIO_11), /* DMIC_SEL */ @@ -50,6 +58,10 @@ };
static const struct soc_amd_gpio ezkinil_bid3_gpio_set_stage_ram[] = { + /* PEN_DETECT_ODL - Not connected */ + PAD_NC(GPIO_4), + /* PEN_POWER_EN - Not connected */ + PAD_NC(GPIO_5), /* FPMCU_RST_L Change NC */ PAD_NC(GPIO_11), /* FPMCU_BOOT0 Change NC */