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> Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/68145 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
parent
6e1fb6ae9f
commit
987ec8837a
|
@ -76,7 +76,7 @@ chip soc/amd/cezanne
|
||||||
end
|
end
|
||||||
end
|
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.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
|
||||||
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include <amdblocks/chip.h>
|
#include <amdblocks/chip.h>
|
||||||
#include <device/device.h>
|
#include <device/device.h>
|
||||||
#include <device/pci.h>
|
#include <device/pci.h>
|
||||||
#include <device/pci_ids.h>
|
|
||||||
#include <device/pci_ops.h>
|
#include <device/pci_ops.h>
|
||||||
#include <commonlib/helpers.h>
|
#include <commonlib/helpers.h>
|
||||||
#include "acp_def.h"
|
#include "acp_def.h"
|
||||||
|
@ -42,7 +41,7 @@ static void acp_fill_ssdt(const struct device *dev)
|
||||||
acp_fill_wov_method(dev);
|
acp_fill_wov_method(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_operations acp_ops = {
|
struct device_operations amd_acp_ops = {
|
||||||
.read_resources = pci_dev_read_resources,
|
.read_resources = pci_dev_read_resources,
|
||||||
.set_resources = pci_dev_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
|
@ -52,9 +51,3 @@ static struct device_operations acp_ops = {
|
||||||
.acpi_name = acp_acpi_name,
|
.acpi_name = acp_acpi_name,
|
||||||
.acpi_fill_ssdt = acp_fill_ssdt,
|
.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,
|
|
||||||
};
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ chip soc/amd/mendocino
|
||||||
end
|
end
|
||||||
end
|
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.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
|
||||||
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -60,7 +60,7 @@ chip soc/amd/mendocino
|
||||||
end
|
end
|
||||||
end
|
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.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
|
||||||
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -62,7 +62,7 @@ chip soc/amd/morgana
|
||||||
end
|
end
|
||||||
end
|
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.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
|
||||||
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,7 +23,7 @@ chip soc/amd/picasso
|
||||||
device pci 0.2 alias crypto off end # cryptography coprocessor
|
device pci 0.2 alias crypto off end # cryptography coprocessor
|
||||||
device pci 0.3 alias xhci_0 off end
|
device pci 0.3 alias xhci_0 off end
|
||||||
device pci 0.4 alias xhci_1 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.6 alias hda off end # main HD Audio Controller
|
||||||
device pci 0.7 alias mp2 off end # sensor fusion hub (MP2)
|
device pci 0.7 alias mp2 off end # sensor fusion hub (MP2)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue