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

mb/google/zork: Clean up bt reset_gpio removal 

Clean up of bt reset_gpio removal function.

TEST=Boot and observe log showing bt reset_gpio was removed
BUG=b:157580724 - Add reset_gpio for Bluetooth

Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: I1d40ad16dd3c624d4be89d9eea1835cc4e72c03d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44273
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Rob Barnes 2020-08-06 12:31:41 -06:00 committed by Aaron Durbin
parent 87093758c5
commit bb56ad449c
1 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/mainboard/google/zork/variants/baseboard/ramstage_common.c
View File

@ -127,81 +127,80 @@ void variant_audio_update(void)
update_hp_int_odl(); update_hp_int_odl();
} }
static const struct device_path xhci0_bt_path[] = {
{
.type = DEVICE_PATH_PCI,
.pci.devfn = PCIE_GPP_A_DEVFN
},
{
.type = DEVICE_PATH_PCI,
.pci.devfn = XHCI0_DEVFN
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 0,
.usb.port_id = 0
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 2,
.usb.port_id = 5
}
};
static const struct device_path xhci1_bt_path[] = {
{
.type = DEVICE_PATH_PCI,
.pci.devfn = PCIE_GPP_A_DEVFN
},
{
.type = DEVICE_PATH_PCI,
.pci.devfn = XHCI1_DEVFN
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 0,
.usb.port_id = 0
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 2,
.usb.port_id = 1
}
};
/* /*
* Removes reset_gpio from bluetooth device in device tree. * Removes reset_gpio from usb device in device tree.
* *
* The bluetooth device may be on XHCI0 or XHCI1 depending on SOC. * debug_device_name is used for debug messaging only.
* There's no harm in removing from both here.
*/ */
static void baseboard_remove_bluetooth_reset_gpio(void) static void remove_usb_device_reset_gpio(const struct device_path usb_path[],
size_t path_length, const char *debug_device_name)
{ {
const struct device *xhci0_bt_dev, *xhci1_bt_dev;
struct drivers_usb_acpi_config *xhci0_bt_cfg, *xhci1_bt_cfg;
xhci0_bt_dev = find_dev_nested_path( const struct device *usb_dev;
pci_root_bus(), xhci0_bt_path, ARRAY_SIZE(xhci0_bt_path)); struct drivers_usb_acpi_config *usb_cfg;
if (!xhci0_bt_dev) {
printk(BIOS_ERR, "%s: Failed to find bluetooth device on XHCI0!", __func__); usb_dev = find_dev_nested_path(pci_root_bus(), usb_path, path_length);
if (!usb_dev) {
printk(BIOS_ERR, "%s: Failed to find %s!", __func__, debug_device_name);
return; return;
} }
/* config_of dies on failure, so a NULL check is not required */ /* config_of dies on failure, so a NULL check is not required */
xhci0_bt_cfg = config_of(xhci0_bt_dev); usb_cfg = config_of(usb_dev);
xhci0_bt_cfg->reset_gpio.pin_count = 0; usb_cfg->reset_gpio.pin_count = 0;
}
/* There's no bluetooth device on XHCI1 on Dalboz */ /*
if (CONFIG(BOARD_GOOGLE_BASEBOARD_DALBOZ)) * The bluetooth device may be on XHCI0 or XHCI1 depending on SOC.
return; * There's no harm in removing reset_gpio from both here.
*/
static void baseboard_trembyle_remove_bluetooth_reset_gpio(void)
{
static const struct device_path xhci0_bt_path[] = {
{
.type = DEVICE_PATH_PCI,
.pci.devfn = PCIE_GPP_A_DEVFN
},
{
.type = DEVICE_PATH_PCI,
.pci.devfn = XHCI0_DEVFN
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 0,
.usb.port_id = 0
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 2,
.usb.port_id = 5
}
};
static const struct device_path xhci1_bt_path[] = {
{
.type = DEVICE_PATH_PCI,
.pci.devfn = PCIE_GPP_A_DEVFN
},
{
.type = DEVICE_PATH_PCI,
.pci.devfn = XHCI1_DEVFN
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 0,
.usb.port_id = 0
},
{
.type = DEVICE_PATH_USB,
.usb.port_type = 2,
.usb.port_id = 1
}
};
xhci1_bt_dev = find_dev_nested_path( remove_usb_device_reset_gpio(xhci0_bt_path, ARRAY_SIZE(xhci0_bt_path),
pci_root_bus(), xhci1_bt_path, ARRAY_SIZE(xhci1_bt_path)); "XHCI0 Bluetoth USB Device");
if (!xhci1_bt_dev) { remove_usb_device_reset_gpio(xhci1_bt_path, ARRAY_SIZE(xhci1_bt_path),
printk(BIOS_ERR, "%s: Failed to find bluetooth device on XHCI1!", __func__); "XHCI1 Bluetoth USB Device");
return;
}
xhci1_bt_cfg = config_of(xhci1_bt_dev);
xhci1_bt_cfg->reset_gpio.pin_count = 0;
} }
void variant_bluetooth_update(void) void variant_bluetooth_update(void)
@ -209,7 +208,7 @@ void variant_bluetooth_update(void)
if (CONFIG(BOARD_GOOGLE_BASEBOARD_DALBOZ) || variant_uses_v3_schematics()) if (CONFIG(BOARD_GOOGLE_BASEBOARD_DALBOZ) || variant_uses_v3_schematics())
return; return;
baseboard_remove_bluetooth_reset_gpio(); baseboard_trembyle_remove_bluetooth_reset_gpio();
} }
void variant_touchscreen_update(void) void variant_touchscreen_update(void)