From 1df3b70c6a2eeb922bae96991f0a93e43e7e9721 Mon Sep 17 00:00:00 2001
From: Brandon Breitenstein <brandon.breitenstein@intel.com>
Date: Mon, 10 Aug 2020 15:02:41 -0700
Subject: [PATCH] mb/google/volteer: Make devicetree default as Aux Orientation
 retimer controlled

With new board designs being introduced it does not make sense for the default
devicetree setting to be retimer disabled on port 0 for Aux Orientation.
Change the default to be Aux Orintation retimer controlled on all ports and
move the SOC controlled overrides to the corresponding overridetree files.

BUG=NONE
BRANCH=NONE
TEST=Built image for delbin and verified that port 0 flip is working.

Change-Id: I5ff59493472db096c027d223f2fd61545dc935e2
Signed-off-by: Brandon Breitenstein <brandon.breitenstein@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Reviewed-by: David Wu <david_wu@quanta.corp-partner.google.com>
---
 .../google/volteer/variants/baseboard/devicetree.cb         | 6 +++---
 .../google/volteer/variants/eldrid/overridetree.cb          | 4 ++++
 .../google/volteer/variants/malefor/overridetree.cb         | 4 ++++
 .../google/volteer/variants/trondo/overridetree.cb          | 1 +
 .../google/volteer/variants/volteer/overridetree.cb         | 4 ++++
 .../google/volteer/variants/volteer2/overridetree.cb        | 4 ++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 57ab9e42c5..ffae2f0f9e 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -160,9 +160,9 @@ chip soc/intel/tigerlake
 
 	# TCSS USB3
 	register "TcssXhciEn" = "1"
-	register "TcssAuxOri" = "1"
-	register "IomTypeCPortPadCfg[0]" = "0x090E000A"
-	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
+	register "TcssAuxOri" = "0"
+	register "IomTypeCPortPadCfg[0]" = "0x09000000"
+	register "IomTypeCPortPadCfg[1]" = "0x09000000"
 	register "IomTypeCPortPadCfg[2]" = "0x09000000"
 	register "IomTypeCPortPadCfg[3]" = "0x09000000"
 	register "IomTypeCPortPadCfg[4]" = "0x09000000"
diff --git a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
index 32204c58e7..89026b8ffb 100644
--- a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
@@ -1,5 +1,9 @@
 chip soc/intel/tigerlake
 
+	register "TcssAuxOri" = "1"
+	register "IomTypeCPortPadCfg[0]" = "0x090E000A"
+	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
+
 	device domain 0 on
 	end
 
diff --git a/src/mainboard/google/volteer/variants/malefor/overridetree.cb b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
index c84ed833c5..b18492423c 100644
--- a/src/mainboard/google/volteer/variants/malefor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
@@ -19,6 +19,10 @@ chip soc/intel/tigerlake
 
 	register "SaGv" = "SaGv_Disabled"
 
+	register "TcssAuxOri" = "1"
+	register "IomTypeCPortPadCfg[0]" = "0x090E000A"
+	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
+
 	# I2C Port Config
 	register "SerialIoI2cMode" = "{
 		[PchSerialIoIndexI2C0]  = PchSerialIoPci,
diff --git a/src/mainboard/google/volteer/variants/trondo/overridetree.cb b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
index 0932b6484c..d7c0b7ae70 100644
--- a/src/mainboard/google/volteer/variants/trondo/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
@@ -1,5 +1,6 @@
 chip soc/intel/tigerlake
 	register "SaGv" = "SaGv_Disabled"
+
 	device domain 0 on
 		device pci 15.1 on
 			chip drivers/i2c/hid
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index a435c95f14..b4948ec2ba 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -43,6 +43,10 @@ chip soc/intel/tigerlake
 			},
 		},
 	}"
+	register "TcssAuxOri" = "1"
+	register "IomTypeCPortPadCfg[0]" = "0x090E000A"
+	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
+
 	device domain 0 on
 		device pci 15.0 on
 			chip drivers/i2c/generic
diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
index fefe9ba6a7..76a5b87f3e 100644
--- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
@@ -1,4 +1,8 @@
 chip soc/intel/tigerlake
+	register "TcssAuxOri" = "1"
+	register "IomTypeCPortPadCfg[0]" = "0x090E000A"
+	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
+
 	device domain 0 on
 		device pci 15.0 on
 			chip drivers/i2c/generic