[coreboot-gerrit] Change in ...coreboot[master]: mb/google/fizz/variants/karma: Update USB port info
Patrick Georgi (Code Review)
gerrit at coreboot.org
Mon Dec 3 14:07:16 CET 2018
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29912 )
Change subject: mb/google/fizz/variants/karma: Update USB port info
......................................................................
mb/google/fizz/variants/karma: Update USB port info
Update USB port info according to the schematic file.
BUG=none
BRANCH=master
TEST=Compiles successfully and boot on DUT.
Change-Id: I7383b3d676fd7c775a6d749c70af65b28cf941eb
Signed-off-by: David Wu <David_Wu at quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/29912
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Furquan Shaikh <furquan at google.com>
---
M src/mainboard/google/fizz/variants/baseboard/devicetree.cb
M src/mainboard/google/fizz/variants/fizz/overridetree.cb
M src/mainboard/google/fizz/variants/karma/overridetree.cb
3 files changed, 30 insertions(+), 10 deletions(-)
Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
index 45997a9..cc48498 100644
--- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
@@ -345,11 +345,6 @@
device usb 2.1 on end
end
chip drivers/usb/acpi
- register "desc" = ""USB2 Type-A Front Right""
- register "type" = "UPC_TYPE_A"
- device usb 2.2 on end
- end
- chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Rear Right""
register "type" = "UPC_TYPE_A"
device usb 2.4 on end
@@ -375,11 +370,6 @@
device usb 3.1 on end
end
chip drivers/usb/acpi
- register "desc" = ""USB3 Type-A Front Right""
- register "type" = "UPC_TYPE_USB3_A"
- device usb 3.2 on end
- end
- chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Rear Right""
register "type" = "UPC_TYPE_USB3_A"
device usb 3.4 on end
diff --git a/src/mainboard/google/fizz/variants/fizz/overridetree.cb b/src/mainboard/google/fizz/variants/fizz/overridetree.cb
index 05d8a97..2b30905 100644
--- a/src/mainboard/google/fizz/variants/fizz/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/fizz/overridetree.cb
@@ -8,11 +8,21 @@
chip drivers/usb/acpi
device usb 0.0 on
chip drivers/usb/acpi
+ register "desc" = ""USB2 Type-A Front Right""
+ register "type" = "UPC_TYPE_A"
+ device usb 2.2 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB2 Type-A Front Left""
register "type" = "UPC_TYPE_A"
device usb 2.3 on end
end
chip drivers/usb/acpi
+ register "desc" = ""USB3 Type-A Front Right""
+ register "type" = "UPC_TYPE_USB3_A"
+ device usb 3.2 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB3 Type-A Front Left""
register "type" = "UPC_TYPE_USB3_A"
device usb 3.3 on end
diff --git a/src/mainboard/google/fizz/variants/karma/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb
index ee88352..0273f78 100644
--- a/src/mainboard/google/fizz/variants/karma/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb
@@ -4,12 +4,17 @@
#+----------------+-------+-----------------------------------+
#| Device | Port# | Rev |
#+----------------+-------+-----------------------------------+
+ #| USB A Side | 3 | 2/3 |
#| SD Card | 4 | |
+ #| Camera | 8 | |
#| Touchsreen | 10 | |
#+----------------+-------+-----------------------------------+
+ register "usb2_ports[2]" = "USB2_PORT_MID(OC2)" # Type-A Side
register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Card reader
+ register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera
register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Touchscreen
+ register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC2)" # Type-A Side
register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Card reader
register "psys_pmax" = "151"
@@ -19,16 +24,31 @@
chip drivers/usb/acpi
device usb 0.0 on
chip drivers/usb/acpi
+ register "desc" = ""USB2 Type-A Side""
+ register "type" = "UPC_TYPE_A"
+ device usb 2.2 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB2 SD Card""
register "type" = "UPC_TYPE_INTERNAL"
device usb 2.3 on end
end
chip drivers/usb/acpi
+ register "desc" = ""USB2 Camera""
+ register "type" = "UPC_TYPE_INTERNAL"
+ device usb 2.7 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB2 Touchscreen""
register "type" = "UPC_TYPE_INTERNAL"
device usb 2.9 on end
end
chip drivers/usb/acpi
+ register "desc" = ""USB3 Type-A Side""
+ register "type" = "UPC_TYPE_USB3_A"
+ device usb 3.2 on end
+ end
+ chip drivers/usb/acpi
register "desc" = ""USB3 SD Card""
register "type" = "UPC_TYPE_INTERNAL"
device usb 3.3 on end
--
To view, visit https://review.coreboot.org/c/coreboot/+/29912
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7383b3d676fd7c775a6d749c70af65b28cf941eb
Gerrit-Change-Number: 29912
Gerrit-PatchSet: 3
Gerrit-Owner: David Wu <david_wu at quanta.corp-partner.google.com>
Gerrit-Reviewer: David Wu <david_wu at quanta.corp-partner.google.com>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Shelley Chen <shchen at google.com>
Gerrit-Reviewer: Zhuohao Lee <zhuohao at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181203/5abf1ee6/attachment.html>
More information about the coreboot-gerrit
mailing list