From patchwork Fri Mar 22 13:25:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13600107 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E8D57C47DD9 for ; Fri, 22 Mar 2024 13:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mzkZAybvpDLMyZlxEznenynFRFmiDpYNpqXgOXTQPX4=; b=TacWXyTak50xQm 0zFnAfIBhvIAcGqRo/WbMCXM83+l+FYOSJ6EDFCKXxGswCCzUmPl46bcWU80j02RF5mkuaTfUbA+w edu5al9huODPHrjbxeHSUbSZL4Mk0FuOtiFI6hfUyhikfKk70L8sroXefn2hYUy6FyK6CdlaUuU92 y/dwcyAcnlfaiilmXVxc0Fa3o8InYw5vVkn2Ee/iBLrOXINQa7n55q9ZKPD/THdTYHzZi8KsXeLTX pm/BSlcqLPoxYgtU9qOC9//I3r179UclVqiPAYjrC8LdXpyU2hkPg84OpXJQfn+GMx7Oqx1BD3ldq wfNadVTqKXT8VQDVb3fw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnex2-00000007JQF-45NF; Fri, 22 Mar 2024 13:28:53 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevb-00000007ITn-2pqQ for linux-arm-kernel@bombadil.infradead.org; Fri, 22 Mar 2024 13:27:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=OoNwixtQZ8u2Ylf1U91QXuREyq7/jiz/2k1ymkgoJiw=; b=PNgmL3Tn+HplF/j5PEl/xYlCGy vmNhReK+udu2NZJ3bRFA3oilUm28KxemY8UKXUOqLHT8+AhNILPj9+66PvMS1r2dleduXt+casADk SrteWfgANjgaJOT0wqSvwjqEgZqe+BqnVy4VfyA9ocLsPLNG3YU+6DmW1q7r+FX01al8PigzHyCQp RhR0xgdUiU0zN9LgrGSYAO0jlvy2fw/iC5rcy7h1p4pgwjgz0Wh+3czd6YWVPgsexV5l/zVPW+0Vl nkVq8TactJRWuCVQvpWVeD6KgiJDq5XS62dYSF3csNvP35WqCpLZlWlVYJ46/CslgN6ZNW08/lnUD 7zXIUs7Q==; Received: from www.zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevY-0000000EoAp-1mVF for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:27:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=OoNwixtQZ8u2Ylf1U91QXuREyq7/jiz/2k1ymkgoJiw=; b=fDvcCs /oGhIMo9aFYcMjZrAhR/c+tbMWgGgXyPtgGOZ0tYU2bOigtIIgp2AGCYqesFvLHo oEOxca5UI3fIVov00dTI9sHoNZ6ejLlRSyuWmKFbkua/wdHbuOkdEHjajZh0hRXq VyHhqjHjXDPYcnXcY8loQ+cbONbRTnFDkHa4m0KHzeZjPHpNq40jf56BlxPAoApS IoDp6jVqYynAsAh1io9sVyRzqCd2nkIiQ0owRRwTdU1t1qSuWdOa/F7qRSOE9QZC Q8St+R918q/fnYP69ik9wGxFXLBy66VwvRU5A+juRXsAI5ADTavgpmOhMz4DjEF8 bI9CkQM0nskXqDZg== Received: (qmail 3871375 invoked from network); 22 Mar 2024 14:26:54 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:54 +0100 X-UD-Smtp-Session: l3s3148p1@xUD9xj8UdLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , linux-arm-kernel@lists.infradead.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 40/64] i2c: owl: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:33 +0100 Message-ID: <20240322132619.6389-41-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322132619.6389-1-wsa+renesas@sang-engineering.com> References: <20240322132619.6389-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_132720_658538_D0FFCB1E X-CRM114-Status: GOOD ( 13.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. They are also more specific because we distinguish now between a remote entity ("client") and a local one ("target"). Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-owl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c index 777f1a0278c7..cb90e1b2775c 100644 --- a/drivers/i2c/busses/i2c-owl.c +++ b/drivers/i2c/busses/i2c-owl.c @@ -172,7 +172,7 @@ static void owl_i2c_xfer_data(struct owl_i2c_dev *i2c_dev) i2c_dev->err = 0; - /* Handle NACK from slave */ + /* Handle NACK from client */ fifostat = readl(i2c_dev->base + OWL_I2C_REG_FIFOSTAT); if (fifostat & OWL_I2C_FIFOSTAT_RNB) { i2c_dev->err = -ENXIO; @@ -302,7 +302,7 @@ static int owl_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs, OWL_I2C_CTL_IRQE, !atomic); /* - * Select: FIFO enable, Master mode, Stop enable, Data count enable, + * Select: FIFO enable, host mode, Stop enable, Data count enable, * Send start bit */ i2c_cmd = OWL_I2C_CMD_SECL | OWL_I2C_CMD_MSS | OWL_I2C_CMD_SE | @@ -314,7 +314,7 @@ static int owl_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs, i2c_cmd |= OWL_I2C_CMD_AS(msgs[0].len + 1) | OWL_I2C_CMD_SAS(1) | OWL_I2C_CMD_RBE; - /* Write slave address */ + /* Write client address */ addr = i2c_8bit_addr_from_msg(&msgs[0]); writel(addr, i2c_dev->base + OWL_I2C_REG_TXDAT); @@ -420,8 +420,8 @@ static int owl_i2c_xfer_atomic(struct i2c_adapter *adap, } static const struct i2c_algorithm owl_i2c_algorithm = { - .master_xfer = owl_i2c_xfer, - .master_xfer_atomic = owl_i2c_xfer_atomic, + .xfer = owl_i2c_xfer, + .xfer_atomic = owl_i2c_xfer_atomic, .functionality = owl_i2c_func, };