git: 3e9384b3c3c5 - main - axp81x: Move the interrupt setup out of attach

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Tue, 10 Nov 2026 13:42:53 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=3e9384b3c3c5f9d32777024a069e8222e0cb2600

commit 3e9384b3c3c5f9d32777024a069e8222e0cb2600
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-10 07:52:32 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-10 13:42:44 +0000

    axp81x: Move the interrupt setup out of attach
    
    Add axp8xx_setup_intr() which enables the interrupts and installs the
    handler.
    
    No functional change.
---
 sys/arm/allwinner/axp81x.c | 67 ++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c
index b272591a77f5..2983ff09e296 100644
--- a/sys/arm/allwinner/axp81x.c
+++ b/sys/arm/allwinner/axp81x.c
@@ -1516,6 +1516,45 @@ axp8xx_get_thresholds(device_t dev)
 	}
 }
 
+static int
+axp8xx_setup_intr(device_t dev)
+{
+	struct axp8xx_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+
+	/* Enable interrupts */
+	axp8xx_write(dev, AXP_IRQEN1,
+	    AXP_IRQEN1_VBUS_LO |
+	    AXP_IRQEN1_VBUS_HI |
+	    AXP_IRQEN1_ACIN_LO |
+	    AXP_IRQEN1_ACIN_HI);
+	axp8xx_write(dev, AXP_IRQEN2,
+	    AXP_IRQEN2_BATCHGD |
+	    AXP_IRQEN2_BATCHGC |
+	    AXP_IRQEN2_BAT_NO |
+	    AXP_IRQEN2_BAT_IN);
+	axp8xx_write(dev, AXP_IRQEN3, 0);
+	axp8xx_write(dev, AXP_IRQEN4,
+	    AXP_IRQEN4_BATLVL_LO0 |
+	    AXP_IRQEN4_BATLVL_LO1);
+	axp8xx_write(dev, AXP_IRQEN5,
+	    AXP_IRQEN5_POKSIRQ |
+	    AXP_IRQEN5_POKLIRQ);
+	axp8xx_write(dev, AXP_IRQEN6, 0);
+
+	/* Install interrupt handler */
+	error = bus_setup_intr(dev, sc->res, INTR_TYPE_MISC | INTR_MPSAFE,
+	    NULL, axp8xx_intr, dev, &sc->ih);
+	if (error != 0) {
+		device_printf(dev, "cannot setup interrupt handler\n");
+		return (error);
+	}
+
+	return (0);
+}
+
 static int
 axp8xx_attach(device_t dev)
 {
@@ -1603,33 +1642,9 @@ axp8xx_attach(device_t dev)
 	axp8xx_add_sysctls(dev);
 	axp8xx_get_thresholds(dev);
 
-	/* Enable interrupts */
-	axp8xx_write(dev, AXP_IRQEN1,
-	    AXP_IRQEN1_VBUS_LO |
-	    AXP_IRQEN1_VBUS_HI |
-	    AXP_IRQEN1_ACIN_LO |
-	    AXP_IRQEN1_ACIN_HI);
-	axp8xx_write(dev, AXP_IRQEN2,
-	    AXP_IRQEN2_BATCHGD |
-	    AXP_IRQEN2_BATCHGC |
-	    AXP_IRQEN2_BAT_NO |
-	    AXP_IRQEN2_BAT_IN);
-	axp8xx_write(dev, AXP_IRQEN3, 0);
-	axp8xx_write(dev, AXP_IRQEN4,
-	    AXP_IRQEN4_BATLVL_LO0 |
-	    AXP_IRQEN4_BATLVL_LO1);
-	axp8xx_write(dev, AXP_IRQEN5,
-	    AXP_IRQEN5_POKSIRQ |
-	    AXP_IRQEN5_POKLIRQ);
-	axp8xx_write(dev, AXP_IRQEN6, 0);
-
-	/* Install interrupt handler */
-	error = bus_setup_intr(dev, sc->res, INTR_TYPE_MISC | INTR_MPSAFE,
-	    NULL, axp8xx_intr, dev, &sc->ih);
-	if (error != 0) {
-		device_printf(dev, "cannot setup interrupt handler\n");
+	error = axp8xx_setup_intr(dev);
+	if (error != 0)
 		return (error);
-	}
 
 	EVENTHANDLER_REGISTER(shutdown_final, axp8xx_shutdown, dev,
 	    SHUTDOWN_PRI_LAST);