From nobody Thu Jun 27 10:33:18 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 4W8vzf4Z9Lz5PR2y; Thu, 27 Jun 2024 10:33:18 +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 4W8vzf3lPbz4grR; Thu, 27 Jun 2024 10:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719484398; 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=xEcSUH1JG/Aeas9moXD9n5XWTuyvtHU1HRUiPZYBvaA=; b=bmasqveNQwUr8qkdWwwu767BuVE6SXXeRNH4j5HNyfMkbVR1hLWRy/asI3nlntcdzxm8Xu OcLo0nf2ygDMq24rBeZ6J/KoRqUFPr2nto5aBcppSHd0rneUbY61jxZTKPEdkk+ArDhGPY BVOiRwtGkqH/f3CsZoi1OcdNVXYAfWF59CK59oLIPKcdWk7h7Gwhla1ucLbs8aYmrhiVZt X1tXZTKSW9fXzFk9KYRWnAMHr0qumEHw5R7/CZw+4YDeo6zOxpbMpu990tHiFNBY9G5P4B aG2UcPDY0PbzN6qrIfDVSLNPTx0U96dmZGdnA07cqmIxUS+FefuMPtNpA6An9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719484398; a=rsa-sha256; cv=none; b=hJtU5Uhh9R4k4qHTcu9mnj99VLTOjv9wfk28sM+fjD4QhsnvJynMCptQcRb1HF8JFmLqSJ G8nmu81BjbLAyBz93JHL0opKJleY4/K3i81EEPsvvMuTbPfoUA2zyjtRnvY8i5B+rpT0eD Aitq9QaDsD0eQmPtzEsi4DeNdOE/lpWHwYImuflj3mfFN7YOLELUCdJrIj19qQX8HyhCMY vBSzIIkpYVROFxILkAmD2gLK2nhO3GP4+DHstktogVulZg2pq2KVR4BezIafV8HwJ/lBPG GOi2VU3vHI8FNHIZ625lFZTqFxjdPJRbuomP/XqQPnHroSVgk6Q/TvXE2cGsig== 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=1719484398; 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=xEcSUH1JG/Aeas9moXD9n5XWTuyvtHU1HRUiPZYBvaA=; b=sMnTGmRRo6W4lJlVAUsQLodIBBSWgQ3hUz+CcD+bn4Dbfq/V1Ckis8yxs4jyOF2piBxkO4 1DhETLSq7TrMLhklXFwmXh/xkM/3CS1pV/kna9eAl/0F3hQRTzX28MS3N5hdkXSJaPLRWU YJux878uUyttfHQxszmUk3k5NCfOOV6mKsxpGO3cZHvzqW5HAChmFAyW9Ijwp3M4qI+orC Xcxx3L6SBT/YocUvTU/qO2rA0/yamW5etuONDMtODDYbKNsEG0SffKP4S1UMPiFUIDAkW5 xn9auiSUFfRMpAjD2z96qe8eFrruWOVfDsHzVy3SeDnBzrAKfuwv8gKm1ORY5w== 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 4W8vzf2SfTz1NKX; Thu, 27 Jun 2024 10:33:18 +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 45RAXIbW079220; Thu, 27 Jun 2024 10:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RAXIiB079217; Thu, 27 Jun 2024 10:33:18 GMT (envelope-from git) Date: Thu, 27 Jun 2024 10:33:18 GMT Message-Id: <202406271033.45RAXIiB079217@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: a743e280ea05 - main - rk_i2c: use the register read mode even if the read ends with IIC_M_NOSTOP 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: a743e280ea0541163afa7d1c320504925a02f80b Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a743e280ea0541163afa7d1c320504925a02f80b commit a743e280ea0541163afa7d1c320504925a02f80b Author: Andriy Gapon AuthorDate: 2024-06-27 07:48:30 +0000 Commit: Andriy Gapon CommitDate: 2024-06-27 10:32:47 +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 --- sys/dev/iicbus/controller/rockchip/rk_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/controller/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c index 9f2a98bcea12..d9fcc8fa8a7a 100644 --- a/sys/dev/iicbus/controller/rockchip/rk_i2c.c +++ b/sys/dev/iicbus/controller/rockchip/rk_i2c.c @@ -525,7 +525,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;