From patchwork Fri Mar 22 13:25:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13600102 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 52225C54E71 for ; Fri, 22 Mar 2024 13:27:55 +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=281rJN2rOgMProFjglJYfnM3KpV6/fIEbR8Et6uwXsM=; b=dOwCRQr0++x8eA Z5UY7YQx/ghW2i55G7lP4JGmPO7TF5Izp/si4/i5qhSJ7B/XojegLlQJxrFRqBB+NdOWBRuHxcYMR spJuwVDF+KvRmpri0SXd4jogCFXXsyDiKULiTVWmgZJ4nlvRX0k/dKTnUKDnh5vucPBS4YL922AvT auOrqUG6rRppbN9hQWDVR6D2fJOAzjBEH66pAxPqCZweLixxQb1i8pz0SwZWMLS4oDLUscJ1tq9WF QQhhSkfGfscxrf/D/zjUciZQaIPUVNHxdZV/GqEYPBCZEGucNjcHp56dX6DqeG6s4ZTcfmyj0jF4W aB+M2SO7QltgbtVJgF+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevu-00000007IdW-0uxe; Fri, 22 Mar 2024 13:27:42 +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 1rnev4-00000007I6m-35Zv for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:26:53 +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=bKgrZEObGcmhfV42TbjIYa6lNwDyHSA/oza3/g3uxco=; b=TAdyd+ hGz6KcvPtAGB6w6n5CXQ7uXp5/mcMwVTBZi2VYnAOuU+7dYoiDypDWdx0mRDWQv1 JwQPq0hF8kK4eQ1TowJtQke0OYjQIojBRBf403/aksRzZdUfvoWwf9erT5lGOHs6 tVbGV8zsGZTcdsZAzkdxrTvP1X7rH7Zp+sbdtDz6gUD8G9YtUQim2bI/zkyP3VrQ trsKtHSzlgxSk7NXLKk7n298VC3Ow9EP/P0BP/T6eunzU7DLYbh6rhhbD01nw3yg 4eZt84TTZV/IDA5AzDDUT12gZ8iJhKTlRcu7st3DS9UacQYtoVevRpN86oT72Ef5 fIeM/5dBJHXKKiqQ== Received: (qmail 3870370 invoked from network); 22 Mar 2024 14:26:33 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:33 +0100 X-UD-Smtp-Session: l3s3148p1@Gxi9xT8UuuBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Bartosz Golaszewski , Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/64] i2c: davinci: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:08 +0100 Message-ID: <20240322132619.6389-16-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_062651_481879_D31C83FE X-CRM114-Status: GOOD ( 14.98 ) 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 Acked-by: Bartosz Golaszewski --- drivers/i2c/busses/i2c-davinci.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 02b3b1160fb0..1884d77934e9 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -263,7 +263,7 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev) /* compute clock dividers */ i2c_davinci_calc_clk_dividers(dev); - /* Respond at reserved "SMBus Host" slave address" (and zero); + /* Respond at reserved "SMBus Host" client address" (and zero); * we seem to have no option to not respond... */ davinci_i2c_write_reg(dev, DAVINCI_I2C_OAR_REG, DAVINCI_I2C_OWN_ADDRESS); @@ -407,7 +407,7 @@ static int i2c_davinci_wait_bus_not_busy(struct davinci_i2c_dev *dev) } /* - * Low level master read/write transaction. This function is called + * Low level host read/write transaction. This function is called * from i2c_davinci_xfer. */ static int @@ -428,7 +428,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) if (pdata->bus_delay) udelay(pdata->bus_delay); - /* set the slave address */ + /* set the client address */ davinci_i2c_write_reg(dev, DAVINCI_I2C_SAR_REG, msg->addr); dev->buf = msg->buf; @@ -440,10 +440,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) reinit_completion(&dev->cmd_complete); dev->cmd_err = 0; - /* Take I2C out of reset and configure it as master */ + /* Take I2C out of reset and configure it as host */ flag = DAVINCI_I2C_MDR_IRS | DAVINCI_I2C_MDR_MST; - /* if the slave address is ten bit address, enable XA bit */ if (msg->flags & I2C_M_TEN) flag |= DAVINCI_I2C_MDR_XA; if (!(msg->flags & I2C_M_RD)) @@ -688,7 +687,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) break; case DAVINCI_I2C_IVR_AAS: - dev_dbg(dev->dev, "Address as slave interrupt\n"); + dev_dbg(dev->dev, "Address as client interrupt\n"); break; default: @@ -745,7 +744,7 @@ static inline void i2c_davinci_cpufreq_deregister(struct davinci_i2c_dev *dev) #endif static const struct i2c_algorithm i2c_davinci_algo = { - .master_xfer = i2c_davinci_xfer, + .xfer = i2c_davinci_xfer, .functionality = i2c_davinci_func, };