From nobody Sun Feb 22 17:53:55 2026 X-Original-To: dev-commits-src-main@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 4fJs6q5sCSz6TWH0 for ; Sun, 22 Feb 2026 17:53:55 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJs6q2qQgz3vkc for ; Sun, 22 Feb 2026 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782835; 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=XxojDxhaO7ji0++NNBZmkCmuSbtHGZXB8mm3xahxLjQ=; b=KPLaUZ+gmihkMOhB8+6BkqVKmzhgJuPbIA0z1K36dSb4dwSNyTHlHQ2k2JqZo/znHBU3up Y5OSdCoUxpczwHuQmYyI6v5uKacjPqJ92GQbGtDIqC+RvifmNJ4WDjKF36kcr3FjrllCtU 3tKbxBRHIgQ0yBp4Wiuj1fHCGW2tILurK8xZhKJ1/iETz28aokkEZFiQWsHJxOcp4g4iz/ n7ypOgW/MXdKhx9/grzBaBhqV+/6LdaY66Cr6z8JRyuAJALtn7fav83XrxUemWEOaLugB5 AXepcFo/AZlMLun3Ajt7nt4Qgbd4xRQ4+QFoQBUStn2MXV+M8nstJxUlml1Pkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782835; a=rsa-sha256; cv=none; b=RGQyo1eCFOTwWDKolc+fgeWcERYLNwdZZIwFnKzVElxxLHliMJYr3T1IN55qvxTCBzBoEg Lf9nW7m6wIXNiJn4KoyQfrhk4NX4i5cH16H8lNGNrc7Z0ftv0ClFkK4bsiVoEhobY/pJAp Pv4pC6wa77Z/du0QXBWvZ2BpR6a7Wt4b7XCd8Q0Gn5+hxMP9kWCvQKQW+uFhiF7tJpISMv fYa8JpLD5ZbM5xQDDM0oqYQkprHSskS49WDIKChsRfDM4ZeyY0pmn+hg73rP280281kqAG f/y5BZnTBBz98U00I2e9PMdpmKk7uC636Pa67d5yB8eDRbWirG/afgfX6cva0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782835; 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=XxojDxhaO7ji0++NNBZmkCmuSbtHGZXB8mm3xahxLjQ=; b=M0hhCrqQlLJe8E+iIxh4BRQFkvqICAEmvI2196umbjNxU4oW5yg5xiIAx4+ApTG4TwAcz5 7U3A/OIC2GatW+U4G/c+99ygQ8iMOiJPzVqBELfLMxytgBKrVP5B73P5/POvILG0UphQ1c bROBR3u/SZVfp/iiEE2+DpTf11Zdww6eXKI6oj8rdoNXBP4stffFZFKt39SgDouw+kfs2v IGV6RBiF6kzM37NuuBZQrMB0h181GegAZvI/sIUr0eGff5r9cd4gP5Odr8Jgsei8gldeKI eccqQQAr1/DrGYgZgu30XIV39N+yJ+2HOHRftwL4XMrzrMLIRhNWO663/u6NwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6q2Bvqzvb7 for ; Sun, 22 Feb 2026 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 9de43130f989 - main - regulator_fixed: add support for 'gpios' property List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9de43130f989896d92dda22ed73ca3033863efd7 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:55 +0000 Message-Id: <699b42b3.3ab57.672318b9@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=9de43130f989896d92dda22ed73ca3033863efd7 commit 9de43130f989896d92dda22ed73ca3033863efd7 Author: Michal Meloun AuthorDate: 2025-11-06 19:37:14 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:28 +0000 regulator_fixed: add support for 'gpios' property This is a newer version of the "gpio" property. MFC after: 3 weeks --- sys/dev/regulator/regulator_fixed.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/dev/regulator/regulator_fixed.c b/sys/dev/regulator/regulator_fixed.c index 55cdb5e4aeae..148bd28cdd16 100644 --- a/sys/dev/regulator/regulator_fixed.c +++ b/sys/dev/regulator/regulator_fixed.c @@ -380,6 +380,7 @@ regfix_parse_fdt(struct regfix_softc * sc) { phandle_t node; int rv; + char *name; struct regnode_init_def *init_def; node = ofw_bus_get_node(sc->dev); @@ -405,15 +406,21 @@ regfix_parse_fdt(struct regfix_softc * sc) if (OF_hasprop(node, "gpio-open-drain")) sc->init_def.gpio_open_drain = true; - if (!OF_hasprop(node, "gpio")) - return (0); - rv = ofw_bus_parse_xref_list_alloc(node, "gpio", "#gpio-cells", 0, - &sc->gpio_prodxref, &sc->gpio_ncells, &sc->gpio_cells); + if (OF_hasprop(node, "gpio")) + name = "gpio"; + else if (OF_hasprop(node, "gpios")) + name = "gpios"; + else + return(0); + + rv = ofw_bus_parse_xref_list_alloc(node, name, "#gpio-cells", + 0, &sc->gpio_prodxref, &sc->gpio_ncells, &sc->gpio_cells); if (rv != 0) { sc->gpio_prodxref = 0; - device_printf(sc->dev, "Malformed gpio property\n"); + device_printf(sc->dev, "Malformed gpios property\n"); return (ENXIO); } + return (0); }