From nobody Wed Aug 6 05:55:07 2025 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 4bxfdl58Nsz64DPf; Wed, 06 Aug 2025 05:55:07 +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 4bxfdl3Dhsz3rmG; Wed, 06 Aug 2025 05:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754459707; 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=w/+1qa+dyxEj4ibCsPn6176pDdtw0WaRR0zHIqdjUkA=; b=fA5xk6VrxtJt4Px3ZDqA6xlSTXoN37ApvRSfEXj2lZ/oAWb4reJEwmcdiymC4BYdaS09ge 2yevkvN9Vta69ZJoARrNmY2H0OjYlbUqyBrsA1n7Nv8z3WQPdZMx5dpk46iur7qiF6hvhG iz1V+/egSIH8jnC9Uo8ZKneDOwwV2AdMjiqWXEDgyfZHQzbg2PFxPR2FIoQYeTCt8l0AGA Q2j4iJrL5zXuACN9HfiPE4m8qUf5fCB6ZBBiNKsZvs8If/Ls2kHE3of/t2chZqhrdjvJJp SGigBCfx7hopGo/3kRLfBiD/+onWaHea+mZgUgjPkTtLZWCUk3cLj/icaUxpcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754459707; 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=w/+1qa+dyxEj4ibCsPn6176pDdtw0WaRR0zHIqdjUkA=; b=AVLqMerBGCIZ14FK1nrJr+gm3swWg2avDoU6gKXh4JgHZYGDczOeGs6Udcmow69R/Cp9QT TNYvj1SVa9mirmswSb1C4zNUKleJd2syUdwyb2jlrhfLfBhE0wctvMKzz4UaSD8QBuYM03 ICmDFonA1SSVUDwA6ZeElI+DPJb6tooWO5q7rz5KRai04NoaBOf0q6LKYaqzz/5pGmJine bv+EHSUHzJtXEBQlBRTaVAzPdAHUusu7u5+mye/kb0CGLCxO8UAsGnPt5Ji25U9vcBQ+e/ lG5s7mZxUgmQD/QhY2xaR5QK/i6JQWpvNZDqioZS8WViEZcissXCDoRqgnlSjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754459707; a=rsa-sha256; cv=none; b=ViEeV3mhjTHWfq/Bqh3F19+7LxZWBge4F2gCMv4M7Cg9wRbPlCMQKTSVDj4Nw6CLdSJlx4 Y3fmVniWJFrBDxaD75iJoGwy0liqJ31ZhQ1/i+sU+D6gBJ37jUQalZMlPl13vTUmtFsvSH oYbSWoOwN0zD86ouLstE4FcHHmicApt4/EJpCtV87DfSYUNKeGybEU4TnFuYpl2+v5NRBL m+tNKqKBhPWyEr4JBaT5seUTycb+S3STLwy3SCIRNTPpu3Uyf/iqqrH99A0TdJhB8vPVKr tUOkObwe3deQ6LKtHDpvBHH9qG3yod5Vaa1+vrphMT0piJg6zJkmskfe8LGoiQ== 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 4bxfdl2nNxz172r; Wed, 06 Aug 2025 05:55:07 +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 5765t7lV057989; Wed, 6 Aug 2025 05:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5765t7Fa057986; Wed, 6 Aug 2025 05:55:07 GMT (envelope-from git) Date: Wed, 6 Aug 2025 05:55:07 GMT Message-Id: <202508060555.5765t7Fa057986@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: 775224f7e412 - stable/14 - rk_i2c: use the register read mode even if the read ends with IIC_M_NOSTOP 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 775224f7e4123378b06c28f1adcb4d30a0717a92 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=775224f7e4123378b06c28f1adcb4d30a0717a92 commit 775224f7e4123378b06c28f1adcb4d30a0717a92 Author: Andriy Gapon AuthorDate: 2024-06-27 07:48:30 +0000 Commit: Andriy Gapon CommitDate: 2025-08-06 05:54:59 +0000 rk_i2c: use the register read mode even if the read ends with IIC_M_NOSTOP Tested with max44009(4). MFC after: 2 weeks (cherry picked from commit a743e280ea0541163afa7d1c320504925a02f80b) --- sys/arm64/rockchip/rk_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index ea32f52876be..6da1d6169ecf 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -526,7 +526,7 @@ rk_i2c_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) if (nmsgs - i >= 2 && msgs[i].len < 4 && msgs[i].flags == (IIC_M_WR | IIC_M_NOSTOP) && - msgs[i + 1].flags == IIC_M_RD && + (msgs[i + 1].flags & IIC_M_RD) == IIC_M_RD && (msgs[i].slave & ~LSB) == (msgs[i + 1].slave & ~LSB)) { sc->mode = RK_I2C_CON_MODE_RRX;