From patchwork Fri Mar 22 13:25:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13600098 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 E69DAC47DD9 for ; Fri, 22 Mar 2024 13:27:07 +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=DC8uXLXDm1y0Bx5Xarr0IXCgj7X9lAfKPxq9XMbvh9M=; b=39RfmyEcgJzvOa R9LBc21QUm/bhHo/i3b4w4zaUUmK23/bFM03c9Cn+Vw4gvA9eJuPzD2+0KjbHWjDkS+mSuRA3tZoL Hixo5VHsN+mw0FfGBJnvI2v4ixs0uTc3LOVhBn4JmVyPlfgjU5eS8GZUosd23aSUoTTEk5Rw/3IHh zjyZ5/WzJt/48VBDvR7rrR9RWSQdcf4qcJHrFlp1HDpMGaJnFrJmRyFUwB5GM/LYios3XRLm35fW0 5kkKi1mSiiaxCLCqI044rJ+2MDramoOJwKc50nGE84tMv5Bxk2Pz6oCO61ifK8w6xyyFpzrlP31Fo ZxqFtCgp/cp1ErOcqsGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevA-00000007ICS-0Lyl; Fri, 22 Mar 2024 13:26:56 +0000 Received: from www.zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnev0-00000007I3U-0U0p for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:26:48 +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=erf4Z8JIr6B+tpx1tzGIDc6Yy5XmMXEq/omWmLHe34o=; b=hnc1nT nRvT/YfV2ENjunXaB9nkkUUgozZNzCz9iQF0lQOPxzv3mHFBnxBVw0xg/I89kH4I cRoveeo8ka7Iw9lc6w8e9e/VJ5G5luTv+P6Zwc4FVwqewV6bQmsc77QTH882R7nO CG0h8SSo0H5CTeKT8k0u3vyfHkzwKVZDF1Vkn0hwDnfJ/un3MHM85mp/vdPntxFr FvLbg77zq2OCzqXCbtswGjaNC1vddHPUL3c7eFNwtihckkjk3ptzmXPcVtXs3khM KZxdHuc5R9uCShZH0tsPUw1yswB5uH0qM2VCiRU7LrOb98pwdH3fISVV7EQ3LfOV q3u3EiM7b9ft5gnw== Received: (qmail 3870244 invoked from network); 22 Mar 2024 14:26:29 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:29 +0100 X-UD-Smtp-Session: l3s3148p1@A5t7xT8UkJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Kamal Dasu , Broadcom internal kernel review list , Andi Shyti , Florian Fainelli , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/64] i2c: brcmstb: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:03 +0100 Message-ID: <20240322132619.6389-11-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_062646_615343_72084084 X-CRM114-Status: GOOD ( 13.33 ) 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 Reviewed-by: Florian Fainelli Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-brcmstb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index 38f276c99193..dfdf465e6f8c 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -67,7 +67,7 @@ /* BSC block register map structure to cache fields to be written */ struct bsc_regs { - u32 chip_address; /* slave address */ + u32 chip_address; /* client address */ u32 data_in[N_DATA_REGS]; /* tx data buffer*/ u32 cnt_reg; /* rx/tx data length */ u32 ctl_reg; /* control register */ @@ -320,7 +320,7 @@ static int brcmstb_send_i2c_cmd(struct brcmstb_i2c_dev *dev, return rc; } -/* Actual data transfer through the BSC master */ +/* Actual data transfer through the BSC controller */ static int brcmstb_i2c_xfer_bsc_data(struct brcmstb_i2c_dev *dev, u8 *buf, unsigned int len, struct i2c_msg *pmsg) @@ -441,7 +441,7 @@ static int brcmstb_i2c_do_addr(struct brcmstb_i2c_dev *dev, return 0; } -/* Master transfer function */ +/* Host transfer function */ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg msgs[], int num) { @@ -473,7 +473,7 @@ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter, brcmstb_set_i2c_start_stop(dev, cond); - /* Send slave address */ + /* Send client address */ if (!(pmsg->flags & I2C_M_NOSTART)) { rc = brcmstb_i2c_do_addr(dev, pmsg); if (rc < 0) { @@ -545,8 +545,8 @@ static u32 brcmstb_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm brcmstb_i2c_algo = { - .master_xfer = brcmstb_i2c_xfer, - .master_xfer_atomic = brcmstb_i2c_xfer_atomic, + .xfer = brcmstb_i2c_xfer, + .xfer_atomic = brcmstb_i2c_xfer_atomic, .functionality = brcmstb_i2c_functionality, };