git: 33f2cf4ad460 - main - arm64: Switch to ACPI by default

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f

commit 33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-27 15:12:13 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-30 12:04:23 +0000

    arm64: Switch to ACPI by default
    
    When the FreeBSD/arm64 port was created we only supported FDT. We now
    also support ACPI, and have for many years. When this support was
    added we kept FDT as the default.
    
    There are some setups where both ACPI tables and a FDT DTB are passed
    into the kernel. In most of these cases the DTB is only used to pass
    in minimal information.
    
    To handle the cases where both are passed in prefer ACPI over FDT.
    
    Reviewed by:    bz, imp, emaste
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D46750
---
 sys/arm64/arm64/machdep.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index f9885f4d4e0a..b61fec3fdd11 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -801,10 +801,10 @@ bus_probe(void)
 	}
 	/* If no order or an invalid order was set use the default */
 	if (arm64_bus_method == ARM64_BUS_NONE) {
-		if (has_fdt)
-			arm64_bus_method = ARM64_BUS_FDT;
-		else if (has_acpi)
+		if (has_acpi)
 			arm64_bus_method = ARM64_BUS_ACPI;
+		else if (has_fdt)
+			arm64_bus_method = ARM64_BUS_FDT;
 	}
 
 	/*