From nobody Fri Jun 27 07:38:20 2025 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 4bT6qJ5xPhz60Qky; Fri, 27 Jun 2025 07:38:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bT6qJ1rqqz3wlp; Fri, 27 Jun 2025 07:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751009900; 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=JDwoYWhOAUypXCt18TCyJWjaudbDaRUFgcv+efVWPCU=; b=W7s1SXLb1wvBFcZ1IU9pF8k76jjtZmIPhfUdKkRM7vCTtF/YtoCVpabhlJE5SN0GTugm4E cxIvILG1EAkV4WiiN2RaXL9VB90elEynkW5qkxulbSS/jnQ3raSy/6S16xRjRAozW9ijJo ZJgdCFpm0IV7H5WFmsQLpe3YQccqiTgp9tfUmznYiMHSvcOF9bHzqzaYxY7ue/x2TVISjg s7xKcr0iipZ5STR/DsxztFRHz6c34M8QoykS3N+rqseCoJMW0/TUmi3HRJ8ftjWixvgSuN vhYu6sAIgH5gBZQD/nouef2S5Q1CPW95CXKT1TMjDVVfMGzkkeD/Mr98ZXsDOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751009900; 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=JDwoYWhOAUypXCt18TCyJWjaudbDaRUFgcv+efVWPCU=; b=jRNGcN/k1d3aR2gzoaG/drjYIy6Pgc/t/FlOT7b8kOx4S0N4e0lvBJo7VbdQK/nvAbfXsh HZDytOlHQK8Uh2B3jdJqOJFpRoeewxUqti7+7qnhoda7T4Z0D15yawHlMVfQG09es+ievi 1HcJ1ChuUMTpvTyJutZIUedFLWbmjLbsmG3QqdELtjXIp81rt32t8SEK0LaC9ye5VIGv9W uQsvfRIi4PDKvjma+TUB9Ivru3GYG7XWA8NB6m1qIg6u8z7ivRnniZCcxOYDKHt35Kk8GJ Oap0vRdn9QqdSGRyIX7SgzLfq7/N7ZpfK6ltKF3OPzVyf6P80qpJy2R5TTLFzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751009900; a=rsa-sha256; cv=none; b=x/jLnngEUJNjIm+X5E5uCm/r8lbWF+bpaQwA+OfqfNuuUT+gzT/JlmEpq8pZpuQrZRAUQC 0t7A1ICDI+8xjEdRJ385dujXFmpoXuFNYF3ewgzVHb4CGw/rN2uPQZquRHVtykprVltYnm n4hWRvTEUcJMky+UulWn8fOoB1cDKFkvFFHyXHoYPk/A83YO/dBa35ClUB+V4urdaqriAk g3ZDSBQynf4H/BaWdc3MLbDIGxvW2og9KM65ka6F7Sgtc64NO7/rKys0QbFXGMjwB+k2Ay RxP4Lnh9GIyHtvWZAn1ubiWOyEMWSJwSgalAlyMaqTLiGDFwy9rk5n33sogsDg== 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 4bT6qJ10Nwzg7R; Fri, 27 Jun 2025 07:38:20 +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 55R7cKLw089554; Fri, 27 Jun 2025 07:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55R7cK1V089551; Fri, 27 Jun 2025 07:38:20 GMT (envelope-from git) Date: Fri, 27 Jun 2025 07:38:20 GMT Message-Id: <202506270738.55R7cK1V089551@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: ce773fbaec9b - stable/14 - rk_i2s: correct some bit-field definitions, add more bits 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce773fbaec9b4fd790803ce253232405bee89f91 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=ce773fbaec9b4fd790803ce253232405bee89f91 commit ce773fbaec9b4fd790803ce253232405bee89f91 Author: Andriy Gapon AuthorDate: 2021-09-24 17:05:22 +0000 Commit: Andriy Gapon CommitDate: 2025-06-27 07:37:55 +0000 rk_i2s: correct some bit-field definitions, add more bits (cherry picked from commit 3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8) --- sys/arm64/rockchip/rk_i2s.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 2ec7d21ad7e8..e7fe8eb46a07 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -92,16 +92,20 @@ #define TXFIFO0LR_MASK 0x3f #define I2S_DMACR 0x0010 #define I2S_DMACR_RDE_ENABLE (1 << 24) -#define I2S_DMACR_RDL(n) ((n) << 16) +#define I2S_DMACR_RDL(n) (((n) - 1) << 16) #define I2S_DMACR_TDE_ENABLE (1 << 8) #define I2S_DMACR_TDL(n) ((n) << 0) #define I2S_INTCR 0x0014 #define I2S_INTCR_RFT(n) (((n) - 1) << 20) -#define I2S_INTCR_TFT(n) (((n) - 1) << 4) +#define I2S_INTCR_TFT(n) ((n) << 4) +#define I2S_INTCR_RXOIC (1 << 18) +#define I2S_INTCR_RXOIE (1 << 17) #define I2S_INTCR_RXFIE (1 << 16) #define I2S_INTCR_TXUIC (1 << 2) +#define I2S_INTCR_TXUIE (1 << 1) #define I2S_INTCR_TXEIE (1 << 0) #define I2S_INTSR 0x0018 +#define I2S_INTSR_RXOI (1 << 17) #define I2S_INTSR_RXFI (1 << 16) #define I2S_INTSR_TXUI (1 << 1) #define I2S_INTSR_TXEI (1 << 0)