Zhuohao Lee has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
palkia: separate the gpio pins control for the second touch
We use the different gpio pins to control the second touch, so we need to modify the devicetree to adopt this change. With this change, we can control the primary touch controller and secondary touch controller respectively.
BUG=b:149714955 TEST=touch works correctly
Change-Id: I1f896e334e51c78300af724cbef8d57641ae5612 Signed-off-by: Zhuohao Lee zhuohao@chromium.org --- M src/mainboard/google/hatch/variants/palkia/gpio.c M src/mainboard/google/hatch/variants/palkia/overridetree.cb 2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/42185/1
diff --git a/src/mainboard/google/hatch/variants/palkia/gpio.c b/src/mainboard/google/hatch/variants/palkia/gpio.c index 04f1d85..ff02b25 100644 --- a/src/mainboard/google/hatch/variants/palkia/gpio.c +++ b/src/mainboard/google/hatch/variants/palkia/gpio.c @@ -45,6 +45,10 @@ /* C23 : UART2_CTS# ==> NC */ PAD_NC(GPP_C23, NONE),
+ /* D4 : USI_BASE_REPORT_EN */ + PAD_CFG_GPO(GPP_D4, 0, DEEP), + /* D10 : GPP_D10 ==> EN_PP3300_DX_TOUCHSCREEN */ + PAD_CFG_GPO(GPP_D10, 0, DEEP), /* D16 : USI_INT_L */ PAD_CFG_GPI_APIC(GPP_D16, NONE, PLTRST, LEVEL, INVERT),
diff --git a/src/mainboard/google/hatch/variants/palkia/overridetree.cb b/src/mainboard/google/hatch/variants/palkia/overridetree.cb index 31017bc..7de423b 100644 --- a/src/mainboard/google/hatch/variants/palkia/overridetree.cb +++ b/src/mainboard/google/hatch/variants/palkia/overridetree.cb @@ -76,7 +76,7 @@ device usb 2.5 off end end chip drivers/usb/acpi - # No Right Tpype-C port + # No Right Type-C port device usb 3.1 off end end chip drivers/usb/acpi @@ -136,12 +136,12 @@ "ACPI_IRQ_EDGE_LOW(GPP_C7_IRQ)" register "generic.probed" = "1" register "generic.enable_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D9)" + "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D10)" register "generic.enable_delay_ms" = "12" register "generic.enable_off_delay_ms" = "10" register "generic.has_power_resource" = "1" register "generic.stop_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C4)" + "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" register "generic.stop_delay_ms" = "15" register "generic.stop_off_delay_ms" = "5" register "hid_desc_reg_offset" = "0x01"
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42185
to look at the new patch set (#2).
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
palkia: separate the gpio pins control for the second touch
We use the different gpio pins to control the second touch, so we need to modify the devicetree to adopt this change. With this change, we can control the primary touch controller and secondary touch controller respectively.
BUG=b:149714955 TEST=touch works correctly
Change-Id: I1f896e334e51c78300af724cbef8d57641ae5612 Signed-off-by: Zhuohao Lee zhuohao@chromium.org --- M src/mainboard/google/hatch/variants/palkia/gpio.c M src/mainboard/google/hatch/variants/palkia/overridetree.cb 2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/42185/2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
Patch Set 2:
(3 comments)
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@8 PS2, Line 8: Please describe the problem first as access to the referenced bug reports is restricted.
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@9 PS2, Line 9: touch Touch screen/pad?
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/palkia/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... PS2, Line 79: # No Right Type-C port Please put such unrelated fixes into separate commits.
Hello build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42185
to look at the new patch set (#3).
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
palkia: separate the gpio pins control for the second touch
There are two touch screen controllers on the Palkia device. One is on the lid; another is on the base. To support the different control path (for example: turning off the base's touch event when we don't want to use it however still keeping the lid's touch event), we use the different gpio pins to control the second touch. As a result, we need to modify the devicetree to adopt this change. With this change, we can control the primary and secondary touch screen controller respectively.
BUG=b:149714955 TEST=lid/base touch screen works correctly
Change-Id: I1f896e334e51c78300af724cbef8d57641ae5612 Signed-off-by: Zhuohao Lee zhuohao@chromium.org --- M src/mainboard/google/hatch/variants/palkia/gpio.c M src/mainboard/google/hatch/variants/palkia/overridetree.cb 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/42185/3
Zhuohao Lee has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
Patch Set 3:
(3 comments)
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@8 PS2, Line 8:
Please describe the problem first as access to the referenced bug reports is restricted.
added in the next patch.
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@9 PS2, Line 9: touch
Touch screen/pad?
touch screen.
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/palkia/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... PS2, Line 79: # No Right Type-C port
Please put such unrelated fixes into separate commits.
removed
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
Patch Set 3: Code-Review+2
Zhuohao Lee has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
Patch Set 3:
Could we merge this patch?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
Patch Set 3:
(3 comments)
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@8 PS2, Line 8:
added in the next patch.
Done
https://review.coreboot.org/c/coreboot/+/42185/2//COMMIT_MSG@9 PS2, Line 9: touch
touch screen.
Done
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... File src/mainboard/google/hatch/variants/palkia/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/42185/2/src/mainboard/google/hatch/... PS2, Line 79: # No Right Type-C port
removed
Done
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42185 )
Change subject: palkia: separate the gpio pins control for the second touch ......................................................................
palkia: separate the gpio pins control for the second touch
There are two touch screen controllers on the Palkia device. One is on the lid; another is on the base. To support the different control path (for example: turning off the base's touch event when we don't want to use it however still keeping the lid's touch event), we use the different gpio pins to control the second touch. As a result, we need to modify the devicetree to adopt this change. With this change, we can control the primary and secondary touch screen controller respectively.
BUG=b:149714955 TEST=lid/base touch screen works correctly
Change-Id: I1f896e334e51c78300af724cbef8d57641ae5612 Signed-off-by: Zhuohao Lee zhuohao@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/42185 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/hatch/variants/palkia/gpio.c M src/mainboard/google/hatch/variants/palkia/overridetree.cb 2 files changed, 6 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/hatch/variants/palkia/gpio.c b/src/mainboard/google/hatch/variants/palkia/gpio.c index 04f1d85..115a593 100644 --- a/src/mainboard/google/hatch/variants/palkia/gpio.c +++ b/src/mainboard/google/hatch/variants/palkia/gpio.c @@ -45,6 +45,10 @@ /* C23 : UART2_CTS# ==> NC */ PAD_NC(GPP_C23, NONE),
+ /* D4 : USI_BASE_REPORT_EN */ + PAD_CFG_GPO(GPP_D4, 0, DEEP), + /* D10 : GPP_D10 ==> EN_PP3300_DX_BASE_TOUCHSCREEN */ + PAD_CFG_GPO(GPP_D10, 0, DEEP), /* D16 : USI_INT_L */ PAD_CFG_GPI_APIC(GPP_D16, NONE, PLTRST, LEVEL, INVERT),
diff --git a/src/mainboard/google/hatch/variants/palkia/overridetree.cb b/src/mainboard/google/hatch/variants/palkia/overridetree.cb index 31017bc..73cf0f2 100644 --- a/src/mainboard/google/hatch/variants/palkia/overridetree.cb +++ b/src/mainboard/google/hatch/variants/palkia/overridetree.cb @@ -136,12 +136,12 @@ "ACPI_IRQ_EDGE_LOW(GPP_C7_IRQ)" register "generic.probed" = "1" register "generic.enable_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D9)" + "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D10)" register "generic.enable_delay_ms" = "12" register "generic.enable_off_delay_ms" = "10" register "generic.has_power_resource" = "1" register "generic.stop_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C4)" + "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" register "generic.stop_delay_ms" = "15" register "generic.stop_off_delay_ms" = "5" register "hid_desc_reg_offset" = "0x01"