<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29912">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;">mb/google/fizz/variants/karma: Update USB port info<br><br>Update USB port info according to the schematic file.<br><br>BUG=none<br>BRANCH=master<br>TEST=Compiles successfully and boot on DUT.<br><br>Change-Id: I7383b3d676fd7c775a6d749c70af65b28cf941eb<br>Signed-off-by: David Wu <David_Wu@quanta.corp-partner.google.com><br>Reviewed-on: https://review.coreboot.org/c/29912<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/fizz/variants/baseboard/devicetree.cb<br>M src/mainboard/google/fizz/variants/fizz/overridetree.cb<br>M src/mainboard/google/fizz/variants/karma/overridetree.cb<br>3 files changed, 30 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>index 45997a9..cc48498 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>+++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>@@ -345,11 +345,6 @@</span><br><span> device usb 2.1 on end</span><br><span> end</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(0, 100%, 40%);">- register "desc" = ""USB2 Type-A Front Right""</span><br><span style="color: hsl(0, 100%, 40%);">- register "type" = "UPC_TYPE_A"</span><br><span style="color: hsl(0, 100%, 40%);">- device usb 2.2 on end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">- chip drivers/usb/acpi</span><br><span> register "desc" = ""USB2 Type-A Rear Right""</span><br><span> register "type" = "UPC_TYPE_A"</span><br><span> device usb 2.4 on end</span><br><span>@@ -375,11 +370,6 @@</span><br><span> device usb 3.1 on end</span><br><span> end</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(0, 100%, 40%);">- register "desc" = ""USB3 Type-A Front Right""</span><br><span style="color: hsl(0, 100%, 40%);">- register "type" = "UPC_TYPE_USB3_A"</span><br><span style="color: hsl(0, 100%, 40%);">- device usb 3.2 on end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">- chip drivers/usb/acpi</span><br><span> register "desc" = ""USB3 Type-A Rear Right""</span><br><span> register "type" = "UPC_TYPE_USB3_A"</span><br><span> device usb 3.4 on end</span><br><span>diff --git a/src/mainboard/google/fizz/variants/fizz/overridetree.cb b/src/mainboard/google/fizz/variants/fizz/overridetree.cb</span><br><span>index 05d8a97..2b30905 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/fizz/overridetree.cb</span><br><span>+++ b/src/mainboard/google/fizz/variants/fizz/overridetree.cb</span><br><span>@@ -8,11 +8,21 @@</span><br><span> chip drivers/usb/acpi</span><br><span> device usb 0.0 on</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""USB2 Type-A Front Right""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "type" = "UPC_TYPE_A"</span><br><span style="color: hsl(120, 100%, 40%);">+ device usb 2.2 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/usb/acpi</span><br><span> register "desc" = ""USB2 Type-A Front Left""</span><br><span> register "type" = "UPC_TYPE_A"</span><br><span> device usb 2.3 on end</span><br><span> end</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""USB3 Type-A Front Right""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "type" = "UPC_TYPE_USB3_A"</span><br><span style="color: hsl(120, 100%, 40%);">+ device usb 3.2 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/usb/acpi</span><br><span> register "desc" = ""USB3 Type-A Front Left""</span><br><span> register "type" = "UPC_TYPE_USB3_A"</span><br><span> device usb 3.3 on end</span><br><span>diff --git a/src/mainboard/google/fizz/variants/karma/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb</span><br><span>index ee88352..0273f78 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/karma/overridetree.cb</span><br><span>+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb</span><br><span>@@ -4,12 +4,17 @@</span><br><span> #+----------------+-------+-----------------------------------+</span><br><span> #| Device | Port# | Rev |</span><br><span> #+----------------+-------+-----------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ #| USB A Side | 3 | 2/3 |</span><br><span> #| SD Card | 4 | |</span><br><span style="color: hsl(120, 100%, 40%);">+ #| Camera | 8 | |</span><br><span> #| Touchsreen | 10 | |</span><br><span> #+----------------+-------+-----------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ register "usb2_ports[2]" = "USB2_PORT_MID(OC2)" # Type-A Side</span><br><span> register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Card reader</span><br><span style="color: hsl(120, 100%, 40%);">+ register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera</span><br><span> register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Touchscreen</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC2)" # Type-A Side</span><br><span> register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Card reader</span><br><span> </span><br><span> register "psys_pmax" = "151"</span><br><span>@@ -19,16 +24,31 @@</span><br><span> chip drivers/usb/acpi</span><br><span> device usb 0.0 on</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""USB2 Type-A Side""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "type" = "UPC_TYPE_A"</span><br><span style="color: hsl(120, 100%, 40%);">+ device usb 2.2 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/usb/acpi</span><br><span> register "desc" = ""USB2 SD Card""</span><br><span> register "type" = "UPC_TYPE_INTERNAL"</span><br><span> device usb 2.3 on end</span><br><span> end</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""USB2 Camera""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "type" = "UPC_TYPE_INTERNAL"</span><br><span style="color: hsl(120, 100%, 40%);">+ device usb 2.7 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/usb/acpi</span><br><span> register "desc" = ""USB2 Touchscreen""</span><br><span> register "type" = "UPC_TYPE_INTERNAL"</span><br><span> device usb 2.9 on end</span><br><span> end</span><br><span> chip drivers/usb/acpi</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""USB3 Type-A Side""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "type" = "UPC_TYPE_USB3_A"</span><br><span style="color: hsl(120, 100%, 40%);">+ device usb 3.2 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/usb/acpi</span><br><span> register "desc" = ""USB3 SD Card""</span><br><span> register "type" = "UPC_TYPE_INTERNAL"</span><br><span> device usb 3.3 on end</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29912">change 29912</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/+/29912"/><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: I7383b3d676fd7c775a6d749c70af65b28cf941eb </div>
<div style="display:none"> Gerrit-Change-Number: 29912 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: David Wu <david_wu@quanta.corp-partner.google.com> </div>
<div style="display:none"> Gerrit-Reviewer: David Wu <david_wu@quanta.corp-partner.google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Shelley Chen <shchen@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Zhuohao Lee <zhuohao@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>