<p>Duncan Laurie <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29997">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/cannonlake: Add USB device names<br><br>Add the ACPI device names for the USB ports to match what<br>is in the DSDT so USB ports can be defined in the SSDT.<br><br>Change-Id: Ibb323bbd324811fa3178b0cba3d7f0a315169486<br>Signed-off-by: Duncan Laurie <dlaurie@google.com><br>Reviewed-on: https://review.coreboot.org/c/29997<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/soc/intel/cannonlake/chip.c<br>1 file changed, 37 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c</span><br><span>index 17b173a..4604d80 100644</span><br><span>--- a/src/soc/intel/cannonlake/chip.c</span><br><span>+++ b/src/soc/intel/cannonlake/chip.c</span><br><span>@@ -35,6 +35,43 @@</span><br><span> if (dev->path.type == DEVICE_PATH_DOMAIN)</span><br><span> return "PCI0";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (dev->path.type == DEVICE_PATH_USB) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (dev->path.usb.port_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Root Hub */</span><br><span style="color: hsl(120, 100%, 40%);">+ return "RHUB";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* USB2 ports */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (dev->path.usb.port_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0: return "HS01";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1: return "HS02";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2: return "HS03";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3: return "HS04";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 4: return "HS05";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 5: return "HS06";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 6: return "HS07";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 7: return "HS08";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 8: return "HS09";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 9: return "HS10";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 10: return "HS11";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 11: return "HS12";</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* USB3 ports */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (dev->path.usb.port_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0: return "SS01";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1: return "SS02";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2: return "SS03";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3: return "SS04";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 4: return "SS05";</span><br><span style="color: hsl(120, 100%, 40%);">+ case 5: return "SS06";</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (dev->path.type != DEVICE_PATH_PCI)</span><br><span> return NULL;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29997">change 29997</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/c/coreboot/+/29997"/><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-Change-Id: Ibb323bbd324811fa3178b0cba3d7f0a315169486 </div>
<div style="display:none"> Gerrit-Change-Number: 29997 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>