summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/drivers/usb/pci_xhci/pci_xhci.c17
-rw-r--r--src/mainboard/amd/birman/devicetree_glinda.cb1
-rw-r--r--src/mainboard/amd/chausie/devicetree.cb1
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/devicetree.cb1
-rw-r--r--src/soc/amd/cezanne/chipset.cb2
-rw-r--r--src/soc/amd/glinda/chipset.cb3
-rw-r--r--src/soc/amd/mendocino/chipset_mendocino.cb3
-rw-r--r--src/soc/amd/mendocino/chipset_rembrandt.cb3
-rw-r--r--src/soc/amd/picasso/chipset.cb8
9 files changed, 20 insertions, 19 deletions
diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c
index ca51278e39..6d022d1455 100644
--- a/src/drivers/usb/pci_xhci/pci_xhci.c
+++ b/src/drivers/usb/pci_xhci/pci_xhci.c
@@ -251,20 +251,3 @@ const struct device_operations xhci_pci_ops = {
.acpi_fill_ssdt = xhci_fill_ssdt,
.acpi_name = xhci_acpi_name,
};
-
-static const unsigned short amd_pci_device_ids[] = {
- PCI_DID_AMD_FAM17H_MODEL18H_XHCI0,
- PCI_DID_AMD_FAM17H_MODEL18H_XHCI1,
- PCI_DID_AMD_FAM17H_MODEL20H_XHCI0,
- PCI_DID_AMD_FAM17H_MODEL60H_XHCI,
- PCI_DID_AMD_FAM17H_MODELA0H_XHCI0,
- PCI_DID_AMD_FAM17H_MODELA0H_XHCI1,
- PCI_DID_AMD_FAM17H_MODELA0H_XHCI2,
- 0
-};
-
-static const struct pci_driver xhci_pci_driver __pci_driver = {
- .ops = &xhci_pci_ops,
- .vendor = PCI_VID_AMD,
- .devices = amd_pci_device_ids,
-};
diff --git a/src/mainboard/amd/birman/devicetree_glinda.cb b/src/mainboard/amd/birman/devicetree_glinda.cb
index d6ecae6688..dfcd176723 100644
--- a/src/mainboard/amd/birman/devicetree_glinda.cb
+++ b/src/mainboard/amd/birman/devicetree_glinda.cb
@@ -205,6 +205,7 @@ chip soc/amd/glinda
end
device ref gpp_bridge_c on # Internal GPP Bridge 2 to Bus C
device ref xhci_2 on
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_2_root_hub on
diff --git a/src/mainboard/amd/chausie/devicetree.cb b/src/mainboard/amd/chausie/devicetree.cb
index 2e6511e266..a186b2d825 100644
--- a/src/mainboard/amd/chausie/devicetree.cb
+++ b/src/mainboard/amd/chausie/devicetree.cb
@@ -204,6 +204,7 @@ chip soc/amd/mendocino
end
device ref gpp_bridge_c on # Internal GPP Bridge 2 to Bus C
device ref xhci_2 on
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_2_root_hub on
diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index 835277a930..b605e1cd43 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -175,6 +175,7 @@ chip soc/amd/mendocino
end
device ref gpp_bridge_c on # Internal GPP Bridge 2 to Bus C
device ref xhci_2 on # USB 2.0 (USB2)
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_2_root_hub on
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index c7793905ae..0762ea1d26 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -28,6 +28,7 @@ chip soc/amd/cezanne
device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
device pci 0.2 alias crypto off end # Crypto Coprocessor
device pci 0.3 alias xhci_0 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_0_root_hub off
@@ -53,6 +54,7 @@ chip soc/amd/cezanne
end
end
device pci 0.4 alias xhci_1 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_1_root_hub off
diff --git a/src/soc/amd/glinda/chipset.cb b/src/soc/amd/glinda/chipset.cb
index ad477c7c90..bf7d67d81b 100644
--- a/src/soc/amd/glinda/chipset.cb
+++ b/src/soc/amd/glinda/chipset.cb
@@ -26,6 +26,7 @@ chip soc/amd/glinda
device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
device pci 0.2 alias crypto off end # Crypto Coprocessor
device pci 0.3 alias xhci_0 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_0_root_hub off
@@ -42,6 +43,7 @@ chip soc/amd/glinda
end
end
device pci 0.4 alias xhci_1 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_1_root_hub off
@@ -71,6 +73,7 @@ chip soc/amd/glinda
device pci 08.3 alias gpp_bridge_c off # Internal GPP Bridge 2 to Bus C
ops amd_internal_pcie_gpp_ops
device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID
+ # When using this as XHCI2, the mainboard devicetree needs to add ops xhci_pci_ops
end
device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function
diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb
index 691cca03d9..e40124f6ff 100644
--- a/src/soc/amd/mendocino/chipset_mendocino.cb
+++ b/src/soc/amd/mendocino/chipset_mendocino.cb
@@ -22,6 +22,7 @@ chip soc/amd/mendocino
device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
device pci 0.2 alias crypto off end # Crypto Coprocessor
device pci 0.3 alias xhci_0 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_0_root_hub off
@@ -38,6 +39,7 @@ chip soc/amd/mendocino
end
end
device pci 0.4 alias xhci_1 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_1_root_hub off
@@ -66,6 +68,7 @@ chip soc/amd/mendocino
device pci 08.3 alias gpp_bridge_c off # Internal GPP Bridge 2 to Bus C
ops amd_internal_pcie_gpp_ops
device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID
+ # When using this as XHCI2, the mainboard devicetree needs to add ops xhci_pci_ops
end
device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function
diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb
index fd31efeb8e..394f057bfa 100644
--- a/src/soc/amd/mendocino/chipset_rembrandt.cb
+++ b/src/soc/amd/mendocino/chipset_rembrandt.cb
@@ -24,6 +24,7 @@ chip soc/amd/mendocino
device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
device pci 0.2 alias crypto off end # Crypto Coprocessor
device pci 0.3 alias xhci_0 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_0_root_hub off
@@ -40,6 +41,7 @@ chip soc/amd/mendocino
end
end
device pci 0.4 alias xhci_1 off
+ ops xhci_pci_ops
chip drivers/usb/acpi
register "type" = "UPC_TYPE_HUB"
device usb 0.0 alias xhci_1_root_hub off
@@ -69,6 +71,7 @@ chip soc/amd/mendocino
device pci 08.3 alias gpp_bridge_c off # Internal GPP Bridge 2 to Bus C
ops amd_internal_pcie_gpp_ops
device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID
+ # When using this as XHCI2, the mainboard devicetree needs to add ops xhci_pci_ops
end
device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function
diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb
index 6d6177f4b9..bf2c879a23 100644
--- a/src/soc/amd/picasso/chipset.cb
+++ b/src/soc/amd/picasso/chipset.cb
@@ -22,8 +22,12 @@ chip soc/amd/picasso
device pci 0.0 alias gfx off ops amd_graphics_ops end # internal GPU
device pci 0.1 alias gfx_hda off end # display HD Audio controller
device pci 0.2 alias crypto off end # cryptography coprocessor
- device pci 0.3 alias xhci_0 off end
- device pci 0.4 alias xhci_1 off end
+ device pci 0.3 alias xhci_0 off
+ ops xhci_pci_ops
+ end
+ device pci 0.4 alias xhci_1 off
+ ops xhci_pci_ops
+ end
device pci 0.5 alias acp off ops amd_acp_ops end # audio co-processor
device pci 0.6 alias hda off end # main HD Audio Controller
device pci 0.7 alias mp2 off end # sensor fusion hub (MP2)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 16:30:44 +0000