Change in coreboot[master]: mb/google/zork: move USB OC pin mapping to trembyle base board
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
mb/google/zork: move USB OC pin mapping to trembyle base board
The USB OC pin mapping is similar enough to move it to the base board and just have one override for woomax.
Change-Id: I7e305d7e6f51d7ef7a4c699e3bacc6bcd699d2f2 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/berknip/overridetree.cb M src/mainboard/google/zork/variants/ezkinil/overridetree.cb M src/mainboard/google/zork/variants/morphius/overridetree.cb M src/mainboard/google/zork/variants/trembyle/overridetree.cb M src/mainboard/google/zork/variants/woomax/overridetree.cb 6 files changed, 5 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/44269/1
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 1b43cc8..b2bd713 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -139,7 +139,11 @@ .read_mode = SPI_READ_MODE_DUAL122, }"
- # common USB OC pin mapping + # USB OC pin mapping + register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 + register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 + register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 + register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE" # Camera or internal hub register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE" # Bluetooth
diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb index 45b80a2..d250311 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - # Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ .speed = I2C_SPEED_FAST, diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb index 1808a0f..246a82b 100644 --- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb +++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - register "xhci0_force_gen1" = "1"
# Enable I2C2 for trackpad, touchscreen, pen at 400kHz diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index caaddb8..bc98bee 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - # Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ .speed = I2C_SPEED_FAST, diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb index 8b5c14f..bead293 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - # Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ .speed = I2C_SPEED_FAST, diff --git a/src/mainboard/google/zork/variants/woomax/overridetree.cb b/src/mainboard/google/zork/variants/woomax/overridetree.cb index bdcc9bb..f51bf0c 100644 --- a/src/mainboard/google/zork/variants/woomax/overridetree.cb +++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb @@ -24,10 +24,7 @@ # End : OPN Performance Configuration
# USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 register "usb_port_overcurrent_pin[2]" = "USB_OC_NONE" # NC - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1
# Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{
Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Furquan Shaikh, Kangheui Won,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44269
to look at the new patch set (#2).
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
mb/google/zork: move USB OC pin mapping to trembyle base board
The USB OC pin mapping is similar enough to move it to the base board and just have two overrides for trembyle, which is based on an older version of the schematics, and one override for woomax, which doesn't use one USB port.
Change-Id: I7e305d7e6f51d7ef7a4c699e3bacc6bcd699d2f2 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/berknip/overridetree.cb M src/mainboard/google/zork/variants/ezkinil/overridetree.cb M src/mainboard/google/zork/variants/morphius/overridetree.cb M src/mainboard/google/zork/variants/trembyle/overridetree.cb M src/mainboard/google/zork/variants/woomax/overridetree.cb 6 files changed, 5 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/44269/2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44269/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44269/2//COMMIT_MSG@13 PS2, Line 13: BUG=b:163081097
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 2:
We need to ensure we're handling any pin changes across revisions of boards. The bug I added as a comment is where that was taking place. Please provide your analysis there.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 2:
This patch is only a cleanup patch and doesn't change behavior, so that would be a separate patch
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 2: Code-Review+1
Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Furquan Shaikh, Angel Pons, Kangheui Won,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44269
to look at the new patch set (#3).
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
mb/google/zork: move USB OC pin mapping to trembyle base board
The USB OC pin mapping is similar enough to move it to the base board and just have two overrides for trembyle, which is based on an older version of the schematics, and one override for woomax, which doesn't use one USB port.
BUG=b:163081097
Change-Id: I7e305d7e6f51d7ef7a4c699e3bacc6bcd699d2f2 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/berknip/overridetree.cb M src/mainboard/google/zork/variants/ezkinil/overridetree.cb M src/mainboard/google/zork/variants/morphius/overridetree.cb M src/mainboard/google/zork/variants/trembyle/overridetree.cb M src/mainboard/google/zork/variants/woomax/overridetree.cb 6 files changed, 5 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/44269/3
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44269/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/44269/2//COMMIT_MSG@13 PS2, Line 13:
BUG=b:163081097
Done
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
Patch Set 3: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44269 )
Change subject: mb/google/zork: move USB OC pin mapping to trembyle base board ......................................................................
mb/google/zork: move USB OC pin mapping to trembyle base board
The USB OC pin mapping is similar enough to move it to the base board and just have two overrides for trembyle, which is based on an older version of the schematics, and one override for woomax, which doesn't use one USB port.
BUG=b:163081097
Change-Id: I7e305d7e6f51d7ef7a4c699e3bacc6bcd699d2f2 Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/44269 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Raul Rangel rrangel@chromium.org --- M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/berknip/overridetree.cb M src/mainboard/google/zork/variants/ezkinil/overridetree.cb M src/mainboard/google/zork/variants/morphius/overridetree.cb M src/mainboard/google/zork/variants/trembyle/overridetree.cb M src/mainboard/google/zork/variants/woomax/overridetree.cb 6 files changed, 5 insertions(+), 24 deletions(-)
Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 6d26179..d38aaf2 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -139,7 +139,11 @@ .read_mode = SPI_READ_MODE_DUAL122, }"
- # common USB OC pin mapping + # USB OC pin mapping + register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 + register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 + register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 + register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE" # Camera or internal hub register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE" # Bluetooth
diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb index a469fb9..f0f92c5 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - # Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ .speed = I2C_SPEED_FAST, diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb index 6b4331f..6156cd5 100644 --- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb +++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - register "xhci0_force_gen1" = "1"
# Enable I2C2 for trackpad, touchscreen, pen at 400kHz diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index e39596d..75e7057 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -22,12 +22,6 @@
# End : OPN Performance Configuration
- # USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 - register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_1" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1 - # Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ .speed = I2C_SPEED_FAST, diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb index 39b4fcb..001403c 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -23,10 +23,8 @@ # End : OPN Performance Configuration
# USB OC pin mapping: existing trembyle boards are based on old schematics version - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_2" # USB A0 register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_4" # USB A1 - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1
# Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{ diff --git a/src/mainboard/google/zork/variants/woomax/overridetree.cb b/src/mainboard/google/zork/variants/woomax/overridetree.cb index 557e032..2f925f5 100644 --- a/src/mainboard/google/zork/variants/woomax/overridetree.cb +++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb @@ -24,10 +24,7 @@ # End : OPN Performance Configuration
# USB OC pin mapping - register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 - register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 register "usb_port_overcurrent_pin[2]" = "USB_OC_NONE" # NC - register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1" # USB C1
# Enable I2C2 for trackpad, touchscreen, pen at 400kHz register "i2c[2]" = "{
-
Aaron Durbin (Code Review) -
Angel Pons (Code Review)
-
Felix Held (Code Review)
-
Raul Rangel (Code Review)