From nobody Tue Nov 10 13:42:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jP7Bj5yFlz6ySFD for ; Tue, 10 Nov 2026 13:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jP7Bj4jMBz3MqG for ; Tue, 10 Nov 2026 13:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQhLy4lUsDeA8imiTMtiX4B+EIH+T0+sieHMvlmfF/Y=; b=cXVmGhVDyj5SBrb77encX/GOeVnqYeYXUdktiZRZY5Py8+wvzcQ0Qrwc74r8WwN5I/TOrG 0y6hLTQk8rdZVBdItQw3tGtZweMckB0KoK2cMB+ayjtnc9qBwtpDUas/1UTSY59BGXYQbz WosbciI1TmWzs4BcWDzaCIbpUjZ/+vT2FEHwgYDALcdPhLqmbXuUyNQ2l67cHhvrxL+Ntk t2etORGOBL+2DaHYP6Ic9oEi5qzI7TaUHmmOyNhxGpmBQBWiQO5OF8t2RLuWkVXiNPTq71 SqpXackkgAYt7HwowOEWXNAcher3KxV+icC14/whhLX6go3Heo+0yWeLB01w0Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794318173; b=wnr7xbQCFuhakDAL7WX2xQKljtrpHsn2kZVFweRzQC+CUz/rOXrgWWOWnMEnhK5sBhZ8EY aZAl77T4/bq1IbrTgJILabBbzkm7pYmkC7F55SK5i0TMSeSX0TQ7WZUnnf87435KTSvdd7 ScAoPw8yJqCMyegCVy+EyROj7ui1GM03mZDzmaNQCSOFbRGO2BhwriJHUVPjabZkIek4xd eJFWUp9I17ynSMowVQ9wMoPNPMFtkPQlscwzygT8ga25oP8Gx8ddGz5bGoXshnVr1Ss8eu qCIOFHyeEywp4NvxY3i8D1CIX+RSTIhlU3/gS19lUw/Fvej/QEQb37anHPnffg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQhLy4lUsDeA8imiTMtiX4B+EIH+T0+sieHMvlmfF/Y=; b=O4TUIM7qbyWjBhfxMZrbQDcG5w4jIaYYoVlejTqgTRHrhO02YnNhdca8bQXHhViCwxfjc2 GVMt8bBpx99y5EsC6kZ+rKRgcIXtoZYQQAkTgwcGMnlDqult0+qpIBgKGbYjuOfQl9dWjf +zLy5hEyDroFUFvuFfOV5uXVPvNNeiR9pvQvk0fVTX8rFRjnKIwc9BiWkEr8T4Y2YRG8pb SAZ9Lsd+c5LNT9Ra/Rev93wHPWv2Udx/CBxq+Y7DDH8iqKGBkKu1lRargZ8neEyrjFcubI diicgnPgDd8cErDCNtUk/Dp1GcYPjkH7u/QI/qJb9P6UtzwaGsdcrF2Ufi4fTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jP7Bj44QNzTfW for ; Tue, 10 Nov 2026 13:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c638 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 13:42:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 3e9384b3c3c5 - main - axp81x: Move the interrupt setup out of attach List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e9384b3c3c5f9d32777024a069e8222e0cb2600 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 13:42:53 +0000 Message-Id: <6af31f5d.1c638.2a64456e@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9384b3c3c5f9d32777024a069e8222e0cb2600 commit 3e9384b3c3c5f9d32777024a069e8222e0cb2600 Author: Emmanuel Vadot AuthorDate: 2026-11-10 07:52:32 +0000 Commit: Emmanuel Vadot 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);