Index: head/sys/arm64/include/intr.h
===================================================================
--- head/sys/arm64/include/intr.h	(revision 365578)
+++ head/sys/arm64/include/intr.h	(revision 365579)
@@ -1,56 +1,57 @@
 /*-
  * Copyright (c) 2014 Andrew Turner <andrew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTR_H_
 #define	_MACHINE_INTR_H_
 
 #ifdef FDT
 #include <dev/ofw/openfirm.h>
 #endif
 
 #include <sys/intr.h>
 
 #ifndef NIRQ
 #define	NIRQ		2048	/* XXX - It should be an option. */
 #endif
 
 static inline void
 arm_irq_memory_barrier(uintptr_t irq)
 {
 }
 
 #ifdef SMP
 void intr_ipi_dispatch(u_int, struct trapframe *);
 #endif
 
 #ifdef DEV_ACPI
 #define	ACPI_INTR_XREF	1
 #define	ACPI_MSI_XREF	2
+#define	ACPI_GPIO_XREF	3
 #endif
 
 #endif	/* _MACHINE_INTR_H */
Index: head/sys/dev/gpio/pl061_acpi.c
===================================================================
--- head/sys/dev/gpio/pl061_acpi.c	(revision 365578)
+++ head/sys/dev/gpio/pl061_acpi.c	(revision 365579)
@@ -1,103 +1,104 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "opt_acpi.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 
 #include <machine/intr.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 
 #include <dev/acpica/acpivar.h>
 #include <dev/gpio/gpiobusvar.h>
 
 #include "pl061.h"
 
 static char *gpio_ids[] = { "ARMH0061", NULL };
 
 static int
 pl061_acpi_probe(device_t dev)
 {
 	int rv;
 
 	if (acpi_disabled("gpio"))
 		return (ENXIO);
 
 	rv = ACPI_ID_PROBE(device_get_parent(dev), dev, gpio_ids, NULL);
 
 	if (rv <= 0)
 		device_set_desc(dev, "Arm PL061 GPIO Controller");
 
 	return (rv);
 }
 
 static int
 pl061_acpi_attach(device_t dev)
 {
 	int error;
 
 	error = pl061_attach(dev);
 	if (error != 0)
 		return (error);
 
-	if (!intr_pic_register(dev, ACPI_INTR_XREF)) {
+	if (!intr_pic_register(dev, ACPI_GPIO_XREF)) {
 		device_printf(dev, "couldn't register PIC\n");
 		pl061_detach(dev);
 		error = ENXIO;
 	}
 
 	return (error);
 }
 
 static device_method_t pl061_acpi_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		pl061_acpi_probe),
 	DEVMETHOD(device_attach,	pl061_acpi_attach),
 
 	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(gpio, pl061_acpi_driver, pl061_acpi_methods,
     sizeof(struct pl061_softc), pl061_driver);
 
 static devclass_t pl061_devclass;
 
-DRIVER_MODULE(pl061, acpi, pl061_driver, pl061_devclass, NULL, NULL);
+EARLY_DRIVER_MODULE(pl061, acpi, pl061_acpi_driver, pl061_devclass, NULL, NULL,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
 MODULE_DEPEND(pl061, acpi, 1, 1, 1);
 MODULE_DEPEND(pl061, gpiobus, 1, 1, 1);