mb/google/byra/var/*: Set LAN device type back to pci
This partially reverts commit f493857c9bc1 ("mb/google/brya/var/*: Set
dGPU/LAN/WLAN device type to generic"). Setting the LAN device type to
generic broke programming the LAN MAC address, so set it back to pci.
TEST=build/boot google/brya (osiris), verify LAN MAC address programmed
correctly.
Change-Id: I4fb43b7212e67b5c38724baad572860bc45b558e
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79150
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/brya/variants/agah/overridetree.cb b/src/mainboard/google/brya/variants/agah/overridetree.cb
index 7bea703..159c32d 100644
--- a/src/mainboard/google/brya/variants/agah/overridetree.cb
+++ b/src/mainboard/google/brya/variants/agah/overridetree.cb
@@ -232,7 +232,7 @@
register "wake" = "GPE0_DW0_07"
register "device_index" = "0"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end #RTL8111H Ethernet NIC
device ref pcie_rp4 off end
diff --git a/src/mainboard/google/brya/variants/aurash/overridetree.cb b/src/mainboard/google/brya/variants/aurash/overridetree.cb
index 09f7c66..2b9ebfe 100644
--- a/src/mainboard/google/brya/variants/aurash/overridetree.cb
+++ b/src/mainboard/google/brya/variants/aurash/overridetree.cb
@@ -163,7 +163,7 @@
.clk_req = 4,
.flags = PCIE_RP_LTR | PCIE_RP_AER,
}"
- device generic 0 on end
+ device pci 00.0 on end
end # IntelI225V Ethernet NIC
device ref pcie_rp7 on
chip drivers/net
@@ -171,7 +171,7 @@
register "wake" = "GPE0_DW0_07"
register "device_index" = "0"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8111K Ethernet NIC
device ref pcie_rp8 off end #pcie_rp 8 Empty
diff --git a/src/mainboard/google/brya/variants/brask/overridetree.cb b/src/mainboard/google/brya/variants/brask/overridetree.cb
index a8393b4..995f20c 100644
--- a/src/mainboard/google/brya/variants/brask/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brask/overridetree.cb
@@ -78,7 +78,7 @@
register "customized_led2" = "0x028"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8125 Ethernet NIC
device ref pcie4_0 on
diff --git a/src/mainboard/google/brya/variants/constitution/overridetree.cb b/src/mainboard/google/brya/variants/constitution/overridetree.cb
index 41d5022..c6083f1 100644
--- a/src/mainboard/google/brya/variants/constitution/overridetree.cb
+++ b/src/mainboard/google/brya/variants/constitution/overridetree.cb
@@ -181,7 +181,7 @@
register "customized_led2" = "0x028"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8125 Ethernet NIC
device ref pcie_rp8 on
diff --git a/src/mainboard/google/brya/variants/gaelin/overridetree.cb b/src/mainboard/google/brya/variants/gaelin/overridetree.cb
index d198530..b3af7c1 100644
--- a/src/mainboard/google/brya/variants/gaelin/overridetree.cb
+++ b/src/mainboard/google/brya/variants/gaelin/overridetree.cb
@@ -230,7 +230,7 @@
register "customized_leds" = "0x0843"
register "wake" = "GPE0_DW0_07" #GPP_A7
register "device_index" = "0"
- device generic 0 on end
+ device pci 00.0 on end
end
end #PCIE7 RTL8111K Ethernet NIC
device ref pcie_rp8 off end
diff --git a/src/mainboard/google/brya/variants/gladios/overridetree.cb b/src/mainboard/google/brya/variants/gladios/overridetree.cb
index 0aa0e75..6a21f2a 100644
--- a/src/mainboard/google/brya/variants/gladios/overridetree.cb
+++ b/src/mainboard/google/brya/variants/gladios/overridetree.cb
@@ -190,7 +190,7 @@
register "customized_leds" = "0x060f"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8111 Ethernet NIC
device ref pcie_rp8 on
diff --git a/src/mainboard/google/brya/variants/kinox/overridetree.cb b/src/mainboard/google/brya/variants/kinox/overridetree.cb
index 71d0e27..567f878 100644
--- a/src/mainboard/google/brya/variants/kinox/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kinox/overridetree.cb
@@ -278,7 +278,7 @@
register "wake" = "GPE0_DW0_07" #GPP_A7
register "device_index" = "0"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8111K Ethernet NIC
device ref pcie_rp8 off end
diff --git a/src/mainboard/google/brya/variants/kuldax/overridetree.cb b/src/mainboard/google/brya/variants/kuldax/overridetree.cb
index 6db03ac..a6adecf 100644
--- a/src/mainboard/google/brya/variants/kuldax/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kuldax/overridetree.cb
@@ -207,7 +207,7 @@
register "customized_led2" = "0x028"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8125 and RTL8111K Ethernet NIC
device ref pcie_rp8 on
diff --git a/src/mainboard/google/brya/variants/lisbon/overridetree.cb b/src/mainboard/google/brya/variants/lisbon/overridetree.cb
index 0aa0e75..6a21f2a 100644
--- a/src/mainboard/google/brya/variants/lisbon/overridetree.cb
+++ b/src/mainboard/google/brya/variants/lisbon/overridetree.cb
@@ -190,7 +190,7 @@
register "customized_leds" = "0x060f"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8111 Ethernet NIC
device ref pcie_rp8 on
diff --git a/src/mainboard/google/brya/variants/moli/overridetree.cb b/src/mainboard/google/brya/variants/moli/overridetree.cb
index 5397463..e636540 100644
--- a/src/mainboard/google/brya/variants/moli/overridetree.cb
+++ b/src/mainboard/google/brya/variants/moli/overridetree.cb
@@ -164,7 +164,7 @@
.clk_req = 4,
.flags = PCIE_RP_LTR | PCIE_RP_AER,
}"
- device generic 0 on end
+ device pci 00.0 on end
end # IntelI225V Ethernet NIC
device ref pcie_rp7 on
chip drivers/net
@@ -172,7 +172,7 @@
register "wake" = "GPE0_DW0_07"
register "device_index" = "0"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
end # RTL8111K Ethernet NIC
device ref pcie_rp8 on
diff --git a/src/mainboard/google/brya/variants/osiris/overridetree.cb b/src/mainboard/google/brya/variants/osiris/overridetree.cb
index 7ff5925..e8b78ca 100644
--- a/src/mainboard/google/brya/variants/osiris/overridetree.cb
+++ b/src/mainboard/google/brya/variants/osiris/overridetree.cb
@@ -287,7 +287,7 @@
register "customized_led2" = "0x028"
register "enable_aspm_l1_2" = "1"
register "add_acpi_dma_property" = "true"
- device generic 0 on end
+ device pci 00.0 on end
end
# Enable PCIE 7 using clk 6
register "pch_pcie_rp[PCH_RP(7)]" = "{