GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/dedede: Re-configure the USB ACPI objects 

In waddledee and waddledoo, discrete & integrated BT signals are routed to
different USB ports. In all the other variant boards, discrete &
integrated BT signals are routed to the same USB port (port 8 - index 7).
Re-configure the USB devices accordingly.

Also device configuration in override tree are applied only if there is a
matching device in base devicetree. So configure all the USB devices in
base devicetree and turn them off.

BUG=b:154064148
TEST=Ensure that the SSDT contains the ACPI objects for enabled USB
devices.

Change-Id: I1b8bf7f4db1d2661f310bf4874428a6d1de222c6
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42554
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Karthikeyan Ramasubramanian 2020-06-17 16:30:53 -06:00 committed by Patrick Georgi
parent 8d9a6f1625
commit f846d6951e
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mainboard/google/dedede/variants/baseboard/devicetree.cb
View File

@ -187,13 +187,16 @@ chip soc/intel/jasperlake
device usb 2.3 on end device usb 2.3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""Discrete Bluetooth"" device usb 2.4 off end
register "type" = "UPC_TYPE_INTERNAL"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)"
device usb 2.4 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""Integrated Bluetooth"" device usb 2.5 off end
end
chip drivers/usb/acpi
device usb 2.6 off end
end
chip drivers/usb/acpi
register "desc" = ""Bluetooth""
register "type" = "UPC_TYPE_INTERNAL" register "type" = "UPC_TYPE_INTERNAL"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)"
device usb 2.7 on end device usb 2.7 on end

18
src/mainboard/google/dedede/variants/waddledee/overridetree.cb
View File

@ -37,6 +37,24 @@ chip soc/intel/jasperlake
}" }"
device domain 0 on device domain 0 on
device pci 14.0 on
chip drivers/usb/acpi
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_H19)"
device usb 2.4 on end
end
chip drivers/usb/acpi
register "desc" = ""Integrated Bluetooth""
register "type" = "UPC_TYPE_INTERNAL"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)"
device usb 2.7 on end
end
end
end
end # USB xHCI
device pci 15.0 on device pci 15.0 on
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""PNP0C50"" register "generic.hid" = ""PNP0C50""

12
src/mainboard/google/dedede/variants/waddledoo/overridetree.cb
View File

@ -53,11 +53,23 @@ chip soc/intel/jasperlake
device pci 14.0 on device pci 14.0 on
chip drivers/usb/acpi chip drivers/usb/acpi
device usb 0.0 on 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_H19)"
device usb 2.4 on end
end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""Camera"" register "desc" = ""Camera""
register "type" = "UPC_TYPE_INTERNAL" register "type" = "UPC_TYPE_INTERNAL"
device usb 2.5 on end device usb 2.5 on end
end end
chip drivers/usb/acpi
register "desc" = ""Integrated Bluetooth""
register "type" = "UPC_TYPE_INTERNAL"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)"
device usb 2.7 on end
end
end end
end end
end # USB xHCI end # USB xHCI