mb/google/zork: Remove redundant PCI info from overridetrees

This information is redundant since it's already specified in
baseboard/devicetree_trembyle.cb or baseboard/devicetree_dalboz.cb

domain 0 is still required because sconfig uses it as an identity anchor
to match devicetree and overridetree.

BUG=b:157580724
TEST=Boot zork, usb functional

Change-Id: I3c3c1c2410166b99599d7343fae3ee756f4da321
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43437
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

8 files changed, 3 insertions, 111 deletions

diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
index ec7a706802..585f5a7183 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
@@ -201,6 +201,8 @@ chip soc/amd/picasso
 		device pci 1.3 on  end # GPP Bridge 2 - SD
 		device pci 1.4 off end # GPP Bridge 3
 		device pci 1.5 off end # GPP Bridge 4
+		device pci 1.6 off end # GPP Bridge 5
+		device pci 1.7 on  end # GPP Bridge 6 - NVME
 		device pci 8.0 on  end # Dummy Host Bridge, must be enabled
 		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
 			device pci 0.0 on  end # Internal GPU
@@ -340,6 +342,7 @@ chip soc/amd/picasso
 				end
 			end
 		end
+		device pci 14.6 off end # Non-Functional SDHCI
 		device pci 18.0 on  end # Data fabric [0-7]
 		device pci 18.1 on  end
 		device pci 18.2 on  end
diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb
index 229469eda7..b4d4fa42fb 100644
--- a/src/mainboard/google/zork/variants/berknip/overridetree.cb
+++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb
@@ -40,13 +40,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 1.6 off end # GPP Bridge 5
-		device pci 1.7 on  end # GPP Bridge 6 - NVME
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-			device pci 0.4 on  end # USB 3.1
-		end
-		device pci 14.6 off end # Non-Functional SDHCI
 	end # domain
 
 	device mmio 0xfedc4000 on
diff --git a/src/mainboard/google/zork/variants/dalboz/overridetree.cb b/src/mainboard/google/zork/variants/dalboz/overridetree.cb
index 81fc4fd5f3..16a6e441e4 100644
--- a/src/mainboard/google/zork/variants/dalboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/dalboz/overridetree.cb
@@ -40,9 +40,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-		end
 	end # domain
 
 	device mmio 0xfedc4000 on # APU_I2C2_BASE
diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
index f7366acf0e..abdc39764b 100644
--- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
+++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb
@@ -42,13 +42,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 1.6 off end # GPP Bridge 5
-		device pci 1.7 on  end # GPP Bridge 6 - NVME
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-			device pci 0.4 on  end # USB 3.1
-		end
-		device pci 14.6 off end # Non-Functional SDHCI
 	end # domain
 
 	device mmio 0xfedc4000 on
diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb
index 1240aa66df..c0de2ce1ac 100644
--- a/src/mainboard/google/zork/variants/morphius/overridetree.cb
+++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb
@@ -40,13 +40,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 1.6 off end # GPP Bridge 5
-		device pci 1.7 on  end # GPP Bridge 6 - NVME
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-			device pci 0.4 on  end # USB 3.1
-		end
-		device pci 14.6 off end # Non-Functional SDHCI
 	end # domain
 
 	device mmio 0xfedc4000 on
diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb
index 22aced2afb..d66e518f20 100644
--- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb
+++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb
@@ -40,83 +40,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 1.6 off end # GPP Bridge 5
-		device pci 1.7 on  end # GPP Bridge 6 - NVME
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on
-				chip drivers/usb/acpi
-					register "desc" = ""Root Hub""
-					register "type" = "UPC_TYPE_HUB"
-					device usb 0.0 on
-						chip drivers/usb/acpi
-							register "desc" = ""Left Type-C Port""
-							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(1, 1)"
-							device usb 2.0 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Left Type-A Port""
-							register "type" = "UPC_TYPE_USB3_A"
-							register "group" = "ACPI_PLD_GROUP(1, 2)"
-							device usb 2.1 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Right Type-A Port""
-							register "type" = "UPC_TYPE_USB3_A"
-							register "group" = "ACPI_PLD_GROUP(2, 1)"
-							device usb 2.2 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Right Type-C Port""
-							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(2, 2)"
-							device usb 2.3 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""User-Facing Camera""
-							register "type" = "UPC_TYPE_INTERNAL"
-							device usb 2.4 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Bluetooth""
-							register "type" = "UPC_TYPE_INTERNAL"
-							device usb 2.5 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Left Type-C Port""
-							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(1, 1)"
-							device usb 3.0 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Left Type-A Port""
-							register "type" = "UPC_TYPE_USB3_A"
-							register "group" = "ACPI_PLD_GROUP(1, 2)"
-							device usb 3.1 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Right Type-A Port""
-							register "type" = "UPC_TYPE_USB3_A"
-							register "group" = "ACPI_PLD_GROUP(2, 1)"
-							device usb 3.2 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""Right Type-C Port""
-							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(2, 2)"
-							device usb 3.3 on end
-						end
-						chip drivers/usb/acpi
-							register "desc" = ""AR Camera""
-							register "type" = "UPC_TYPE_INTERNAL"
-							device usb 3.4 on end
-						end
-					end
-				end
-			end # USB 3.1
-			device pci 0.4 on  end # USB 3.1
-		end
-		device pci 14.6 off end # Non-Functional SDHCI
 	end # domain
 
 	device mmio 0xfedc4000 on
diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
index 79f26f219e..d3e01e2f08 100644
--- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
@@ -36,9 +36,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-		end
 		device pci 14.3 on  # - D14F3 bridge
 			chip ec/google/chromeec
 				device pnp 0c09.0 on
diff --git a/src/mainboard/google/zork/variants/woomax/overridetree.cb b/src/mainboard/google/zork/variants/woomax/overridetree.cb
index 7b58df1b81..077e983f85 100644
--- a/src/mainboard/google/zork/variants/woomax/overridetree.cb
+++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb
@@ -41,13 +41,6 @@ chip soc/amd/picasso
 	# See AMD 55570-B1 Table 13: PCI Device ID Assignments.
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
-		device pci 1.6 off end # GPP Bridge 5
-		device pci 1.7 on  end # GPP Bridge 6 - NVME
-		device pci 8.1 on      # Internal GPP Bridge 0 to Bus A
-			device pci 0.3 on  end # USB 3.1
-			device pci 0.4 on  end # USB 3.1
-		end
-		device pci 14.6 off end # Non-Functional SDHCI
 	end # domain
 
 	device mmio 0xfedc4000 on end