From b3ffc323c02fd8e6f027dc5924ce6efeeb3347a3 Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 29 Nov 2018 10:49:34 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/29912 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- .../google/fizz/variants/baseboard/devicetree.cb | 10 ---------- .../google/fizz/variants/fizz/overridetree.cb | 10 ++++++++++ .../google/fizz/variants/karma/overridetree.cb | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb index 45997a99dd..cc48498dd1 100644 --- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb @@ -344,11 +344,6 @@ chip soc/intel/skylake register "type" = "UPC_TYPE_A" 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" @@ -374,11 +369,6 @@ chip soc/intel/skylake register "type" = "UPC_TYPE_USB3_A" 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" diff --git a/src/mainboard/google/fizz/variants/fizz/overridetree.cb b/src/mainboard/google/fizz/variants/fizz/overridetree.cb index 05d8a97560..2b3090502b 100644 --- a/src/mainboard/google/fizz/variants/fizz/overridetree.cb +++ b/src/mainboard/google/fizz/variants/fizz/overridetree.cb @@ -7,11 +7,21 @@ chip soc/intel/skylake device pci 14.0 on 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" diff --git a/src/mainboard/google/fizz/variants/karma/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb index ee88352d13..0273f78efd 100644 --- a/src/mainboard/google/fizz/variants/karma/overridetree.cb +++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb @@ -4,12 +4,17 @@ chip soc/intel/skylake #+----------------+-------+-----------------------------------+ #| 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" @@ -18,16 +23,31 @@ chip soc/intel/skylake device pci 14.0 on 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" -- cgit v1.2.3