Change in ...coreboot[master]: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree
Aamir Bohra has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33060
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree
Hatch newer board revision do not use USB port5 for discrete BT. Hence remove the port configuration and UBS2 P5 asl entry. The older board version would continue to use USB2 P5 hence moved the entry to overridetree.cb
Change-Id: I98297d6b81e3184b7b0a14710f3790f5df30d68b Signed-off-by: Aamir Bohra aamir.bohra@intel.com --- M src/mainboard/google/hatch/variants/baseboard/devicetree.cb M src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb 2 files changed, 104 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/33060/1
diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb index 9d10cac..0bbb17d 100644 --- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb @@ -56,12 +56,12 @@ register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 1 register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)" # Type-A Port 0 register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)" # Type-A Port 1 - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # BT + register "usb2_ports[4]" = "USB2_PORT_EMPTY" register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # WWAN register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)" # Camera register "usb2_ports[7]" = "USB2_PORT_EMPTY" register "usb2_ports[8]" = "USB2_PORT_EMPTY" - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # CnVi BT + register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # BT
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 0 register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 1 @@ -141,12 +141,6 @@ device usb 2.3 on end end chip drivers/usb/acpi - register "desc" = ""Discrete bluetooth"" - register "type" = "UPC_TYPE_INTERNAL" - register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" - device usb 2.4 on end - end - chip drivers/usb/acpi register "desc" = ""WWAN"" register "type" = "UPC_TYPE_INTERNAL" device usb 2.5 on end @@ -157,7 +151,7 @@ device usb 2.6 on end end chip drivers/usb/acpi - register "desc" = ""Integrated CnVi bluetooth"" + register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" device usb 2.9 on end diff --git a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb index eec7880..d70413b 100644 --- a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb @@ -32,7 +32,108 @@ # GPIO for SD card detect register "sdcard_cd_gpio" = "vSD3_CD_B"
+ register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 0 + register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 1 + register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)" # Type-A Port 0 + register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)" # Type-A Port 1 + register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # BT + register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # WWAN + register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)" # Camera + register "usb2_ports[7]" = "USB2_PORT_EMPTY" + register "usb2_ports[8]" = "USB2_PORT_EMPTY" + register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # CnVi BT + + register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 0 + register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 1 + register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 0 + register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 1 + register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC_SKIP)" # WWAN + register "usb3_ports[5]" = "USB3_PORT_EMPTY" + device domain 0 on + device pci 14.0 on + chip drivers/usb/acpi + register "desc" = ""Root Hub"" + register "type" = "UPC_TYPE_HUB" + device usb 0.0 on + chip drivers/usb/acpi + register "desc" = ""Left Type-C Port"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(1, 1)" + device usb 2.0 on end + end + chip drivers/usb/acpi + register "desc" = ""Right Type-C Port 1"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(2, 1)" + device usb 2.1 on end + end + chip drivers/usb/acpi + register "desc" = ""Left Type-A Port"" + register "type" = "UPC_TYPE_A" + register "group" = "ACPI_PLD_GROUP(1, 2)" + device usb 2.2 on end + end + chip drivers/usb/acpi + register "desc" = ""Right Type-A Port 1"" + register "type" = "UPC_TYPE_A" + register "group" = "ACPI_PLD_GROUP(2, 2)" + device usb 2.3 on end + end + chip drivers/usb/acpi + register "desc" = ""Discrete bluetooth"" + register "type" = "UPC_TYPE_INTERNAL" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" + device usb 2.4 on end + end + chip drivers/usb/acpi + register "desc" = ""WWAN"" + register "type" = "UPC_TYPE_INTERNAL" + device usb 2.5 on end + end + chip drivers/usb/acpi + register "desc" = ""Camera"" + register "type" = "UPC_TYPE_INTERNAL" + device usb 2.6 on end + end + chip drivers/usb/acpi + register "desc" = ""Integrated CnVi bluetooth"" + register "type" = "UPC_TYPE_INTERNAL" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" + device usb 2.9 on end + end + chip drivers/usb/acpi + register "desc" = ""Left Type-C Port"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(1, 1)" + device usb 3.0 on end + end + chip drivers/usb/acpi + register "desc" = ""Right Type-C Port 1"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(2, 1)" + device usb 3.1 on end + end + chip drivers/usb/acpi + register "desc" = ""Left Type-A Port"" + register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(1, 2)" + device usb 3.2 on end + end + chip drivers/usb/acpi + register "desc" = ""Right Type-A Port 1"" + register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(2, 2)" + device usb 3.3 on end + end + chip drivers/usb/acpi + register "desc" = ""WWAN"" + register "type" = "UPC_TYPE_INTERNAL" + device usb 3.4 on end + end + end + end + end # USB xHCI device pci 15.0 on chip drivers/i2c/generic register "hid" = ""ELAN0000""
Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1: Code-Review+1
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 35: register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 0 : register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 1 : register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)" # Type-A Port 0 : register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)" # Type-A Port 1 : register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # BT : register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # WWAN : register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)" # Camera : register "usb2_ports[7]" = "USB2_PORT_EMPTY" : register "usb2_ports[8]" = "USB2_PORT_EMPTY" : register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # CnVi BT : : register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 0 : register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 1 : register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 0 : register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 1 : register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC_SKIP)" # WWAN : register "usb3_ports[5]" = "USB3_PORT_EMPTY" Please only update items that differ from the baseboard device tree.
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI Am I missing something? Aren't these entries already in the baseboard device tree? If you're just keeping the bluetooth on port 10, then you don't need the other entries.
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 35: register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 0 : register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 1 : register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)" # Type-A Port 0 : register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)" # Type-A Port 1 : register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # BT : register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # WWAN : register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)" # Camera : register "usb2_ports[7]" = "USB2_PORT_EMPTY" : register "usb2_ports[8]" = "USB2_PORT_EMPTY" : register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # CnVi BT : : register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 0 : register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 1 : register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 0 : register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port 1 : register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC_SKIP)" # WWAN : register "usb3_ports[5]" = "USB3_PORT_EMPTY"
Please only update items that differ from the baseboard device tree.
I wanted to keep the entire OC configuration in overridetree.cb and not split the configuration between baseboard and override for complete configuration view. I see the static.c gets the updated configuration list. Thoughts?
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI
Am I missing something? Aren't these entries already in the baseboard device tree? If you're just […]
Same reason wanted to keep entire device configuration specific to xhci controller. The baseboard entry does not have the USB2 P5 entry and override still keeps it for hatch whl.
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
Hi All, please help view the CL, let me know if there any further opens.
Thanks.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI
Same reason wanted to keep entire device configuration specific to xhci controller. […]
Wouldn't that mean that if something has to be changed or fixed in these configurations, it will have to be done for every overridetree?
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI
Wouldn't that mean that if something has to be changed or fixed in these configurations, it will hav […]
Not sure I understood, but the changes here are in override tree(specific to proto boards) and the baseboard devicetree.cb just removes the USB2 P5 entry, so if other variants dont override, it would follow the baseboard devicetree. right?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI
Not sure I understood, but the changes here are in override tree(specific to proto boards) and the b […]
What I meant is -- if all the devices are added to override tree, then you would end up duplicating almost all USB devices for different variants, which is not very helpful from code maintenance standpoint.
Hello Paul Fagerburg, Subrata Banik, Tim Wawrzynczak, Shelley Chen, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33060
to look at the new patch set (#2).
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree
Hatch newer board revision do not use USB port5 for discrete BT. Hence remove the port configuration and UBS2 P5 asl entry. The older board version would continue to use USB2 P5 hence moved the entry to overridetree.cb
Change-Id: I98297d6b81e3184b7b0a14710f3790f5df30d68b Signed-off-by: Aamir Bohra aamir.bohra@intel.com --- M src/mainboard/google/hatch/variants/baseboard/devicetree.cb M src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb 2 files changed, 20 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/33060/2
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... File src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb:
https://review.coreboot.org/#/c/33060/1/src/mainboard/google/hatch/variants/... PS1, Line 54: device pci 14.0 on : chip drivers/usb/acpi : register "desc" = ""Root Hub"" : register "type" = "UPC_TYPE_HUB" : device usb 0.0 on : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 2.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 2.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 2.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 2.3 on end : end : chip drivers/usb/acpi : register "desc" = ""Discrete bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.4 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.5 on end : end : chip drivers/usb/acpi : register "desc" = ""Camera"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 2.6 on end : end : chip drivers/usb/acpi : register "desc" = ""Integrated CnVi bluetooth"" : register "type" = "UPC_TYPE_INTERNAL" : register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" : device usb 2.9 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-C Port"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(1, 1)" : device usb 3.0 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-C Port 1"" : register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" : register "group" = "ACPI_PLD_GROUP(2, 1)" : device usb 3.1 on end : end : chip drivers/usb/acpi : register "desc" = ""Left Type-A Port"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(1, 2)" : device usb 3.2 on end : end : chip drivers/usb/acpi : register "desc" = ""Right Type-A Port 1"" : register "type" = "UPC_TYPE_USB3_A" : register "group" = "ACPI_PLD_GROUP(2, 2)" : device usb 3.3 on end : end : chip drivers/usb/acpi : register "desc" = ""WWAN"" : register "type" = "UPC_TYPE_INTERNAL" : device usb 3.4 on end : end : end : end : end # USB xHCI
What I meant is -- if all the devices are added to override tree, then you would end up duplicating […]
Ok, Revised under PS#2
Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 2: Code-Review+1
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 2: Code-Review+2
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
Patch Set 2: Code-Review+2
Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33060 )
Change subject: mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree ......................................................................
mb/google/hatch: Remove unused USB2 port5 from baseboard devicetree
Hatch newer board revision do not use USB port5 for discrete BT. Hence remove the port configuration and UBS2 P5 asl entry. The older board version would continue to use USB2 P5 hence moved the entry to overridetree.cb
Change-Id: I98297d6b81e3184b7b0a14710f3790f5df30d68b Signed-off-by: Aamir Bohra aamir.bohra@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/33060 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Fagerburg pfagerburg@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Subrata Banik subrata.banik@intel.com --- M src/mainboard/google/hatch/variants/baseboard/devicetree.cb M src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb 2 files changed, 20 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Subrata Banik: Looks good to me, approved Paul Fagerburg: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb index 112c279..a66c743 100644 --- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb @@ -56,12 +56,12 @@ register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)" # Type-C Port 1 register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)" # Type-A Port 0 register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)" # Type-A Port 1 - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # BT + register "usb2_ports[4]" = "USB2_PORT_EMPTY" register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # WWAN register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)" # Camera register "usb2_ports[7]" = "USB2_PORT_EMPTY" register "usb2_ports[8]" = "USB2_PORT_EMPTY" - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # CnVi BT + register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # BT
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 0 register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # Type-C Port 1 @@ -145,12 +145,6 @@ device usb 2.3 on end end chip drivers/usb/acpi - register "desc" = ""Discrete bluetooth"" - register "type" = "UPC_TYPE_INTERNAL" - register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" - device usb 2.4 on end - end - chip drivers/usb/acpi register "desc" = ""WWAN"" register "type" = "UPC_TYPE_INTERNAL" device usb 2.5 on end @@ -161,7 +155,7 @@ device usb 2.6 on end end chip drivers/usb/acpi - register "desc" = ""Integrated CnVi bluetooth"" + register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" device usb 2.9 on end diff --git a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb index fe7869d..373438c 100644 --- a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb @@ -32,7 +32,24 @@ # GPIO for SD card detect register "sdcard_cd_gpio" = "vSD3_CD_B"
+ # USB configuration + register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # Discrete BT + device domain 0 on + device pci 14.0 on + chip drivers/usb/acpi + register "desc" = ""Root Hub"" + register "type" = "UPC_TYPE_HUB" + device usb 0.0 on + chip drivers/usb/acpi + register "desc" = ""Discrete bluetooth"" + register "type" = "UPC_TYPE_INTERNAL" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)" + device usb 2.4 on end + end + end + end + end # USB xHCI device pci 15.0 on chip drivers/i2c/generic register "hid" = ""ELAN0000""
-
Aamir Bohra (Code Review) -
Furquan Shaikh (Code Review)
-
Paul Fagerburg (Code Review)
-
Subrata Banik (Code Review)
-
Tim Wawrzynczak (Code Review)