mb/google/zork: add USB over-current pin mapping to devicetree

BUG=b:162010077

Change-Id: Iba3e3ec62cdfd818077017abd28fa754c2ae7797
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44007
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

8 files changed, 45 insertions, 0 deletions

diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
index e2d9183311..aae84b74eb 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
@@ -130,6 +130,14 @@ chip soc/amd/picasso
 		.tx_res_tune = 0x01,
 	}"
 
+	# 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_1"	# USB C1
+	register "usb_port_overcurrent_pin[2]" = "USB_OC_PIN_0"	# USB A0
+	register "usb_port_overcurrent_pin[3]" = "USB_OC_PIN_1"	# USB A1
+	register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE"	# Camera
+	register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE"	# Bluetooth
+
 	# SPI Configuration
 	register "common_config.spi_config" = "{
 		.normal_speed = SPI_SPEED_33M, /* MHz */
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
index bbef7027d5..39a48277c7 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
@@ -139,6 +139,10 @@ chip soc/amd/picasso
 		.read_mode = SPI_READ_MODE_DUAL122,
 	}"
 
+	# common USB OC pin mapping
+	register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE"	# Camera or internal hub
+	register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE"	# Bluetooth
+
 	# eSPI Configuration
 	register "common_config.espi_config" = "{
 		.std_io_decode_bitmap = ESPI_DECODE_IO_0x80_EN | ESPI_DECODE_IO_0X60_0X64_EN,
diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb
index d250311e46..45b80a2a5c 100644
--- a/src/mainboard/google/zork/variants/berknip/overridetree.cb
+++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb
@@ -22,6 +22,12 @@ 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,
diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
index 55790153d1..b06f4bc0a6 100644
--- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
+++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
@@ -22,6 +22,12 @@ 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
diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb
index bc98beea51..caaddb8105 100644
--- a/src/mainboard/google/zork/variants/morphius/overridetree.cb
+++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb
@@ -22,6 +22,12 @@ 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,
diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb
index bead29335d..26d9a3ee82 100644
--- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb
+++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb
@@ -22,6 +22,12 @@ 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_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]" = "{
 		.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
index eb5c2dd41a..17cc17c668 100644
--- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
@@ -18,6 +18,9 @@ chip soc/amd/picasso
 
 	# End : OPN Performance Configuration
 
+	# USB OC pin mapping
+	register "usb_port_overcurrent_pin[1]" = "USB_OC_NONE"	# LTE instead of USB C1
+
 	# I2C2 for touchscreen and trackpad
 	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 78e0523adf..bdcc9bbde9 100644
--- a/src/mainboard/google/zork/variants/woomax/overridetree.cb
+++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb
@@ -23,6 +23,12 @@ 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]" = "{
 		.speed = I2C_SPEED_FAST,