summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ruth <druth@chromium.org>2024-01-05 19:44:45 +0000
committerFelix Held <felix-coreboot@felixheld.de>2024-01-10 16:41:45 +0000
commit4b957b966543168d70fc3c07511595d33af76059 (patch)
treee85558acafcc62095ad93f5708ee7960818641da
parent1b558ebbf538ac18b55df7c1dc26685c534bd220 (diff)
mb/google/byra/var/*: Set WLAN device type back to pci
This partially reverts commit f493857c9bc1 ("mb/google/brya/var/*: Set dGPU/LAN/WLAN device type to generic"). Setting the WLAN device type to generic broke ACPI SSDT table definition, so set it back to pci. BUG=b:318576073 TEST=build/boot google/nissa (pujjo), verify WLAN ACPI SSDT tables contain the appropriate device entry. Change-Id: If5dad9deb040c8cb0c507e11726f0ba44ccb2909 Signed-off-by: David Ruth <druth@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79794 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
-rw-r--r--src/mainboard/google/brya/variants/gothrax/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/joxer/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/kinox/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/marasov/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/nereid/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/pujjo/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/quandiso/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/xivu/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/yaviks/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/yavilla/overridetree.cb2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/mainboard/google/brya/variants/gothrax/overridetree.cb b/src/mainboard/google/brya/variants/gothrax/overridetree.cb
index 14d92159f9..bb333aaebe 100644
--- a/src/mainboard/google/brya/variants/gothrax/overridetree.cb
+++ b/src/mainboard/google/brya/variants/gothrax/overridetree.cb
@@ -337,7 +337,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 on
diff --git a/src/mainboard/google/brya/variants/joxer/overridetree.cb b/src/mainboard/google/brya/variants/joxer/overridetree.cb
index e06b778eb3..7b43f86761 100644
--- a/src/mainboard/google/brya/variants/joxer/overridetree.cb
+++ b/src/mainboard/google/brya/variants/joxer/overridetree.cb
@@ -330,7 +330,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 off end # PCIE7 no SD card
diff --git a/src/mainboard/google/brya/variants/kinox/overridetree.cb b/src/mainboard/google/brya/variants/kinox/overridetree.cb
index 567f878d54..fcca3d89f5 100644
--- a/src/mainboard/google/brya/variants/kinox/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kinox/overridetree.cb
@@ -247,7 +247,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
chip soc/intel/common/block/pcie/rtd3
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B11)"
diff --git a/src/mainboard/google/brya/variants/marasov/overridetree.cb b/src/mainboard/google/brya/variants/marasov/overridetree.cb
index 6c1f3f9341..3ea7092b70 100644
--- a/src/mainboard/google/brya/variants/marasov/overridetree.cb
+++ b/src/mainboard/google/brya/variants/marasov/overridetree.cb
@@ -328,7 +328,7 @@ chip soc/intel/alderlake
}"
chip drivers/wifi/generic
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp8 off end
diff --git a/src/mainboard/google/brya/variants/nereid/overridetree.cb b/src/mainboard/google/brya/variants/nereid/overridetree.cb
index 5de5c1bb62..9d9b871d0a 100644
--- a/src/mainboard/google/brya/variants/nereid/overridetree.cb
+++ b/src/mainboard/google/brya/variants/nereid/overridetree.cb
@@ -209,7 +209,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pch_espi on
diff --git a/src/mainboard/google/brya/variants/pujjo/overridetree.cb b/src/mainboard/google/brya/variants/pujjo/overridetree.cb
index 59ab871229..51383e0b48 100644
--- a/src/mainboard/google/brya/variants/pujjo/overridetree.cb
+++ b/src/mainboard/google/brya/variants/pujjo/overridetree.cb
@@ -673,7 +673,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 on
diff --git a/src/mainboard/google/brya/variants/quandiso/overridetree.cb b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
index de48f2d586..c28cc0b8af 100644
--- a/src/mainboard/google/brya/variants/quandiso/overridetree.cb
+++ b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
@@ -373,7 +373,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 on
diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb
index 2e781a255d..be4d8dffe8 100644
--- a/src/mainboard/google/brya/variants/xivu/overridetree.cb
+++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb
@@ -376,7 +376,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
diff --git a/src/mainboard/google/brya/variants/yaviks/overridetree.cb b/src/mainboard/google/brya/variants/yaviks/overridetree.cb
index 580181c355..308ed1001e 100644
--- a/src/mainboard/google/brya/variants/yaviks/overridetree.cb
+++ b/src/mainboard/google/brya/variants/yaviks/overridetree.cb
@@ -450,7 +450,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 on
diff --git a/src/mainboard/google/brya/variants/yavilla/overridetree.cb b/src/mainboard/google/brya/variants/yavilla/overridetree.cb
index 4a96742a66..ee5a3b6b6a 100644
--- a/src/mainboard/google/brya/variants/yavilla/overridetree.cb
+++ b/src/mainboard/google/brya/variants/yavilla/overridetree.cb
@@ -496,7 +496,7 @@ chip soc/intel/alderlake
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_03"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end
device ref pcie_rp7 off end #PCIE7 no SD card