From 53af78d4fb3ef93b72b60aa2c2ab643beb9e09cd Mon Sep 17 00:00:00 2001
From: Tim Chen <tim-chen@quanta.corp-partner.google.com>
Date: Thu, 12 Apr 2018 07:38:44 +0000
Subject: [PATCH] Revert "mb/google/coral: add usb2 phy setting override for
 some variants"

This reverts commit 06e3e1f055593bd2e2906f43040a703bc471cde4.

This commit can only pass far-end USB eye diagram but will fail on near-end.
Confirmed with Intel we should revert it.

Change-Id: Ie987061e27996b0acc8345bf9aadb42d2c940808
Signed-off-by: Tim Chen <tim-chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/25629
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../google/reef/variants/coral/mainboard.c    | 69 ++++---------------
 1 file changed, 13 insertions(+), 56 deletions(-)

diff --git a/src/mainboard/google/reef/variants/coral/mainboard.c b/src/mainboard/google/reef/variants/coral/mainboard.c
index 311c71a3ab..a45afc7070 100644
--- a/src/mainboard/google/reef/variants/coral/mainboard.c
+++ b/src/mainboard/google/reef/variants/coral/mainboard.c
@@ -28,13 +28,8 @@ enum {
 	SKU_3_SANTA = 3,
 	SKU_4_LAVA = 4,
 	SKU_5_LAVA = 5,
-	SKU_6_BLUE = 6,
-	SKU_7_BLUE = 7,
-	SKU_8_BRUCE = 8,
 	SKU_9_LAVA = 9,
 	SKU_10_LAVA = 10,
-	SKU_11_BRUCE = 11,
-	SKU_12_BLUE = 12,
 	SKU_61_ASTRONAUT = 61,
 	SKU_62_ASTRONAUT = 62,
 	SKU_160_NASHER = 160,
@@ -76,63 +71,25 @@ void mainboard_devtree_update(struct device *dev)
 	switch (sku_id) {
         case SKU_0_ASTRONAUT:
         case SKU_1_ASTRONAUT:
-        case SKU_61_ASTRONAUT:
-        case SKU_62_ASTRONAUT:
-		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;
-		cfg->usb2eye[1].Usb20PerPortTxiSet = 4;
-		cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;
-		cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;
-		cfg->usb2eye[4].Usb20PerPortTxiSet = 7;
-		cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;
-                break;
+		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;
+		cfg->usb2eye[1].Usb20PerPortTxiSet = 2;
+		break;
 	case SKU_2_SANTA:
 	case SKU_3_SANTA:
-		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;
-		cfg->usb2eye[1].Usb20PerPortTxiSet = 4;
-		cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;
-		cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;
-		cfg->usb2eye[4].Usb20PerPortTxiSet = 7;
-		cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;
-                break;
+		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;
+		cfg->usb2eye[1].Usb20PerPortTxiSet = 2;
+		break;
 	case SKU_4_LAVA:
 	case SKU_5_LAVA:
 	case SKU_9_LAVA:
 	case SKU_10_LAVA:
-		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;
-		cfg->usb2eye[1].Usb20PerPortTxiSet = 4;
-		cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;
-		cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;
-		cfg->usb2eye[4].Usb20PerPortTxiSet = 7;
-		cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;
-                break;
-	case SKU_6_BLUE:
-	case SKU_7_BLUE:
-	case SKU_12_BLUE:
-		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;
-		cfg->usb2eye[1].Usb20PerPortTxiSet = 4;
-		cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;
-		cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;
-		cfg->usb2eye[4].Usb20PerPortTxiSet = 7;
-		cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;
-                break;
-	case SKU_8_BRUCE:
-	case SKU_11_BRUCE:
-		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;
-		cfg->usb2eye[1].Usb20PerPortTxiSet = 4;
-		cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;
-		cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;
-		cfg->usb2eye[4].Usb20PerPortTxiSet = 7;
-		cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;
-		cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;
+		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;
+		cfg->usb2eye[1].Usb20PerPortTxiSet = 2;
+		break;
+        case SKU_61_ASTRONAUT:
+        case SKU_62_ASTRONAUT:
+		cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;
+		cfg->usb2eye[1].Usb20PerPortTxiSet = 5;
                 break;
 	default:
 		break;