From b66e2504a27bc354026f7adcf8bc65c99c1b5250 Mon Sep 17 00:00:00 2001
From: Dtrain Hsu <dtrain_hsu@compal.corp-partner.google.com>
Date: Thu, 23 Jul 2020 14:49:35 +0800
Subject: mb/google/dedede/var/madoo: Configure USB port setting for Madoo

Follow schematic to modify USB port setting and clean up I2C clock tuning.

USB2 [0]: USB Type C Port 0
USB2 [1]: USB Type C Port 1
USB2 [2]: None
USB2 [3]: USB Type A Port 1
USB2 [4]: None
USB2 [5]: Camera
USB2 [6]: None
USB2 [7]: WLAN module - BlueTooth

USB3 [0]: USB Type C Port 0 (M/B side)
USB3 [1]: USB Type C Port 1 (Sub/B side)
USB3 [2]: None
USB3 [3]: USB Type A Port 1
USB3 [4]: None
USB3 [5]: None

BUG=b:161407664
BRANCH=NONE
TEST=Build the coreboot image on madoo board.

Signed-off-by: Dtrain Hsu <dtrain_hsu@compal.corp-partner.google.com>
Change-Id: Ia73593f52adee3806e725127891f084a08bf1360
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43750
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../google/dedede/variants/madoo/overridetree.cb   | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/mainboard/google/dedede/variants/madoo/overridetree.cb b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
index d8ffd3d0c7..c793866e94 100644
--- a/src/mainboard/google/dedede/variants/madoo/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
@@ -1,7 +1,10 @@
 chip soc/intel/jasperlake
 
 	# USB Port Configuration
+	register "usb2_ports[2]" = "USB2_PORT_EMPTY"	    # Not Used
+	register "usb2_ports[4]" = "USB2_PORT_EMPTY"	    # Not Used
 	register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"	# Camera
+	register "usb3_ports[2]" = "USB3_PORT_EMPTY"	    # Not Used
 
 	# Intel Common SoC Config
 	#+-------------------+---------------------------+
@@ -14,7 +17,7 @@ chip soc/intel/jasperlake
 	#| I2C0              | Trackpad                  |
 	#| I2C1              | Digitizer                 |
 	#| I2C2              | Touchscreen               |
-	#| I2C3              | Camera                    |
+	#| I2C3              |                           |
 	#| I2C4              | Audio                     |
 	#+-------------------+---------------------------+
 	register "common_soc_config" = "{
@@ -24,9 +27,6 @@ chip soc/intel/jasperlake
 		},
 		.i2c[0] = {
 			.speed = I2C_SPEED_FAST,
-			.rise_time_ns = 66,
-			.fall_time_ns = 90,
-			.data_hold_time_ns = 350,
 		},
 		.i2c[1] = {
 			.speed = I2C_SPEED_FAST,
@@ -34,15 +34,28 @@ chip soc/intel/jasperlake
 		.i2c[2] = {
 			.speed = I2C_SPEED_FAST,
 		},
-		.i2c[3] = {
-			.speed = I2C_SPEED_FAST,
-		},
 		.i2c[4] = {
 			.speed = I2C_SPEED_FAST,
 		},
 	}"
 	device domain 0 on
-		device pci 14.0 on end
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						device usb 2.2 off end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.5 on end
+					end
+					chip drivers/usb/acpi
+						device usb 3.2 off end
+					end
+				end
+			end
+		end # USB xHCI
 		device pci 15.0 on end
 		device pci 15.2 on end
 		device pci 1c.7 on end
-- 
cgit v1.2.3