From nobody Mon Jul 15 12:38:28 2024 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 4WN1vn1Wh3z5QrhW; Mon, 15 Jul 2024 12:38:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vm5Yk0z4HfP; Mon, 15 Jul 2024 12:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047108; 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=8yl/Qm5Lr/hugRgr7x3z/4SFKDNmeWXkjZjt7Yq68GQ=; b=rZOgVGgVclRujJAztIVDN14u55Lf3wpjxFSlGDP7u8U4HQBxSupdo+PBNjPYSrFfI8ufP7 GG2HPfY3CTxznBpqkG+iyJf4Tcn0oEbH6NkLivWTLXqTUChNlC7gnmGYr1MWZy2OMnu7tS 3e0gvSY9VDroyFDRz/jtxdU6BMn+7HaJH8/DRvHFOxl1FwfNJy04Y45RuPshFsf3ODi45x LuUBfHh8+WAfbizHJMZQSsSVe5vUhZDEph+r5lyTnF9KqjHp4TCQN1BxMMx9QlJhURz8pn al5yc+6xTrX01YYJvM+8B4aWp9Q4GXVsg5FSseESaMAcPIk6zMC8Z2frgXJ7FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047108; a=rsa-sha256; cv=none; b=E1FQsodryKKRDo0llHUEAmq9D5Ezk9xlVK4xzkZlF5c7hl3ZNxVRILGq2gc/CdvZZ5ZneC 2C/DO/1hXMUYsOHhP5jcC5asRM646k2KyXx3WjVm1ws+hShgWTICmymjVBoWFfUdxUjViw lhNRXkc1BVVdtkksW7WJxPQVyCbsb/SifUuDZJA1XlcvlfS1n9peWK/PTCwTEwP5kroA46 PwMh8PkER8HozIIlmjurLClB9xMQPpy5OBtxBXYbDnb2z3EWBowNxMiJZ9dB4bw1DFbgq6 SOlmuVdcG0WN00piMWJhqVHL50PS+Y3FwjBh+rlrzm/jDkAcbi3NCbbVVzqNmA== 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=1721047108; 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=8yl/Qm5Lr/hugRgr7x3z/4SFKDNmeWXkjZjt7Yq68GQ=; b=xoxWRwASsrte5umvdGUh8hiiHpALONpx+ZWMues+mwfSJRJ5rUYM9QSubE5jex6ZtQ5Uv8 MJJQjD7wLmycEaLB7I8lZe9KA13QmorpKHucECePgjs7xg59/51a3UKNQCaXn2Jeisww6U EG+E58AUiIw96+Udw7FhuOvvuRfvi3/+u3Cbx0A5ws82ybI91dGINpW90O1MgA1fpLcwGs +emPdYeeOWnFudmFGcfKJdhE6anJqRSJ27TDwG5O9KaL6vwqJdlLqJZYiNWdX3s60zOlIm SWvghts/n36663tZ+oUB+ULrkgKg1SiRb/wgwZgJVfrvuKT5caYCPE4X8eJPTQ== 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 4WN1vm5BG7zt1R; Mon, 15 Jul 2024 12:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FCcSXb061550; Mon, 15 Jul 2024 12:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcS8p061547; Mon, 15 Jul 2024 12:38:28 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:28 GMT Message-Id: <202407151238.46FCcS8p061547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 29f8816b668b - stable/13 - arm64/rockchip: Fix the build with GCC 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29f8816b668bfe7765b819eea32a97091d41b5f8 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=29f8816b668bfe7765b819eea32a97091d41b5f8 commit 29f8816b668bfe7765b819eea32a97091d41b5f8 Author: Andrew Turner AuthorDate: 2024-05-22 08:19:19 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34:29 +0000 arm64/rockchip: Fix the build with GCC We were missing brackets in GPIO_FLAGS_PINCTRL. Without them GCC complains a use is ambiguous. Fix by adding the needed brackets. Reviewed by: manu, brooks, imp, jhb, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45264 (cherry picked from commit 4f012d7a7a473d2486f01ce355fd2c79c3d43db6) --- sys/arm64/rockchip/rk_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index 765e03666eeb..4796743bea6e 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -71,7 +71,7 @@ #define RK_GPIO_DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | \ GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN) -#define GPIO_FLAGS_PINCTRL GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN +#define GPIO_FLAGS_PINCTRL (GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN) #define RK_GPIO_MAX_PINS 32 struct pin_cached {