<p>Pan Sheng-Liang has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23881">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/coral: Add USB2 phy setting override for Sante/Lava/Blue/Bruce/Astronaut<br><br>Due to there are some chances USB devices can not be detected.<br>USB2 port#1 and #4 PHY register need to be overridden.<br><br>port#1:<br>PERPORTPETXISET = 4<br>PERPORTTXISET = 4<br>IUSBTXEMPHASISEN= 1<br>PERPORTTXPEHALF= 0<br><br>port#4:<br>PERPORTPETXISET = 7<br>PERPORTTXISET = 7<br>IUSBTXEMPHASISEN= 1<br>PERPORTTXPEHALF= 0<br><br>BUG=b:72623892<br>BRANCH=master<br>TEST=emerge-coral coreboot chromeos-bootimage<br><br>Change-Id: I401905685cc3078df657919b162272c3de320296<br>Signed-off-by: Pan Sheng-Liang <Sheng-Liang.Pan@quantatw.com><br>---<br>M src/mainboard/google/reef/variants/coral/mainboard.c<br>1 file changed, 56 insertions(+), 53 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/23881/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/reef/variants/coral/mainboard.c b/src/mainboard/google/reef/variants/coral/mainboard.c</span><br><span>index a45afc7..97c4c0e 100644</span><br><span>--- a/src/mainboard/google/reef/variants/coral/mainboard.c</span><br><span>+++ b/src/mainboard/google/reef/variants/coral/mainboard.c</span><br><span>@@ -19,7 +19,6 @@</span><br><span> #include <soc/cpu.h></span><br><span> #include <soc/intel/apollolake/chip.h></span><br><span> #include <soc/intel/common/vbt.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <soc/gpio.h></span><br><span> </span><br><span> enum {</span><br><span> SKU_0_ASTRONAUT = 0,</span><br><span>@@ -28,8 +27,13 @@</span><br><span> SKU_3_SANTA = 3,</span><br><span> SKU_4_LAVA = 4,</span><br><span> SKU_5_LAVA = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+ SKU_6_BLUE = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ SKU_7_BLUE = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ SKU_8_BRUCE = 8,</span><br><span> SKU_9_LAVA = 9,</span><br><span> SKU_10_LAVA = 10,</span><br><span style="color: hsl(120, 100%, 40%);">+ SKU_11_BRUCE = 11,</span><br><span style="color: hsl(120, 100%, 40%);">+ SKU_12_BLUE = 12,</span><br><span> SKU_61_ASTRONAUT = 61,</span><br><span> SKU_62_ASTRONAUT = 62,</span><br><span> SKU_160_NASHER = 160,</span><br><span>@@ -71,25 +75,63 @@</span><br><span> switch (sku_id) {</span><br><span> case SKU_0_ASTRONAUT:</span><br><span> case SKU_1_ASTRONAUT:</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortTxiSet = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_61_ASTRONAUT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_62_ASTRONAUT:</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case SKU_2_SANTA:</span><br><span> case SKU_3_SANTA:</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortTxiSet = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case SKU_4_LAVA:</span><br><span> case SKU_5_LAVA:</span><br><span> case SKU_9_LAVA:</span><br><span> case SKU_10_LAVA:</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortTxiSet = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_61_ASTRONAUT:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_62_ASTRONAUT:</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2eye[1].Usb20PerPortTxiSet = 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_6_BLUE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_7_BLUE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_12_BLUE:</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_8_BRUCE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SKU_11_BRUCE:</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortPeTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxiSet = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[1].Usb20PerPortTxPeHalf = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortPeTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxiSet = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20IUsbTxEmphasisEn = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2eye[4].Usb20PerPortTxPeHalf = 0;</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>@@ -101,14 +143,6 @@</span><br><span> int sku_id = variant_board_sku();</span><br><span> </span><br><span> switch (sku_id) {</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_0_ASTRONAUT:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_1_ASTRONAUT:</span><br><span style="color: hsl(0, 100%, 40%);">- return "vbt-astronaut.bin";</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_2_SANTA:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_3_SANTA:</span><br><span style="color: hsl(0, 100%, 40%);">- return "vbt-santa.bin";</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> case SKU_160_NASHER:</span><br><span> case SKU_161_NASHER:</span><br><span> case SKU_162_NASHER:</span><br><span>@@ -123,34 +157,3 @@</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pad_config nasher_gpio_tables[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- /* AVS_DMIC_CLK_A1 */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSSTATE(GPIO_79, NATIVE, DEEP, NF1, Tx1RXDCRx0),</span><br><span style="color: hsl(0, 100%, 40%);">- /* AVS_DMIC_CLK_B1 */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSSTATE(GPIO_80, NATIVE, DEEP, NF1, Tx1RXDCRx0),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *variant_sku_gpio_table(size_t *num)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int sku_id = variant_board_sku();</span><br><span style="color: hsl(0, 100%, 40%);">- const struct pad_config *board_gpio_tables;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (sku_id) {</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_160_NASHER:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_161_NASHER:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_162_NASHER:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_163_NASHER360:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_164_NASHER360:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_165_NASHER360:</span><br><span style="color: hsl(0, 100%, 40%);">- case SKU_166_NASHER360:</span><br><span style="color: hsl(0, 100%, 40%);">- *num = ARRAY_SIZE(nasher_gpio_tables);</span><br><span style="color: hsl(0, 100%, 40%);">- board_gpio_tables = nasher_gpio_tables;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- *num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- board_gpio_tables = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return board_gpio_tables;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23881">change 23881</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23881"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I401905685cc3078df657919b162272c3de320296 </div>
<div style="display:none"> Gerrit-Change-Number: 23881 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pan Sheng-Liang <sl.pan.quantw@gmail.com> </div>