From ac5d5172ab3c10567eaa71d8a8ca9891e6c492bd Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 2 Oct 2024 13:53:33 +0100 Subject: drivers/usb/acpi: Move the CNMT Mutex to USB The Intel Bluetooth driver can be combined with either CNVi, or full PCI wireless cards such as the AX210. Move it to the USB code so it can be used by either or. Change-Id: Ib456b1870501182b2d8788e5d53bbf4d7981f91b Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/84627 Reviewed-by: Nicholas Sudsgaard Tested-by: build bot (Jenkins) --- src/soc/intel/common/block/cnvi/cnvi.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index e8613101ef..cf46fdb206 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -12,21 +12,6 @@ static const char *cnvi_wifi_acpi_name(const struct device *dev) return "CNVW"; } -static void cnvw_fill_ssdt(const struct device *dev) -{ - const char *scope = acpi_device_path(dev); - - acpi_device_write_pci_dev(dev); - - acpigen_write_scope(scope); -/* - * Mutex (CNMT, 0) - */ - acpigen_write_mutex("CNMT", 0); - - acpigen_write_scope_end(); -} - static struct device_operations cnvi_wifi_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -34,7 +19,7 @@ static struct device_operations cnvi_wifi_ops = { .ops_pci = &pci_dev_ops_pci, .scan_bus = scan_static_bus, .acpi_name = cnvi_wifi_acpi_name, - .acpi_fill_ssdt = cnvw_fill_ssdt, + .acpi_fill_ssdt = acpi_device_write_pci_dev, }; static const unsigned short wifi_pci_device_ids[] = { -- cgit v1.2.3