<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22860">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Update overcurrent pins<br><br>The overcurrent pins on kahlee weren't mapped correctly, causing<br>the USB-A port to stop working.<br><br>None of the EHCI only ports are used for external connectors, so all<br>of the overcurrent pins should go to the XHCI connections.  This is<br>also true of the Grunt board.<br><br>On Grunt, this also means that we don't need OC3, as it doesn't map<br>to anything in the XHCI controller, as it's coming from an internal<br>hub.<br><br>BUG=b:70636233<br>TEST=Build & boot Kahlee, verify USB-A port is working again.<br><br>Change-Id: I53336a18a26bd9be27c7265fddbcd780632656bf<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>M src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>2 files changed, 8 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/22860/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>index c2ec65f..250fcc1 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>@@ -324,18 +324,15 @@<br> <br> int __attribute__((weak)) variant_get_xhci_oc_map(uint16_t *map)<br> {<br>-     *map =  USB_OC0 << OC_PORT0_SHIFT; /* USB-C Port0 = OC0 */<br>-     *map |= USB_OC1 << OC_PORT1_SHIFT; /* USB-C Port1 = OC1 */<br>-     *map |= USB_OC_DISABLE << OC_PORT2_SHIFT;<br>+      *map =  USB_OC0 << OC_PORT0_SHIFT; /* USB-C Port0/4 = OC0 */<br>+   *map |= USB_OC1 << OC_PORT1_SHIFT; /* USB-C Port1/5 = OC1 */<br>+   *map |= USB_OC2 << OC_PORT2_SHIFT; /* USB-A HUB Port2/6 = OC2 */<br>        *map |= USB_OC_DISABLE << OC_PORT3_SHIFT;<br>       return 0;<br> }<br> <br> int __attribute__((weak)) variant_get_ehci_oc_map(uint16_t *map)<br> {<br>-      *map =  USB_OC2 << OC_PORT0_SHIFT; /* USB-A Port0 = OC2 */<br>-     *map |= USB_OC3 << OC_PORT1_SHIFT; /* USB-A Port1 = OC3 */<br>-     *map |= USB_OC_DISABLE << OC_PORT2_SHIFT;<br>-      *map |= USB_OC_DISABLE << OC_PORT3_SHIFT;<br>+      *map = USB_OC_DISABLE_ALL;<br>    return 0;<br> }<br>diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>index 14424b7..e5e15e6 100644<br>--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>@@ -151,18 +151,15 @@<br> <br> int variant_get_xhci_oc_map(uint16_t *map)<br> {<br>-    *map = USB_OC0 << OC_PORT0_SHIFT; /* USB-C Port0 = OC0 */<br>-      *map |= USB_OC1 << OC_PORT1_SHIFT;        /* USB-C Port1 = OC1 */<br>-      *map |= USB_OC_DISABLE << OC_PORT2_SHIFT;<br>+      *map = USB_OC2 << OC_PORT0_SHIFT; /* USB-A Port0/4 = OC2 */<br>+    *map |= USB_OC0 << OC_PORT1_SHIFT;        /* USB-C Port1/5 = OC0 */<br>+    *map |= USB_OC1 << OC_PORT2_SHIFT;        /* USB-C Port2/6 = OC1 */<br>     *map |= USB_OC_DISABLE << OC_PORT3_SHIFT;<br>       return 0;<br> }<br> <br> int variant_get_ehci_oc_map(uint16_t *map)<br> {<br>-    *map = USB_OC2 << OC_PORT0_SHIFT; /* USB-A Port0 = OC2 */<br>-      *map |= USB_OC_DISABLE << OC_PORT1_SHIFT;<br>-      *map |= USB_OC_DISABLE << OC_PORT2_SHIFT;<br>-      *map |= USB_OC_DISABLE << OC_PORT3_SHIFT;<br>+      *map = USB_OC_DISABLE_ALL;<br>    return 0;<br> }<br></pre><p>To view, visit <a href="https://review.coreboot.org/22860">change 22860</a>. To unsubscribe, 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/22860"/><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: I53336a18a26bd9be27c7265fddbcd780632656bf </div>
<div style="display:none"> Gerrit-Change-Number: 22860 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>