Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68145 )
Change subject: soc/amd/acp: Hook up ops in devicetree ......................................................................
soc/amd/acp: Hook up ops in devicetree
This removes the need for a PCI driver.
Change-Id: Id25016703d1716930d9b6c6d1dab5481b10aca17 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/amd/cezanne/chipset.cb M src/soc/amd/common/block/acp/acp.c M src/soc/amd/mendocino/chipset_mendocino.cb M src/soc/amd/mendocino/chipset_rembrandt.cb M src/soc/amd/picasso/chipset.cb 5 files changed, 17 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/68145/1
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb index 3190cc7..63cecd5 100644 --- a/src/soc/amd/cezanne/chipset.cb +++ b/src/soc/amd/cezanne/chipset.cb @@ -76,7 +76,7 @@ end end end - device pci 0.5 alias acp off end # Audio Processor (ACP) + device pci 0.5 alias acp off ops amd_acp_ops end # Audio Processor (ACP) device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ) device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2) end diff --git a/src/soc/amd/common/block/acp/acp.c b/src/soc/amd/common/block/acp/acp.c index cf0e9f8..a43792e 100644 --- a/src/soc/amd/common/block/acp/acp.c +++ b/src/soc/amd/common/block/acp/acp.c @@ -7,7 +7,6 @@ #include <amdblocks/chip.h> #include <device/device.h> #include <device/pci.h> -#include <device/pci_ids.h> #include <device/pci_ops.h> #include <commonlib/helpers.h> #include "acp_def.h" @@ -42,7 +41,7 @@ acp_fill_wov_method(dev); }
-static struct device_operations acp_ops = { +struct device_operations amd_acp_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, @@ -52,9 +51,3 @@ .acpi_name = acp_acpi_name, .acpi_fill_ssdt = acp_fill_ssdt, }; - -static const struct pci_driver acp_driver __pci_driver = { - .ops = &acp_ops, - .vendor = PCI_VID_AMD, - .device = PCI_DID_AMD_FAM17H_ACP, -}; diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb index 876b09e..380e596 100644 --- a/src/soc/amd/mendocino/chipset_mendocino.cb +++ b/src/soc/amd/mendocino/chipset_mendocino.cb @@ -60,7 +60,7 @@ end end end - device pci 0.5 alias acp off end # Audio Processor (ACP) + device pci 0.5 alias acp off ops amd_acp_ops end # Audio Processor (ACP) device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ) device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2) end diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb index 04fb8be..56afb3d 100644 --- a/src/soc/amd/mendocino/chipset_rembrandt.cb +++ b/src/soc/amd/mendocino/chipset_rembrandt.cb @@ -60,7 +60,7 @@ end end end - device pci 0.5 alias acp off end # Audio Processor (ACP) + device pci 0.5 alias acp off ops amd_acp_ops end # Audio Processor (ACP) device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ) device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2) end diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index c1959dc..07d7547 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -23,7 +23,7 @@ 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.5 alias acp off end # audio co-processor + 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) end
-
Arthur Heymans (Code Review)