From nobody Mon May 19 09:19:25 2025 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 4b1Bvx4nXZz5wpC2; Mon, 19 May 2025 09:19:25 +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 4b1Bvx4DrVz49Rt; Mon, 19 May 2025 09:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646365; 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=jzTMmLwIYxa7xavhrsEEbuhAUErMHtNyRI4gaFTVIRs=; b=LbgCDsxcQwfKUOslOJMYXvxsg4ONG4aMp3g75DKOZPk3ErFIhWMJ5ZYExdMxnlaMjISQn4 I/1TSlaGaT7dq0oWW9gs5QFqS8gspjmVSUD5NEKhDrmUJnrpS99SAccqEvkNB9GhElIL/F oLmEKKQ9cL2P1HLUig2/ItKQXeoOrD14cktUrpWCF71bfQoWpnwPxEabW7ZucFHHN+Qc2r nAg7xMTb3+K3r2BIR5m7tYpCY7NoKy2eRsz+20C96T+10hisxRU+FJRedLJTdyRYlyOGCh lqiIB5MN6w1/w8ZuHP0LZGqFSjyXM7nC0aRUdpwELFCy3CtER/wLTur2GP4qDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646365; 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=jzTMmLwIYxa7xavhrsEEbuhAUErMHtNyRI4gaFTVIRs=; b=XjgUH/U5Ive2a0xB2Eb2offkxrx0yL0NaPY8DAWzKP70447sHt/NC5NADDXMyHc7YtsLCb VkBtFf+VOhNA8+K9eAGiHbd9PaC7gMG9jdcgQ/HnES8xW/KVCOfkAwvKG/WMn7kCJSBMFf 3Y1y+5FU+QQ2WX8E1QqXInsSJuRooKPkHVbuSv0jIJN4AUvQG2kZseyP3kYkfG4zwoW1yw g/o+FScOtADpnUAZfvAlIO+fGVxE2Xu0qjI8nkjpvOWZKyxFHt+zUvji5PczLRIMS2qRtT argCZz3Xmm7WNaagajIzLKpdlsHTqbuZKgd01J/UWgw2RJJzYj3vtP5dpgDdhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747646365; a=rsa-sha256; cv=none; b=ibFlv6Lfddv3CW7YpG7o/53l8wH3ZAuKQMRa0bTG1vVfhtVZy8JvcM8dDKDizpHcbmww0l Xgas6SmylUq43dJkKrQX8Ze5J/JdzWlRDEXPzl1on6qpRLW2XPCSJeCHIauC6jRRntUXGF NhprPbQVKDKTj9KYWQezmXTOrDAVvPSKLq+xv/nehlBifz0kGI4HQANx0CkvIw99EqeVSp o35YwJ8atKmI51gVWiuIbYb8jNhMBbyov9/gqtFNZlVLatUEKRVBDYP1lV0G4c2Rl2P1hc k/EzUnqcYd/q29kio1Eeu09U8utivQT7N/g8YtLrtVXFo1AkQcKQFP6eJ3x1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b1Bvx3bFZzy9c; Mon, 19 May 2025 09:19:25 +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 54J9JPWc094864; Mon, 19 May 2025 09:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J9JPa3094861; Mon, 19 May 2025 09:19:25 GMT (envelope-from git) Date: Mon, 19 May 2025 09:19:25 GMT Message-Id: <202505190919.54J9JPa3094861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 3fc4ddb0151d - main - rk_i2s: correct some bit-field definitions, add more bits 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 commit 3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 Author: Andriy Gapon AuthorDate: 2021-09-24 17:05:22 +0000 Commit: Andriy Gapon CommitDate: 2025-05-19 09:19:03 +0000 rk_i2s: correct some bit-field definitions, add more bits MFC after: 2 weeks --- 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 3d6aaf523c4a..5f1b6bbdeabf 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -91,16 +91,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)