From nobody Wed May 22 08:32:03 2024 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 4Vkl0N2F1zz5LD5f; Wed, 22 May 2024 08:32:04 +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 4Vkl0N0jSPz4jCS; Wed, 22 May 2024 08:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716366724; 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=AkzSw+sDMgZ9x3D2I7Bzg5r17YxDe59aj0cIyX1pUFM=; b=lFT+NyM3rVm5tNjgl8gXhe3s+5L/nAElYRwGcu4RSN7w7gqM0+9bt1RLASPv5+WapQ3YNY Bx6Y3bEYlksgrvJ7UF+47rGj/k8hqACHPU7dDg6wo/EcBG0BXNTTVoyVOtGKLn30Xxa7NL sLE1dBp+stod5pqLq7qykJfAhZGd5hYCb3fs6MceRHd6/si4mHP9HpP6fknhZjSBeKkjbI AkgKmmOyQPL4X4IrVq8IXNT6uKpf3EXXOi8iqyc8uo1kJutLYeL0cVN0bdonBbmet6uD16 +Z7bU7kNHkQFDKLT5urdmfIOcORq0maIWQaNQHZVSiJM8WZVHBQ5nfQvlIBAeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716366724; a=rsa-sha256; cv=none; b=nwCGwRyC8PPoRsT9w7cZCu2nkEgVpZs3ySRxDDu0pu5Ztqo5WEyPnwvn85DVXIp5QHJ/Nc 27XNSO0TwRNJSlU+7Yo4g1gHhOkMqLJ7gC3n4dtL9HM+RgVTLauP3Fy96MM0W/wCe3fYjK CEzPC+1XL49shlkY79rYDXF98+G81HBniTb/og7L5PPMkS/VOpElAKkAj31B91igFmOzX0 3VySZtINY3BBP3VnbZqkIt1RvkjxkydtD6x0yo7mlMa2c4Rk/qt9aLmnqn+rXlIApy5Xa9 Zf58YUHoVP5g395NRNx1702OprPkmStamyxiehPENKNgdVJgIHu0JRP81QqrOQ== 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=1716366724; 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=AkzSw+sDMgZ9x3D2I7Bzg5r17YxDe59aj0cIyX1pUFM=; b=IZ2r0wVe9JQgrxFErU0Dz0eoFkBQ4M9A9eabXSqR6QGpYIfuAxsUw9Xuj5XSKSY/MATu8p N2LCGaP53TFIR6flIg+RL5wavTvUjo6xIhFHUHSUlAbNfU46mGMEgC3vAPxGl6gn4mBMgX HlVhK6SBMZeYP8D0kBMCwPnUmm1xI349MZfJFfYVcZ9sV2p38r4Dicn0UkneejXnswJjfv Qg3Wk6Cg+mSoOXSgKNFRLzeki6vKD6C62sEaHd8n7XrF4VJ9iuj8BorPGRA4A3y0ELSNpk VQDbFLhQA56PH+Dkmr/gHQTPDjx1nJDWeC+66PZ3RgVHh5cAEe6dDbGRjMAKFA== 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 4Vkl0N0KD2zyG5; Wed, 22 May 2024 08:32:04 +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 44M8W3SB009027; Wed, 22 May 2024 08:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44M8W37P009024; Wed, 22 May 2024 08:32:03 GMT (envelope-from git) Date: Wed, 22 May 2024 08:32:03 GMT Message-Id: <202405220832.44M8W37P009024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4f012d7a7a47 - main - arm64/rockchip: Fix the build with GCC 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f012d7a7a473d2486f01ce355fd2c79c3d43db6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4f012d7a7a473d2486f01ce355fd2c79c3d43db6 commit 4f012d7a7a473d2486f01ce355fd2c79c3d43db6 Author: Andrew Turner AuthorDate: 2024-05-22 08:19:19 +0000 Commit: Andrew Turner CommitDate: 2024-05-22 08:19:19 +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 --- 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 6a7ae95d4e8a..a86392f16624 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -76,7 +76,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 {