From nobody Sat Mar 16 15:16:12 2024 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 4Txl7d0wZNz5F1Qq; Sat, 16 Mar 2024 15:16:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Txl7d0Qtdz4Fq9; Sat, 16 Mar 2024 15:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710602173; 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=UYIxytQO0T+OZM/O2PwWZ1zEhwaZKKdiL4kSuOay9ug=; b=EeD9LlCYAj6VvZAJEFxI+0Dz5TYHRhXT9GjfMmUpk3ryO2pV5t0Bgzg3e+5bKFSoyJ+7KC 2Q/WsQ5WdGZSVO7Li8X/H/v8j5Tjxcey0No1Tgi7RCQWFcBYhphhmPu/gRCcexeaqL879D kT6hvO2dYY9Sfu2guiazztTbykn0SE0lRwVvPwTdJKJQik3+g4WM3z6mkIXTv3TEL+Kwpb pXYSw8dB8DZfTb0PLC9txyY0kcTo4CbsqtyhKhgU3M7XHXKy9GNj5o79JRRi6kji5CaJqC NsyUulSCoUkLjuL9pKrDDQGpwhuFmrUzkAvEyxeMAQMnF44XjeDjw9r5tD3Z+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710602173; a=rsa-sha256; cv=none; b=Fyaj08IuT5VwPOEOLuuTzo+z8HaBk3PJJvEu+9kE0sw7bm45RcJoBus1C8UHxPTBej2v40 IIqDQYvMxfxItXskcLFH88c/2mb7neJZmPRpeuiLUWc1hdkqwS+Jh5dJyO2nG4WGOe2loR my3c6n/sKbKLp7W8K5hF8w3ut0GgQjeifLtfzgFbRJ6+QZmv2/RZjmW9wazcvkgTrSJ66b xyLAo0rqhGVKU8A/IPrpZUE9hiIgMo6mnVvaFFwgm8UjMRfZ1N/epAaj0DhYwqszB4LbXo n2sBU1ZT7E6HSJqOfN0qOmmTkkLE7DgOcqphvjbeHoHhE72mimFDipRW91tylA== 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=1710602173; 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=UYIxytQO0T+OZM/O2PwWZ1zEhwaZKKdiL4kSuOay9ug=; b=GVxxGe6ebJ1sTBVXkrQ0QzJETbEjPjDdzAR03Jaw9HTbS0hWXVc3BLnuC6Zg/hu+6PdFFu 11KauksMJIi3T36W8/qys+tNgYI+aDN7ma/L/e1XJ34kQfpXSX3uTA7dgmtysHWIU5acGo Y3VyScoTIGOHixw481BiO2u/xdup7nyxnZu/mgEfmS4WlLHH++TDV6GTTLG6N7cSQZMFDy EpihPxUmOjOmnSXq49qlCQQQ0ur+st/QOf/sdtBCRCe4ri6B7yXkR0xcez4eq66D/HDdNY nAATWI6jwavKpcW1RHZpw7YVjVhevXCA3RyBZyifKtCtKMgeo1zVn46GyzoGRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Txl7d02ytz10XS; Sat, 16 Mar 2024 15:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42GFGC9a062549; Sat, 16 Mar 2024 15:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42GFGCqI062547; Sat, 16 Mar 2024 15:16:12 GMT (envelope-from git) Date: Sat, 16 Mar 2024 15:16:12 GMT Message-Id: <202403161516.42GFGCqI062547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1269b002038c - stable/14 - rk8xx_poweroff: enable power-cycling on support hardware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1269b002038cead5af35d3fb94a008060246e5f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1269b002038cead5af35d3fb94a008060246e5f6 commit 1269b002038cead5af35d3fb94a008060246e5f6 Author: Andriy Gapon AuthorDate: 2024-02-18 13:57:34 +0000 Commit: Andriy Gapon CommitDate: 2024-03-16 15:11:50 +0000 rk8xx_poweroff: enable power-cycling on support hardware Previously, the function would return early if RB_POWERCYCLE was specified without RB_POWEROFF. Those flags are exclusive at the moment, that is, they are never set together. Søren Schmidt (sos) uses a similar but extended patch locally. (cherry picked from commit 8b408fc6f2f6dab2bfc200edee96917abf425cb2) (cherry picked from commit a044cf60bd375f894b371fc87d148bf4704c05a8) --- sys/dev/iicbus/pmic/rockchip/rk8xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx.c b/sys/dev/iicbus/pmic/rockchip/rk8xx.c index 54f4b289034d..7efa0f879506 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx.c @@ -109,7 +109,7 @@ rk8xx_poweroff(void *arg, int howto) int error; uint8_t val; - if ((howto & RB_POWEROFF) == 0) + if ((howto & (RB_POWEROFF | RB_POWERCYCLE)) == 0) return; device_printf(sc->dev, "Powering off...\n");