Skip to content

Commit 10d675a

Browse files
committed
Merge: [RHEL 9.6] ARM: Update amba bus driver
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5119 JIRA: https://issues.redhat.com/browse/RHEL-56484 Bug fixes and updates to support Arm AMBA bus used by coresight devices and other arm devices. Signed-off-by: Mark Salter <[email protected]> Approved-by: Jerry Snitselaar <[email protected]> Approved-by: Charles Mirabile <[email protected]> Approved-by: Luiz Capitulino <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Rado Vrbovsky <[email protected]>
2 parents ec5f551 + 05d09fe commit 10d675a

File tree

6 files changed

+216
-437
lines changed

6 files changed

+216
-437
lines changed

drivers/acpi/arm64/amba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int amba_handler_attach(struct acpi_device *adev,
102102
if (parent)
103103
dev->dev.parent = acpi_get_first_physical_node(parent);
104104

105-
ACPI_COMPANION_SET(&dev->dev, adev);
105+
device_set_node(&dev->dev, acpi_fwnode_handle(adev));
106106

107107
ret = amba_device_add(dev, &iomem_resource);
108108
if (ret) {

0 commit comments

Comments
 (0)