From nobody Fri May 13 22:54:56 2022 X-Original-To: dev-commits-src-branches@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 BBB051AD4F31; Fri, 13 May 2022 22:54:57 +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 4L0P9Y00fSz3nbg; Fri, 13 May 2022 22:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482497; 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=tXaRcvyxwImRVsnbbNGhGrnVRgduk3fidG3hmlnyDas=; b=gTkzG/aCbrmCY1T6MZ87y6NTDJd9Yg7Rv2gy/GD+HmRt0zNidyKgGp9890HDxoIc3P9AgG Qk9hM41JUC3cOZWr4F3Su6Z1IXLLcctzZIKztqlJzfJ5NiEo52FNgqn+DZWs8LXF9ziN+d dVeCtiZDlc0HkveloJPLkOThmnpjTPMXELvuPR+bHHjtLQ4oFVShl8FvRc4j9Lvjbp9I9r eSjfCqyxs7+jXJAgVJ87aO94o5GlbNBwcrv3w+pC6zNlBFxmAUC20fm492/OwrOlJFgDwB 0MapHG9SwV49A7Vp7KjGZdVXmLEzjkOj0lp02NSbJOPBCk6NzwxMugMG74jliw== 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 A10FF386C; Fri, 13 May 2022 22:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DMsuoF078441; Fri, 13 May 2022 22:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DMsufs078440; Fri, 13 May 2022 22:54:56 GMT (envelope-from git) Date: Fri, 13 May 2022 22:54:56 GMT Message-Id: <202205132254.24DMsufs078440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 050b951c6719 - stable/13 - as3722_gpio_pin_setflags: Use computed mode instead of hardcoded PUSHPULL. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 050b951c6719acd31293c00b4c58ebcca13b7e02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482497; 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=tXaRcvyxwImRVsnbbNGhGrnVRgduk3fidG3hmlnyDas=; b=don/NcCpb0Fu+wrzAiQI3f6sYc97OpwB2ay4A0iuw/JGK6FC/5DXohUwOgMVVqfHN79Qeb yRO8fpgpalehsnNAJrEinZapkO4TX/EqRh2ZBlq/wOTE+kk0ZjNqfXU4ZNVTWStcABwJA3 tXUqkuV9Eh4vF3k7gzr66gTBuaxTwWuHf9uWqAN666kvZ3xpUtUEJFj/LGVx+jhd5L7u9p 1QnMi0BICB+XK6ObmMiQ5TGvo9voc9g24/sNeQ3oQ0Zk2xhSxKqIgUrvVf32Qg47EApoJW 91lE2mFPFS2/E8ZnVglFMdsJugFxtmPHiwfhS59cVmVLpzzr+FB4SQ2/vZ847A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652482497; a=rsa-sha256; cv=none; b=oaZbebGiBMLLTnQ488lhHQDLzbE5phdR10L4xU2Ro7gBGarsnan5wr92tJwXlglRbwY8mQ NDmWDa6VVxIvzURQ/RqAU4vn9jlqRCQ1rKam2xR+YsaMI47dK+Tumz5Kl6F+Qvehotodmn dq2ioQP2C0fNgU4lfRGnyUn5B8BzNjqWTqFLTwoKYJn3jJctifcVpUldSxqNw5dXd37HyM JUcQ1EewX3/DL+Vx8iEhsuTaeiEAP2IvBbONESwRihZsctEyaDzJ8yzGrmHtiIlArSYHVv qzhXBOflZ9q687jx/5DNC8uDRhwUFcmsw0pPDS6VZeIxnmeb/QVxgo4gAtCUYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=050b951c6719acd31293c00b4c58ebcca13b7e02 commit 050b951c6719acd31293c00b4c58ebcca13b7e02 Author: John Baldwin AuthorDate: 2022-04-18 19:28:48 +0000 Commit: John Baldwin CommitDate: 2022-05-13 22:35:43 +0000 as3722_gpio_pin_setflags: Use computed mode instead of hardcoded PUSHPULL. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D34855 (cherry picked from commit dca7f696322a06247a1f73ad0e843ff9795457a1) --- sys/arm/nvidia/as3722_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/nvidia/as3722_gpio.c b/sys/arm/nvidia/as3722_gpio.c index 1afdb8a94f8b..bbe8b399be8a 100644 --- a/sys/arm/nvidia/as3722_gpio.c +++ b/sys/arm/nvidia/as3722_gpio.c @@ -443,7 +443,7 @@ as3722_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) } mode = as3722_gpio_get_mode(sc, pin, flags); ctrl &= ~(AS3722_GPIO_MODE_MASK << AS3722_GPIO_MODE_SHIFT); - ctrl |= AS3722_MODE_PUSH_PULL << AS3722_GPIO_MODE_SHIFT; + ctrl |= mode << AS3722_GPIO_MODE_SHIFT; rv = 0; if (ctrl != sc->gpio_pins[pin]->pin_ctrl_reg) { rv = WR1(sc, AS3722_GPIO0_CONTROL + pin, ctrl);