From nobody Mon Jul 15 12:38:26 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 4WN1vk4jmpz5QrsD; Mon, 15 Jul 2024 12:38:26 +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 4WN1vk1N6vz4HVT; Mon, 15 Jul 2024 12:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047106; 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=mGLVq9Eu8qrVWRh/Z5mzobTVNOdGi/eNmELLwPLL2r8=; b=TCIb7Wqb37dXINNhqHBFQp0q69/OpF6M9yul8jPFrZq971LJg8Flcc/HkVRUY80iOd9zyB ON0bakS4muzBTjYUOPnzgy0lMUoVYJoeCCUWAa3IB0nFfGRWN74VAjjcBN1x/mi03BW8/d 5/4lxm/5GwERO4mbt0wBDVFI+XIqsxqswX+0k/0ZNT8PJlWejXHjf0mRc70cVKfLIRF05z SzzMXy7SqLZCF39MhOCJMZHxF4Xu7sXYe8xamhaaExc7GtkZudyJG0zRUjtFWhP5zcE/Z5 ymebpQIJNDdSAsFgmX7SIkClh5Iw9Bj9kpb+OSpfO9BdFAcIEq9gOClzZ+0BpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047106; a=rsa-sha256; cv=none; b=RtRHCqdnVoSBAGdd4J/Pg8wi/WxoZX0GbVcLqB3FsjZEDqesCPOaydsxPf5LJAPdIr88JX eskm/bXrRGrMHWQpN/JmboxCrc4W/WGER0KW8QpVb2wv8NPYVr2UhjOco7aEq/iKdkBMs0 W6434/UdiJdnw1ABd406ylNQDcDCnQfPYBuf2hxUllE2HT+XvUp/Pwp1x1Ci+6zmseXioE 18GtwJw/GMLecvgfDIGoDdhP68wEIoGxaTMrP2UCHEfdZlkILNnOhy21scTixSYJjCdfdg jgKeHW8+AxN722y8arLgJB8KbxPQFakP3hbn5aReK6DKmPyTw5yBggHITaY+og== 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=1721047106; 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=mGLVq9Eu8qrVWRh/Z5mzobTVNOdGi/eNmELLwPLL2r8=; b=oh0BfC89nrR9odQR0SWZ1l00KsjhasnhOyCZud3X4yO6L2gsGQabdErE0xCuVGlReKU9c+ i2MaqKyhnPE/OTtcczco6xH2bhxWB/35Bo4lKjC2XqK0SjyG1KTDHkKBTb3H43cu93TUU7 S0/WhSRlTYs+NyMaGc0/3Kc15q8BbEHv6EgpcJjEaBdihzSuW281tcFn8tiBcJr6uEk3Vd loVpD4MKfS9eL53lcHcsiwj9CBnEVaoY5Ly5emgji0AU3HyFeJSp6Pxj1PF4wo1DuJIVse 8B1I1T+qcTrHd7bA38cWfnGXm7XnR3XPMgOaHv+AnbxJaclO+IpwfTXnBzJPPg== 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 4WN1vk0zXfzt5l; Mon, 15 Jul 2024 12:38:26 +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 46FCcQbE061315; Mon, 15 Jul 2024 12:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcQ29061312; Mon, 15 Jul 2024 12:38:26 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:26 GMT Message-Id: <202407151238.46FCcQ29061312@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: 0fdc0f361482 - stable/14 - arm64/rockchip: Fix the build with GCC 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 0fdc0f361482267646f033a9daa6fd564be3a209 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0fdc0f361482267646f033a9daa6fd564be3a209 commit 0fdc0f361482267646f033a9daa6fd564be3a209 Author: Andrew Turner AuthorDate: 2024-05-22 08:19:19 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:27:30 +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 c0d35fae3b7b..b1175963a5e4 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -77,7 +77,7 @@ enum gpio_regs { GPIO_INTR_EDGE_RISING | GPIO_INTR_EDGE_FALLING | \ GPIO_INTR_LEVEL_HIGH | GPIO_INTR_LEVEL_LOW) -#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 {