From nobody Tue Nov 10 13:42:52 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 4jP7Bh6WbMz6ySfv for ; Tue, 10 Nov 2026 13:42:52 +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 4jP7Bh447lz3Mvn for ; Tue, 10 Nov 2026 13:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318172; 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=eHACP6nEdoqCakkVntSa9+Ri7CQhdutOHcS+2y3tExU=; b=CQ0wWPuffUU54QyfM6evTiCuHS8EYB1iUoDLGyb32FvSJLxj1ADJrhP8cyhw+c5w33Vinw T/24md3KvvAePO7ljsyu/b+SFEWm1Qn0aCrKoGCTb32yzEbO1KcoWr3bm8yvcWqCZk6Nz+ OxEIk/dUW1x5lBOB5BvoPzqZm5fiuXVNgXaKkWUBCLqtGSRi3jy+PfR2v5R0JRD4RoHdnZ NuNhWWwfJyAmNGNOsVGxhHOBT+vAmXhsXsIpH/i/+XkBq2A3C9TX92jyjiXcbzgnIHo95d Hc5sr+gvTw9qcs+ju4xbuQ7txetvmvH4831DVlk5zazLsE+9MP1Ido/679AHvw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794318172; b=QAfUJPt3G7rdYlh00neNh39DNsiH1iEozmURlmR8U1UIfMN070yjA19HiTlHc2BTZikNxI 89LW1Kuo87PYNaE7Hf+uOL7J2aKfLtJPYWyS2fPDsxbcrQIJYGudPe/JzdhlMpVMSA0SvU ed9aSdFVuuws9013vWbr/nLyXzydlx5bf4nES9RLgvQAoE0MjeO4yCAs8yzna9m9HWkWrZ DdlLRsgLADGz3U5KKfEQof8Gvb4Rcccb1Y7ARN8OC+SXQ+NUXvRzJ9zHn2fUedKwfhNK4F R7/uulZTJ1FbGAwFGMXqLN0OgaLI/MkkBb0Wp+zI1HFHq47tSmFGf516dlgVUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318172; 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=eHACP6nEdoqCakkVntSa9+Ri7CQhdutOHcS+2y3tExU=; b=YqxGV2lM78OLlzbDhcWYAcHFRkAtnP6xGRxt/n1STvJ63nSOVneJgT6Tfn7so4IXaPjKGa OfHBPwn5CYREQ8rl10WyvKnoXJmFjFI7tbsUICNpuSiqP3gkLzkBvVfCQsx5772psTLYfO J/Ft4DCa8h2h9mGhJFdI3BxPwbFFwIXgFdKyynmQWri7gJD8Ir6y5sseRW+xqvtv4foxxe d0zY5JZw/05ImZo/yzDRe5kkzNOMpWDy9oUQorNI6IiHBIpn4IyJk9i9DWLAVpQ9fEsk6m cUn3A8jbPRc2rLgFC7WuuAEcLRqw9unwaNxYJN8PNgLfhhlp0FR6GB06Rk3KTg== 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 4jP7Bh3k9dzVGJ for ; Tue, 10 Nov 2026 13:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b790 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 13:42:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 5065335ab4df - main - axp81x: Move the sensors, sysctls and thresholds 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: 5065335ab4df5ce0cebe850758769f92190f79fb Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 13:42:52 +0000 Message-Id: <6af31f5c.1b790.6d9f67bc@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5065335ab4df5ce0cebe850758769f92190f79fb commit 5065335ab4df5ce0cebe850758769f92190f79fb Author: Emmanuel Vadot AuthorDate: 2026-11-10 07:49:59 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-10 13:42:44 +0000 axp81x: Move the sensors, sysctls and thresholds out of attach Add one function for each of them: axp8xx_add_sensors(), axp8xx_add_sysctls() and axp8xx_get_thresholds(). No functional change. This is a preparation to support PMUs without a battery, like the AXP805, with this driver. --- sys/arm/allwinner/axp81x.c | 97 +++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 36 deletions(-) diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c index 71f0c8156a0d..b272591a77f5 100644 --- a/sys/arm/allwinner/axp81x.c +++ b/sys/arm/allwinner/axp81x.c @@ -1459,12 +1459,69 @@ axp8xx_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +static void +axp8xx_add_sensors(device_t dev) +{ + struct axp8xx_softc *sc; + int i; + + sc = device_get_softc(dev); + + for (i = 0; i < sc->nsensors; i++) { + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, sc->sensors[i].name, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + dev, sc->sensors[i].id, axp8xx_sysctl, + sc->sensors[i].format, + sc->sensors[i].desc); + } +} + +static void +axp8xx_add_sysctls(device_t dev) +{ + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "batchargecurrentstep", + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + dev, 0, axp8xx_sysctl_chargecurrent, + "I", "Battery Charging Current Step, " + "0: 200mA, 1: 400mA, 2: 600mA, 3: 800mA, " + "4: 1000mA, 5: 1200mA, 6: 1400mA, 7: 1600mA, " + "8: 1800mA, 9: 2000mA, 10: 2200mA, 11: 2400mA, " + "12: 2600mA, 13: 2800mA"); +} + +static void +axp8xx_get_thresholds(device_t dev) +{ + struct axp8xx_softc *sc; + uint8_t val; + + sc = device_get_softc(dev); + + if (axp8xx_read(dev, AXP_BAT_CAP_WARN, &val, 1) == 0) { + sc->warn_thres = (val & AXP_BAT_CAP_WARN_LV1) >> 4; + sc->warn_thres += AXP_BAP_CAP_WARN_LV1BASE; + sc->shut_thres = (val & AXP_BAT_CAP_WARN_LV2); + if (bootverbose) { + device_printf(dev, + "Raw reg val: 0x%02x\n", val); + device_printf(dev, + "Warning threshold: 0x%02x\n", sc->warn_thres); + device_printf(dev, + "Shutdown threshold: 0x%02x\n", sc->shut_thres); + } + } +} + static int axp8xx_attach(device_t dev) { struct axp8xx_softc *sc; struct axp8xx_reg_sc *reg; - uint8_t chip_id, val; + uint8_t chip_id; phandle_t rnode, child; int error, i; @@ -1542,41 +1599,9 @@ axp8xx_attach(device_t dev) } } - /* Add sensors */ - for (i = 0; i < sc->nsensors; i++) { - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, sc->sensors[i].name, - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, - dev, sc->sensors[i].id, axp8xx_sysctl, - sc->sensors[i].format, - sc->sensors[i].desc); - } - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "batchargecurrentstep", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - dev, 0, axp8xx_sysctl_chargecurrent, - "I", "Battery Charging Current Step, " - "0: 200mA, 1: 400mA, 2: 600mA, 3: 800mA, " - "4: 1000mA, 5: 1200mA, 6: 1400mA, 7: 1600mA, " - "8: 1800mA, 9: 2000mA, 10: 2200mA, 11: 2400mA, " - "12: 2600mA, 13: 2800mA"); - - /* Get thresholds */ - if (axp8xx_read(dev, AXP_BAT_CAP_WARN, &val, 1) == 0) { - sc->warn_thres = (val & AXP_BAT_CAP_WARN_LV1) >> 4; - sc->warn_thres += AXP_BAP_CAP_WARN_LV1BASE; - sc->shut_thres = (val & AXP_BAT_CAP_WARN_LV2); - if (bootverbose) { - device_printf(dev, - "Raw reg val: 0x%02x\n", val); - device_printf(dev, - "Warning threshold: 0x%02x\n", sc->warn_thres); - device_printf(dev, - "Shutdown threshold: 0x%02x\n", sc->shut_thres); - } - } + axp8xx_add_sensors(dev); + axp8xx_add_sysctls(dev); + axp8xx_get_thresholds(dev); /* Enable interrupts */ axp8xx_write(dev, AXP_IRQEN1,