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>
This commit is contained in:
Felix Held 2020-08-06 15:04:15 +02:00
parent 4e0cd82b5b
commit 04394d69d4
6 changed files with 5 additions and 24 deletions

View File

@ -139,7 +139,11 @@ chip soc/amd/picasso
.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

View File

@ -22,12 +22,6 @@ chip soc/amd/picasso
# 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,

View File

@ -22,12 +22,6 @@ chip soc/amd/picasso
# 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

View File

@ -22,12 +22,6 @@ chip soc/amd/picasso
# 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,

View File

@ -23,10 +23,8 @@ chip soc/amd/picasso
# 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]" = "{

View File

@ -24,10 +24,7 @@ chip soc/amd/picasso
# 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]" = "{