Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31428
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 5 and 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/1
diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c index 322b44b..6687fba 100644 --- a/src/mainboard/google/octopus/variants/phaser/gpio.c +++ b/src/mainboard/google/octopus/variants/phaser/gpio.c @@ -74,7 +74,7 @@ uint32_t sku_id = SKU_UNKNOWN;
google_chromeec_cbi_get_sku_id(&sku_id); - if (sku_id == 1) { + if ((sku_id == 1) || (sku_id == 5) || (sku_id == 6)) { c = sku1_default_override_table; *num = ARRAY_SIZE(sku1_default_override_table); } else { diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c index 22f4f71..990c864f 100644 --- a/src/mainboard/google/octopus/variants/phaser/variant.c +++ b/src/mainboard/google/octopus/variants/phaser/variant.c @@ -30,8 +30,8 @@ if (touchscreen_i2c_host == NULL) return;
- /* SKU ID 1 does not have a touchscreen device, hence disable it. */ + /* SKU ID 1, 5 and 6 does not have a touchscreen device, hence disable it. */ google_chromeec_cbi_get_sku_id(&sku_id); - if (sku_id == 1) + if ((sku_id == 1) || (sku_id == 5) || (sku_id == 6)) touchscreen_i2c_host->enabled = 0; }
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/31428/1/src/mainboard/google/octopus/variant... File src/mainboard/google/octopus/variants/phaser/variant.c:
https://review.coreboot.org/#/c/31428/1/src/mainboard/google/octopus/variant... PS1, Line 33: /* SKU ID 1, 5 and 6 does not have a touchscreen device, hence disable it. */ line over 80 characters
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#2).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 5 and 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/2
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 2: Code-Review+1
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/31428/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/31428/2//COMMIT_MSG@7 PS2, Line 7: laser phaser or octopus/var/phaser
Hello Aaron Durbin, Hao He, Jett Rink, Xingyu Wu, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#3).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/3
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 3: Code-Review+1
Sorry, I have a mistake. I have check sku 5,6,and 7, just only 6 without touch screen, So disable this sku
Peichao Li has removed Hao He from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Hao He.
Jett Rink has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/#/c/31428/3/src/mainboard/google/octopus/variant... File src/mainboard/google/octopus/variants/phaser/gpio.c:
https://review.coreboot.org/#/c/31428/3/src/mainboard/google/octopus/variant... PS3, Line 77: if ((sku_id == 1) || (sku_id == 6)) { we should really create a phaser level function that e.g. is_touchscreen_sku() that encodes this, so we don't have to keep two places in sync
https://review.coreboot.org/#/c/31428/3/src/mainboard/google/octopus/variant... File src/mainboard/google/octopus/variants/phaser/variant.c:
https://review.coreboot.org/#/c/31428/3/src/mainboard/google/octopus/variant... PS3, Line 33: SKU ID 1 comment is out of date
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 3:
Patch Set 3:
(2 comments)
Hi Jett, Sorry, I don't think so, since as I know Laser and phaser is no different on the firmware section, SKU ID 1 point to phaser clamshell(100e), SKU ID 6 point to Laser14 clamshell. So I think this logic is correct.
Hello Aaron Durbin, Hao He, Jett Rink, Xingyu Wu, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#4).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/4
Peichao Li has removed Hao He from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Hao He.
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 4: Code-Review+1
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 4:
Patch Set 3:
Patch Set 3:
(2 comments)
Hi Jett, Sorry, I don't think so, since as I know Laser and phaser is no different on the firmware section, SKU ID 1 point to phaser clamshell(100e), SKU ID 6 point to Laser14 clamshell. So I think this logic is correct.
I think Jett meant that having helper function something like:
bool is_touchscreen_sku(int sku_id) { if ((sku_id == 1) || (sku_id == 6)) return false;
return true; }
Then you won't need to add checks in two different places.
Hello Aaron Durbin, Jett Rink, Xingyu Wu, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#5).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 3 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/5
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 5: Code-Review+1
Patch Set 4:
Patch Set 3:
Patch Set 3:
(2 comments)
Hi Jett, Sorry, I don't think so, since as I know Laser and phaser is no different on the firmware section, SKU ID 1 point to phaser clamshell(100e), SKU ID 6 point to Laser14 clamshell. So I think this logic is correct.
I think Jett meant that having helper function something like:
bool is_touchscreen_sku(int sku_id) { if ((sku_id == 1) || (sku_id == 6)) return false;
return true;
}
Then you won't need to add checks in two different places.
Catch your point, add function like below:
bool no_touchscreen_sku(uint32_t sku_id) { if ((sku_id == 1) || (sku_id == 6)) return true; else return false; } Please kindly take a look.
Thanks
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 5:
Patch Set 5: Code-Review+1
Patch Set 4:
Patch Set 3:
Patch Set 3:
(2 comments)
Hi Jett, Sorry, I don't think so, since as I know Laser and phaser is no different on the firmware section, SKU ID 1 point to phaser clamshell(100e), SKU ID 6 point to Laser14 clamshell. So I think this logic is correct.
I think Jett meant that having helper function something like:
bool is_touchscreen_sku(int sku_id) { if ((sku_id == 1) || (sku_id == 6)) return false;
return true;
}
Then you won't need to add checks in two different places.
Catch your point, add function like below:
bool no_touchscreen_sku(uint32_t sku_id) { if ((sku_id == 1) || (sku_id == 6)) return true; else return false; } Please kindly take a look.
Thanks
Sorry, something wrong happened, wait for a moment, let me correct it. Thanks.
Hello Aaron Durbin, Jett Rink, Xingyu Wu, Justin TerAvest, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#6).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 3 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/6
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 6:
(8 comments)
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... File src/mainboard/google/octopus/variants/phaser/gpio.c:
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 73: if ((sku_id == 1) || (sku_id == 6)) code indent should use tabs where possible
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 73: if ((sku_id == 1) || (sku_id == 6)) please, no spaces at the start of a line
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 74: return true; code indent should use tabs where possible
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 74: return true; please, no spaces at the start of a line
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 75: else code indent should use tabs where possible
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 75: else please, no spaces at the start of a line
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 76: return false; code indent should use tabs where possible
https://review.coreboot.org/#/c/31428/6/src/mainboard/google/octopus/variant... PS6, Line 76: return false; please, no spaces at the start of a line
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 6: Code-Review+1
Peichao Li has removed Xingyu Wu from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Xingyu Wu.
Peichao Li has removed Jett Rink from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Jett Rink.
Peichao Li has removed Justin TerAvest from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Justin TerAvest.
Peichao Li has removed Furquan Shaikh from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Furquan Shaikh.
Peichao Li has removed Aaron Durbin from this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Removed reviewer Aaron Durbin.
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31428
to look at the new patch set (#7).
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f --- M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 3 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/31428/7
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 7: Code-Review+1
Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 7:
Done, please kindly help take a look again. Many thanks!
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 7: Code-Review+2
Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
mb/google/laser: Disable touch screen device that according to SKU ID
We need disable touch screen device on laser SKU ID 6.
BUG=none TEST=according to sku_id (Laser(convertible): 5, Laser14(clamshell): 6, Laser14(clamshell + touch):7) distinguish whether disable touch screen device.
Signed-off-by: peichao.wang peichao.wang@bitland.corp-partner.google.com Change-Id: I6953c35a5e8c93d88fe63362156faa351e8ee71f Reviewed-on: https://review.coreboot.org/c/31428 Reviewed-by: Furquan Shaikh furquan@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/phaser/variant.c 3 files changed, 14 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Peichao Li: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h index 04f8796..9638118 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h @@ -46,4 +46,7 @@ struct device; void variant_update_devtree(struct device *dev);
+/* Get no touchscreen SKU ID. */ +bool no_touchscreen_sku(uint32_t sku_id); + #endif /* BASEBOARD_VARIANTS_H */ diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c index 322b44b..6883ab0 100644 --- a/src/mainboard/google/octopus/variants/phaser/gpio.c +++ b/src/mainboard/google/octopus/variants/phaser/gpio.c @@ -68,13 +68,21 @@ PAD_NC(GPIO_214, DN_20K), };
+bool no_touchscreen_sku(uint32_t sku_id) +{ + if ((sku_id == 1) || (sku_id == 6)) + return true; + else + return false; +} + const struct pad_config *variant_override_gpio_table(size_t *num) { const struct pad_config *c; uint32_t sku_id = SKU_UNKNOWN;
google_chromeec_cbi_get_sku_id(&sku_id); - if (sku_id == 1) { + if (no_touchscreen_sku(sku_id)) { c = sku1_default_override_table; *num = ARRAY_SIZE(sku1_default_override_table); } else { diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c index 22f4f71..eb080f0 100644 --- a/src/mainboard/google/octopus/variants/phaser/variant.c +++ b/src/mainboard/google/octopus/variants/phaser/variant.c @@ -30,8 +30,8 @@ if (touchscreen_i2c_host == NULL) return;
- /* SKU ID 1 does not have a touchscreen device, hence disable it. */ + /* SKU ID 1, 6 does not have a touchscreen device, hence disable it. */ google_chromeec_cbi_get_sku_id(&sku_id); - if (sku_id == 1) + if (no_touchscreen_sku(sku_id)) touchscreen_i2c_host->enabled = 0; }
Jett Rink has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31428 )
Change subject: mb/google/laser: Disable touch screen device that according to SKU ID ......................................................................
Patch Set 8: Code-Review+1