From patchwork Fri Mar 22 13:24:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781957 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8037B4654F for ; Fri, 22 Mar 2024 13:26:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113997; cv=none; b=eWqxbfXp5DyF3bEO1eTLrp53uZddfWzYluZYcD6ciwuA8MqU5CUIlhlIhvR/1oX/YwnToSUef+J8tNr/lYF60RfKIRq9bmMXaYH5fpmLmZJMVRuqVYzcUUTR+7I2ZCU3ypTmKDTkLHHZjxX4vmgkulamPIDnGUhRssbJJE2RUtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113997; c=relaxed/simple; bh=w5Phmd069KLC2yVdx/Retzyvj1HQN44l5T592JcKHPo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DtXRIBzFdTXNb+MNXFdAPWzKY+T/38y/JtFlOLIliCqO4aKr/S51iFQR44OhFf8AckpiQ6e7B73n6mOSWKEbrF+TSun/XIIIkKEi1zRnOM/QZ/5svn/03SofPCmoXOzdkeFuULjMars3X2vowwkd8v+jfr5JEWtLfZDvvZdhk7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=c/AJNyJA; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="c/AJNyJA" 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=qvWF/G6afHnYDj7KH1Olgads4nkNb+hPCV9G17SIDxI=; b=c/AJNy JAptAhw77DUsPBzwXEfLOItB0E+WqViqs5IqH8TXTokfQHJNGjWSZAGcmxqBzNys Yiqb/2HU1fVmLbQLAi9KcKW2/d3WlW/ctwZRmHSMEz+A0OPdBvv4WOYjtATThv7y muDw9CjA19QAHXvw0I5HH1IQIw7GCIKbhiHo8G+f4btH21mC17MCmC3/bF2IZuHz fOv4D6dX+ygcUUwV6DtzMZMUB1mRiPAv6yhX4JEm3w38hgbcBtJGZ52ukcmJ84vq nxIKabTuUtBKugClXtrD56ngvgbT4hX+TVEx63POvphz8I/XBbOskecS76uEMKWi CFCRe4TgZ3Knqu9Q== Received: (qmail 3870099 invoked from network); 22 Mar 2024 14:26:21 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:21 +0100 X-UD-Smtp-Session: l3s3148p1@cSUDxT8UPpNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH 01/64] i2c: reword i2c_algorithm according to newest specification Date: Fri, 22 Mar 2024 14:24:54 +0100 Message-ID: <20240322132619.6389-2-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Start changing the wording of the I2C main header wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. The first step renames the members of struct i2c_algorithm. Once all in-tree users are converted, the anonymous union will go away again. All this work will also pave the way for finally seperating the monolithic header into more fine-grained headers like "i2c/clients.h" etc. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- include/linux/i2c.h | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 5e6cd43a6dbd..9acab1d21655 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -548,10 +548,18 @@ struct i2c_algorithm { * master_xfer should return the number of messages successfully * processed, or a negative value on error */ - int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs, - int num); - int (*master_xfer_atomic)(struct i2c_adapter *adap, + union { + int (*xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num); + int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num); + }; + union { + int (*xfer_atomic)(struct i2c_adapter *adap, struct i2c_msg *msgs, int num); + int (*master_xfer_atomic)(struct i2c_adapter *adap, + struct i2c_msg *msgs, int num); + }; int (*smbus_xfer)(struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, u8 command, int size, union i2c_smbus_data *data); @@ -563,8 +571,14 @@ struct i2c_algorithm { u32 (*functionality)(struct i2c_adapter *adap); #if IS_ENABLED(CONFIG_I2C_SLAVE) - int (*reg_slave)(struct i2c_client *client); - int (*unreg_slave)(struct i2c_client *client); + union { + int (*reg_target)(struct i2c_client *client); + int (*reg_slave)(struct i2c_client *client); + }; + union { + int (*unreg_target)(struct i2c_client *client); + int (*unreg_slave)(struct i2c_client *client); + }; #endif }; From patchwork Fri Mar 22 13:24:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783375 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FD2C46556 for ; Fri, 22 Mar 2024 13:26:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113997; cv=none; b=apEgw3ioroa7KGMtvrsBFIV6Sl8ZAOI/8VAxlrKpOR3UAMPrI4i8+EwjUgUgCW94sC2y9uTEq54BOVJ7+F+bkOQzE152ViIqpJyt1+kROaldMFz1JcP4YPR7xyf3FxzF7Z039Mx7Vt4HXV2mYkY903X/7TONE+87+I+jMQWG8Ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113997; c=relaxed/simple; bh=skQK1vYX5MdIVyVug6aQj4Xepi8MNgoG6FEMH1/6PNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tGnwtMpubvqtgAsF8NsIqtK/jvBfEuxAFqwfzVJoHMOzHL5RkERAQHm3/U0tkOuVGY+3gkBeTEjqWVmy2pTLjfFA1gdDp74OasO5BCVQFaONP+K6JYLWkYji0V69S1Waf0Q0ekFDVwafZqwZpz1a/YcWa9zYwNEi3n818pgaNTI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=G+7gbPHt; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="G+7gbPHt" 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=fQ7D4wtgc9nYQIU+CodDHknOiR+ZSLkgQCzZWxbngEM=; b=G+7gbP HtBN9FeLl4rXGR7ncPaDtblFbpXa+4BwpZBioSrPdknOMoDWBquxS8o8kKqFmmNi t7aQbUo8Z/2rIZamGtw6dorp2cSZPhId5q/3Sr5L5kzFyQa/Sdr+vgYhRHLk9JKv acknJUXv2XarxhsOvj2HNR/eNQnMO1f+rTMq0zqdNB5F8TrG1zwn6My+RXhLPbvZ UquWX+bn3FeWFn991QQGZ2Rb4aWCjfXxyoyZbnYBYn99GwOR/VuVdKH+AlDU9qzm hm5BDL0vYosw5NsSShUC94kBhuuwu+puoCwORNF3Zb6Gbxf0NX/e9r3RM+TAYQeq Rru+95yUybBuYOog== Received: (qmail 3870123 invoked from network); 22 Mar 2024 14:26:22 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:22 +0100 X-UD-Smtp-Session: l3s3148p1@wrwPxT8USJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 02/64] i2c: ali15x3: reword according to newest specification Date: Fri, 22 Mar 2024 14:24:55 +0100 Message-ID: <20240322132619.6389-3-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ali15x3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index d2fa30deb054..20d73b5e6f1f 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c @@ -39,7 +39,7 @@ We make sure that the SMB is enabled. We leave the ACPI alone. This driver controls the SMB Host only. - The SMB Slave controller on the M15X3 is not enabled. + The SMB Target controller on the M15X3 is not enabled. This driver does not use interrupts. */ From patchwork Fri Mar 22 13:24:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783374 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2738045C0B for ; Fri, 22 Mar 2024 13:26:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113998; cv=none; b=QDAuXGPQ//aH1+MRpwLf3enuc6uSv222fV40/4v3aEq6d3YRZubfb3xA56KCfNhDvliZ0VphjF1iqwFbZAXZ6QCEICSVom5EQyVBdwfMoeBRyVTncwmHybMJ/tr6tpWUmgphRJZJn4MlWx8TMPnhlRq3myse0455ESeEHhsjf2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711113998; c=relaxed/simple; bh=0eqF1EZ5//2m7IOZIH/6WKxxgiYpU+vphX44onzpqRU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p2YzliYG9d57DMFS8P2RE4OB+060Mpxm00imHLqn+Nsv5Y38Hgx8falk2DWQbsg7TLBi9jn6mLUpt2PootpvX1oQVUrESxkxkJRfSBiKFX4Ln1JzbzS7j9JMOOzL1zvYL0DqCpcG/g/z/JGLohMfqRwH/MsrCxsGIZ/8XGVEb88= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=NgxOpyOw; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="NgxOpyOw" 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=o02kBYEnft414jyQ74NQkV+FMLMQv2lOI3Wx7oPtptA=; b=NgxOpy OwJdAPzp5OLNUSi+sT/hYXvyXe217psAAFpnVNwTZPCiWGcRjVRWNNgcXaiDblqb +0HtIJHeUwyceh2iBQNzvyghr+h42rDb/kHGXvL/4bCDYva76IqLQMP7cTiJPPCm PvyIi/4gZE4PfrgfdiFfnvXydnZHjSA5hSQAV+u2RUqFiUqOsE7cOwgV/shdpv6b EmEpNZkPcRWE4x65vlCli5YuL5dbB8Yx9KdQEQDVp2K0S6WAKY3GRP9V/4gdZ7CM Km/GmQgbo6F+E4b8wx30s02/oWhUejSaBmYbWP0+O9YXsaZaeOo4vziZzZMmhplj WdlXBelM16CxYFvA== Received: (qmail 3870139 invoked from network); 22 Mar 2024 14:26:23 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:23 +0100 X-UD-Smtp-Session: l3s3148p1@Q54cxT8UWJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Thor Thayer , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 03/64] i2c: altera: reword according to newest specification Date: Fri, 22 Mar 2024 14:24:56 +0100 Message-ID: <20240322132619.6389-4-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-altera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-altera.c b/drivers/i2c/busses/i2c-altera.c index 252fbd175fb1..f4dde08a3b92 100644 --- a/drivers/i2c/busses/i2c-altera.c +++ b/drivers/i2c/busses/i2c-altera.c @@ -168,7 +168,7 @@ static void altr_i2c_init(struct altr_i2c_dev *idev) /* SDA Hold Time, 300ns */ writel(3 * clk_mhz / 10, idev->base + ALTR_I2C_SDA_HOLD); - /* Mask all master interrupt bits */ + /* Mask all interrupt bits */ altr_i2c_int_enable(idev, ALTR_I2C_ALL_IRQ, false); } @@ -376,7 +376,7 @@ static u32 altr_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm altr_i2c_algo = { - .master_xfer = altr_i2c_xfer, + .xfer = altr_i2c_xfer, .functionality = altr_i2c_func, }; From patchwork Fri Mar 22 13:24:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781956 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3504C47781 for ; Fri, 22 Mar 2024 13:26:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; cv=none; b=lqBgRAqCYhSVY+qbcBYUa1rdRlHh2t6WanYndeALV/XUO1HXxWKzG+ggtrv14JRsgCABltuoB7bMAd0rVGSWPdo9STuDaknJk3LglqthuVs5yrONTbMoUf71nOD7/Zk1OVpl60TaXCrGiSxfcOM/LPY40CedDVG0UlClDzTeyvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; c=relaxed/simple; bh=VV2JXqlZIXNmDwvyRmPDlSHbg6dDzm/mw4VXKDld0GE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aUwqis4MBKviG9jZXKWjyqEXNKsAc5Vnx1zOYMhKkcJ8GmzKFAf5vV32wT4XhnCKHI9rigFp3f8V66580HKMuCOJfQc499ed3p4sRpStiWUBdL3ez2jXlFSDDoCsc+BDAjgkcXgGXY/qcYec9rMgjj41E0d7j6rrYmmSOs0qYu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Gdezwygt; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Gdezwygt" 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=G46JTusxROSZbvDtQb/zHy9QMZR61747Z2bE4tfyB28=; b=Gdezwy gtVYvG6fUBnafQNtvPMSn+20p7q9ArY2uYJGuMdTJ3ram/pYm6SfTNor6X25oRVK fYLkMTgokKUY7ao4UILIqWUXpJHeVU9mfrv6d0u1M1/7hmf/n/kdYtpJqq3qBNMK nLAKlCfIX0HIpfkrKDqvRq5yOrqo3A8RfcXz8OXTmozYZnpebfs/3oIbpCSbJk7X rnZrpXRChgng9c4gjWTwnJeV0cf1rtqZqI606XoHeEO9WQFvG3Tp3o23d/ReNrIC AaQ5tQLY7ftt9n4xTh+aRoPqZrSig9kVsliEYtQWqZI9b+95sOHpCQ/d2WAXaYNn zuwfZFVUV9RR80oA== Received: (qmail 3870157 invoked from network); 22 Mar 2024 14:26:23 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:23 +0100 X-UD-Smtp-Session: l3s3148p1@vfApxT8UYJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Elie Morisse , Shyam Sundar S K , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 04/64] i2c: amd-mp2-pci: reword according to newest specification Date: Fri, 22 Mar 2024 14:24:57 +0100 Message-ID: <20240322132619.6389-5-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andi Shyti --- drivers/i2c/busses/i2c-amd-mp2-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd-mp2-pci.c b/drivers/i2c/busses/i2c-amd-mp2-pci.c index 143165300949..2ad0bb4661b4 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-pci.c +++ b/drivers/i2c/busses/i2c-amd-mp2-pci.c @@ -112,7 +112,7 @@ static void amd_mp2_pci_check_rw_event(struct amd_i2c_common *i2c_common) struct amd_mp2_dev *privdata = i2c_common->mp2_dev; struct pci_dev *pdev = privdata->pci_dev; int len = i2c_common->eventval.r.length; - u32 slave_addr = i2c_common->eventval.r.slave_addr; + u32 client_addr = i2c_common->eventval.r.slave_addr; bool err = false; if (unlikely(len != i2c_common->msg->len)) { @@ -121,9 +121,9 @@ static void amd_mp2_pci_check_rw_event(struct amd_i2c_common *i2c_common) err = true; } - if (unlikely(slave_addr != i2c_common->msg->addr)) { - pci_err(pdev, "unexpected slave address %x (expected: %x)!\n", - slave_addr, i2c_common->msg->addr); + if (unlikely(client_addr != i2c_common->msg->addr)) { + pci_err(pdev, "unexpected client address %x (expected: %x)!\n", + client_addr, i2c_common->msg->addr); err = true; } From patchwork Fri Mar 22 13:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781955 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2AEB47A74 for ; Fri, 22 Mar 2024 13:26:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; cv=none; b=iUaunYkGgiGVV2yO3Z8nByBcCObBMgBG41R/xWQZ4/pqqulVP1RPe90kG8tRPILVB3MhKub/ojGzLsTwKSSxC/6OkUtXW5yYI27ygzRq0RWqHUWidNcyKmWVN8C6YdIVERBctth5ig8bkwfAwYA8bSGK8YyeHZT243lKMyd9QSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; c=relaxed/simple; bh=sstUsdHf8IqQGy2e/CDeusFddPWdrFuWg1qsnOgINWU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kPG6KAfZBu/F+1OeCI0TtK+X7wrraCmnQWX8BuxIWChNQCTPadnl/vBJCg/rG6g39dWs+tU11ATomnb1I8Pp3976idoAJKTY0fbknSoVyGlQhOA7lkwYB0PvxeFyDgN0aH+E2FIWNCzb4Rfk/uuL6QlskI86UuBXdta/ljPrzyI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=VQWMi+Nx; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="VQWMi+Nx" 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=1fuavoM1tsxpg+sffePeG5Oq2+/3E0Rj2cjqhiCzSao=; b=VQWMi+ Nxn8XW8Est4ionNwmGyCHOI4xrIV2OqLZlWhldTv8QMzXNBKLriYUHzfXMwQwpRm QI8+xYK8L9+XmjcruKkkvEyTmUtwYhK69yJC/5GBC5q4V/+u99GKN/DTAlQC+Ec+ 8WFS8NVRbDjfJS0DY7Lcx02PsJu5BB/XPEvhOwDuCp5+KUlQ7+++YVIwmMODpmGu Zx2/rsbpR9eON1AoLMXV1vbx8fKX5ikpFFL2dVh9qx00iayrWw4BHsZEgLwWkYVA RRBrRP3k4wj0T1ti4fNMjOd/C5zA/HI9nFz8O6ddH6Iw6FNKg/ySu37jJmWQM+Vc yhPeZScCs+KP0Tfw== Received: (qmail 3870173 invoked from network); 22 Mar 2024 14:26:25 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:25 +0100 X-UD-Smtp-Session: l3s3148p1@fm86xT8UYpNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Brendan Higgins , Benjamin Herrenschmidt , Joel Stanley , Andi Shyti , Andrew Jeffery , openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/64] i2c: aspeed: reword according to newest specification Date: Fri, 22 Mar 2024 14:24:58 +0100 Message-ID: <20240322132619.6389-6-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andrew Jeffery --- drivers/i2c/busses/i2c-aspeed.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index ce8c4846b7fa..4e6ea4a5cab9 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -159,7 +159,7 @@ struct aspeed_i2c_bus { bool send_stop; int cmd_err; /* Protected only by i2c_lock_bus */ - int master_xfer_result; + int xfer_result; /* Multi-master */ bool multi_master; #if IS_ENABLED(CONFIG_I2C_SLAVE) @@ -608,9 +608,9 @@ static u32 aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus, u32 irq_status) out_complete: bus->msgs = NULL; if (bus->cmd_err) - bus->master_xfer_result = bus->cmd_err; + bus->xfer_result = bus->cmd_err; else - bus->master_xfer_result = bus->msgs_index + 1; + bus->xfer_result = bus->msgs_index + 1; complete(&bus->cmd_complete); out_no_complete: return irq_handled; @@ -679,7 +679,7 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) return irq_remaining ? IRQ_NONE : IRQ_HANDLED; } -static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, +static int aspeed_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct aspeed_i2c_bus *bus = i2c_get_adapdata(adap); @@ -738,7 +738,7 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, return -ETIMEDOUT; } - return bus->master_xfer_result; + return bus->xfer_result; } static u32 aspeed_i2c_functionality(struct i2c_adapter *adap) @@ -748,7 +748,7 @@ static u32 aspeed_i2c_functionality(struct i2c_adapter *adap) #if IS_ENABLED(CONFIG_I2C_SLAVE) /* precondition: bus.lock has been acquired. */ -static void __aspeed_i2c_reg_slave(struct aspeed_i2c_bus *bus, u16 slave_addr) +static void __aspeed_i2c_reg_target(struct aspeed_i2c_bus *bus, u16 slave_addr) { u32 addr_reg_val, func_ctrl_reg_val; @@ -770,7 +770,7 @@ static void __aspeed_i2c_reg_slave(struct aspeed_i2c_bus *bus, u16 slave_addr) bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE; } -static int aspeed_i2c_reg_slave(struct i2c_client *client) +static int aspeed_i2c_reg_target(struct i2c_client *client) { struct aspeed_i2c_bus *bus = i2c_get_adapdata(client->adapter); unsigned long flags; @@ -781,7 +781,7 @@ static int aspeed_i2c_reg_slave(struct i2c_client *client) return -EINVAL; } - __aspeed_i2c_reg_slave(bus, client->addr); + __aspeed_i2c_reg_target(bus, client->addr); bus->slave = client; spin_unlock_irqrestore(&bus->lock, flags); @@ -789,7 +789,7 @@ static int aspeed_i2c_reg_slave(struct i2c_client *client) return 0; } -static int aspeed_i2c_unreg_slave(struct i2c_client *client) +static int aspeed_i2c_unreg_target(struct i2c_client *client) { struct aspeed_i2c_bus *bus = i2c_get_adapdata(client->adapter); u32 func_ctrl_reg_val; @@ -814,11 +814,11 @@ static int aspeed_i2c_unreg_slave(struct i2c_client *client) #endif /* CONFIG_I2C_SLAVE */ static const struct i2c_algorithm aspeed_i2c_algo = { - .master_xfer = aspeed_i2c_master_xfer, + .xfer = aspeed_i2c_xfer, .functionality = aspeed_i2c_functionality, #if IS_ENABLED(CONFIG_I2C_SLAVE) - .reg_slave = aspeed_i2c_reg_slave, - .unreg_slave = aspeed_i2c_unreg_slave, + .reg_target = aspeed_i2c_reg_target, + .unreg_target = aspeed_i2c_unreg_target, #endif /* CONFIG_I2C_SLAVE */ }; @@ -950,7 +950,7 @@ static int aspeed_i2c_init(struct aspeed_i2c_bus *bus, #if IS_ENABLED(CONFIG_I2C_SLAVE) /* If slave has already been registered, re-enable it. */ if (bus->slave) - __aspeed_i2c_reg_slave(bus, bus->slave->addr); + __aspeed_i2c_reg_target(bus, bus->slave->addr); #endif /* CONFIG_I2C_SLAVE */ /* Set interrupt generation of I2C controller */ From patchwork Fri Mar 22 13:24:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783373 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 416D246426 for ; Fri, 22 Mar 2024 13:26:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; cv=none; b=qGfxvcHPxT2k6KCXWrptD2LaGlbWkaYm3kZHTWxVD9iBWZ4hw5bMLZP08fRsefDSXDz6vxNFGHb5PBZ1mtWm6mWitMYVfxyiTGivDI25KkG8lNmfc8gmlSPRqmt9p70hX+JwXULUWxLIlTFQvW4+QoHRVP3Yw0S/prseDubcWlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114000; c=relaxed/simple; bh=fvv1sG3VG+bSgIpSE5KkC2vSc06VSykF5euhM2XlNLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cn90GVoY4BSLAft1wDnNoUGKRO2/CtVVuQbSAYs1hFLhpMNTPdtJs43S4mfYFkJffTr3OMEaxulBa9ItNdjw0+YM8N6gr94f41v94tNfy82BZMBuJnD2Jdbqp/kZTgPBGS8TGTnoBGqtsoEjRFjMWx6sx/Xdc1JPlNdkJ83S3sY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Ngzh/f2u; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Ngzh/f2u" 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=BTYhgMQerKfjHZPgtx2s+my80JPp21aQgBykclcGkH0=; b=Ngzh/f 2uEAONEwVF7yBI6NiJbGG1dXLeFqxFemsWOgjDWl0MRW9JLz31eMbzRHVQxV2VdI egmQdfrJ8MQxiFclvhhx3eGg5siVkA9kLi7//Wzn9gg3fg1ib/6hmHVUMZIm4JJO YrvMfkD1abWklEZdeKfrEjSyxFoLJmqAZaezWH/2zrEMsZszQgBz8TDL1etl3enh ibeztCwyFoDgGa+BG1U2pWSCZQ1jbDiCyh+p2w6MJM3Q9cVDRY15YonLWpYaPxyC FEo5xPOYY0IW1qMZ2R//xzG0/L67jP0+/49TSkdvGtXHCGgr0IusoZRak9f30Ixp BjakT+N8uIaLcqyQ== Received: (qmail 3870189 invoked from network); 22 Mar 2024 14:26:25 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:25 +0100 X-UD-Smtp-Session: l3s3148p1@Yk5IxT8UZJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 06/64] i2c: au1550: reword according to newest specification Date: Fri, 22 Mar 2024 14:24:59 +0100 Message-ID: <20240322132619.6389-7-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-au1550.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 8e43f25c117e..77d85feda631 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -81,11 +81,11 @@ static int wait_ack(struct i2c_au1550_data *adap) return 0; } -static int wait_master_done(struct i2c_au1550_data *adap) +static int wait_host_done(struct i2c_au1550_data *adap) { int i; - /* Wait for Master Done. */ + /* Wait for Host Done. */ for (i = 0; i < 2 * adap->xfer_timeout; i++) { if ((RD(adap, PSC_SMBEVNT) & PSC_SMBEVNT_MD) != 0) return 0; @@ -120,12 +120,12 @@ do_address(struct i2c_au1550_data *adap, unsigned int addr, int rd, int q) if (q) addr |= PSC_SMBTXRX_STP; - /* Put byte into fifo, start up master. */ + /* Put byte into fifo, start up host controller */ WR(adap, PSC_SMBTXRX, addr); WR(adap, PSC_SMBPCR, PSC_SMBPCR_MS); if (wait_ack(adap)) return -EIO; - return (q) ? wait_master_done(adap) : 0; + return (q) ? wait_host_done(adap) : 0; } static int wait_for_rx_byte(struct i2c_au1550_data *adap, unsigned char *out) @@ -175,7 +175,7 @@ static int i2c_read(struct i2c_au1550_data *adap, unsigned char *buf, /* The last byte has to indicate transfer done. */ WR(adap, PSC_SMBTXRX, PSC_SMBTXRX_STP); - if (wait_master_done(adap)) + if (wait_host_done(adap)) return -EIO; buf[i] = (unsigned char)(RD(adap, PSC_SMBTXRX) & 0xff); @@ -204,7 +204,7 @@ static int i2c_write(struct i2c_au1550_data *adap, unsigned char *buf, data = buf[i]; data |= PSC_SMBTXRX_STP; WR(adap, PSC_SMBTXRX, data); - if (wait_master_done(adap)) + if (wait_host_done(adap)) return -EIO; return 0; } @@ -246,7 +246,7 @@ static u32 au1550_func(struct i2c_adapter *adap) } static const struct i2c_algorithm au1550_algo = { - .master_xfer = au1550_xfer, + .xfer = au1550_xfer, .functionality = au1550_func, }; From patchwork Fri Mar 22 13:25:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783372 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE95B4CB35 for ; Fri, 22 Mar 2024 13:26:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114003; cv=none; b=c4yqvffxitDwRpIu5bM9G5a27YOOGVUwlpoNgF64N57B9WPp9vu4OdbGGaaxCrJISDfvN/OXE1R5eZ4p1GKEOYHlLPDo9M60CR3MnsdyS3zYSo62PKIbimTzl0IwRQeXJX48iTB/lcr65nhHcgEDgFl/RN0wmza9Qh5YeEd7yK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114003; c=relaxed/simple; bh=ym3gtFYbdGqQAg20b+BWubWlBx3M58XIGmfXCrpju9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o81T9isT5O+UQWnxgx1X87LriBsBESMVD82kJEIoKvVXNX2r3YjkA5M7GVrA4zPsRNQ2HMZcBWI5GbAHqfW9eV7IaAer9GrkHLEXoyiYAbqA4UcMOOcajtShHk2fcFwS29ceLhggB9mEz5hHGPkz+B5Fh+BQG560i0uVhgJT5lQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Vfk35MJS; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Vfk35MJS" 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=+9eJDPYcvheHFhVWSeTXcV93NuGaWmWAwekU/Oh9CJ4=; b=Vfk35M JSUL85oEwdUpaoZywSUhRxjNWZFf91x1byAkI9WKNyJM/QbM1VfS2Fxb6cb2IvHT 1/EXdQaz2aj2f0uLFipQE/ze0asri/1BS+RMssCl4QWqbgQ2Xoa2z1IuQcT7oEFx jDeYf1s2IZJm0VYbTrom+PO5KqjUsZMIYQEhFIQ2FlGgoQ//LRU9/8CgWVdfQ67w mRKX5szDSTQWxcLnn+m7bw0lgL75+Tt1gb10JGDFSy5jiygKviWP/zbmJyLWToBt 7f79pX+sQ0F0Hl139XavzX7SymVIaIUVHIyDTZ3uCmjboWaGdqNZjk5CfBZjy896 Zl7wVryR1CdTCnQg== Received: (qmail 3870202 invoked from network); 22 Mar 2024 14:26:26 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:26 +0100 X-UD-Smtp-Session: l3s3148p1@tj9VxT8UdJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/64] i2c: bcm-iproc: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:00 +0100 Message-ID: <20240322132619.6389-8-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-bcm-iproc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index e905734c26a0..3c68d4df029f 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -224,8 +224,8 @@ static void slave_rx_tasklet_fn(unsigned long); | BIT(IS_S_TX_UNDERRUN_SHIFT) | BIT(IS_S_RX_FIFO_FULL_SHIFT)\ | BIT(IS_S_RX_THLD_SHIFT)) -static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave); -static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave); +static int bcm_iproc_i2c_reg_target(struct i2c_client *slave); +static int bcm_iproc_i2c_unreg_target(struct i2c_client *slave); static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c, bool enable); @@ -987,17 +987,17 @@ static uint32_t bcm_iproc_i2c_functionality(struct i2c_adapter *adap) val = I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; - if (adap->algo->reg_slave) + if (adap->algo->reg_target) val |= I2C_FUNC_SLAVE; return val; } static struct i2c_algorithm bcm_iproc_algo = { - .master_xfer = bcm_iproc_i2c_xfer, + .xfer = bcm_iproc_i2c_xfer, .functionality = bcm_iproc_i2c_functionality, - .reg_slave = bcm_iproc_i2c_reg_slave, - .unreg_slave = bcm_iproc_i2c_unreg_slave, + .reg_target = bcm_iproc_i2c_reg_target, + .unreg_target = bcm_iproc_i2c_unreg_target, }; static const struct i2c_adapter_quirks bcm_iproc_i2c_quirks = { @@ -1079,8 +1079,8 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) spin_lock_init(&iproc_i2c->idm_lock); /* no slave support */ - bcm_iproc_algo.reg_slave = NULL; - bcm_iproc_algo.unreg_slave = NULL; + bcm_iproc_algo.reg_target = NULL; + bcm_iproc_algo.unreg_target = NULL; } ret = bcm_iproc_i2c_init(iproc_i2c); @@ -1191,7 +1191,7 @@ static const struct dev_pm_ops bcm_iproc_i2c_pm_ops = { .resume_early = &bcm_iproc_i2c_resume }; -static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave) +static int bcm_iproc_i2c_reg_target(struct i2c_client *slave) { struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter); @@ -1210,7 +1210,7 @@ static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave) +static int bcm_iproc_i2c_unreg_target(struct i2c_client *slave) { u32 tmp; struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter); From patchwork Fri Mar 22 13:25:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781954 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 961A94F214 for ; Fri, 22 Mar 2024 13:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114005; cv=none; b=D1sioJsy5TBOt38S4gTCI20RoBCqW33A9zif2+xgcD6RYmRZTxaeDqcS+ZKFQnyu5dbX3w8nI5+0GjnJsEOjtl907kJxD7lUmLLbAGCajSKMfyfjf3I76/2Wg7zwzm56BBcMlfXQTroTRbrJMkk848GIgpRZ5NSInEJvUIsPaeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114005; c=relaxed/simple; bh=B4ReNbu8S7a6//nPDZgwwrBg8qKewed+zLRZx5ip9hg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FjDx6BxHtpBLHXHzOaJMO21TFtDCjbjA05jIEYKZKcB/V2wDS+9RTi824/OytrmsxjZ2hGm2LdT7hcUtjL09mMrgSUMmVdQMpDzlM7NkSdGKBMHPm4s9Jerc7nAbljIP1AjJwUdaqTWf4xPzLGfQK/t+g6ADYlXVTsiv4yG7Ejk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=jH0S0RmE; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="jH0S0RmE" 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=l6CZIbqe7dMVk4Q3Jwl0QEHuMmQPTAQmTQxq/RmOdUU=; b=jH0S0R mEt4m2m8wz9yIHsAZesX4EbEpPfEqis4fl6lrHusEnr/iuEkokkeu8Nk+5hOE/m8 2eo1zz/37CRvbhyL7xjLyHt2+JByau4y9Uj1Uve8gq69WYyC3baW0i+YatxixlSE X/JtGFZBVadAjL6OStq7b2EVzlYhdLhV3bQHRHXHoBdH3zTGECSHxDP2nKwd7e0d i1hs9u9mIKI8HO/ESrv/Eoxh+rLtk5a7hiskRox1oQQBivO2LQa0DATEXOlAxCxC YHtSZT2xTAO0mIjUiU1qKj8ooB6q5U2u5mvRmvGsKcx1FO6rKvr43cNZVN/4sLXr tQsC+lofdb5gbx6g== Received: (qmail 3870215 invoked from network); 22 Mar 2024 14:26:27 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:27 +0100 X-UD-Smtp-Session: l3s3148p1@oMdhxT8UeJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-kernel@vger.kernel.org Subject: [PATCH 08/64] i2c: bcm-kona: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:01 +0100 Message-ID: <20240322132619.6389-9-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andi Shyti Reviewed-by: Florian Fainelli --- drivers/i2c/busses/i2c-bcm-kona.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c index a57088ec2b06..404388e65eb4 100644 --- a/drivers/i2c/busses/i2c-bcm-kona.c +++ b/drivers/i2c/busses/i2c-bcm-kona.c @@ -85,7 +85,7 @@ #define STD_EXT_CLK_FREQ 13000000UL #define HS_EXT_CLK_FREQ 104000000UL -#define MASTERCODE 0x08 /* Mastercodes are 0000_1xxxb */ +#define CONTROLLER_CODE 0x08 /* Controller codes are 0000_1xxxb */ #define I2C_TIMEOUT 100 /* msecs */ @@ -544,8 +544,8 @@ static int bcm_kona_i2c_switch_to_hs(struct bcm_kona_i2c_dev *dev) { int rc; - /* Send mastercode at standard speed */ - rc = bcm_kona_i2c_write_byte(dev, MASTERCODE, 1); + /* Send controller code at standard speed */ + rc = bcm_kona_i2c_write_byte(dev, CONTROLLER_CODE, 1); if (rc < 0) { pr_err("High speed handshake failed\n"); return rc; @@ -587,7 +587,7 @@ static int bcm_kona_i2c_switch_to_std(struct bcm_kona_i2c_dev *dev) return rc; } -/* Master transfer function */ +/* Host transfer function */ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg msgs[], int num) { @@ -637,7 +637,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, } } - /* Send slave address */ + /* Send client address */ if (!(pmsg->flags & I2C_M_NOSTART)) { rc = bcm_kona_i2c_do_addr(dev, pmsg); if (rc < 0) { @@ -697,7 +697,7 @@ static uint32_t bcm_kona_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm bcm_algo = { - .master_xfer = bcm_kona_i2c_xfer, + .xfer = bcm_kona_i2c_xfer, .functionality = bcm_kona_i2c_functionality, }; @@ -722,7 +722,7 @@ static int bcm_kona_i2c_assign_bus_speed(struct bcm_kona_i2c_dev *dev) dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ]; break; case I2C_MAX_HIGH_SPEED_MODE_FREQ: - /* Send mastercode at 100k */ + /* Send controller code at 100k */ dev->std_cfg = &std_cfg_table[BCM_SPD_100K]; dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ]; break; From patchwork Fri Mar 22 13:25:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783371 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C1BE50A65 for ; Fri, 22 Mar 2024 13:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114006; cv=none; b=eWb4f2eS2FJ+CU+QcV7ao9+ypN8I6/qPJ6jegvodsdMrkoTo/Dj0G/ToIZ2BqF3NHAjQQp/p0qp5kJ1KIMGR+VWVxHexKiKMrrNd8eaPXTkGC/Qb2sB3yEV+LI7egp9jTbi7kaRbL/RiKCJbpY7taS1V8SsFX6iCu/lyLr8tf9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114006; c=relaxed/simple; bh=yjJFdslix4fvxNZnqmJv9g6Ug9JLy7/NmPCFMdQRC4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mpadeGfVxj1T30d+pnTWLXJ1FDQRvNYI8tQystA7h16g7YPCug836m/t/8YJNI7tJGApLO7vKgC64rESWYUvXcEj1I/NHvSTZCX1ALbY9Fc48wYKaErOx6c5OrNwZ1TDTLyOgb5z/EZT44x2rYXj9BUD8Dj01eweCQwkV3B/8ug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=h2lJ2/uT; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="h2lJ2/uT" 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=nPqXdlyyhoVRqPKoOjv5iKVpiVyc/2GvO8xysHtbwCM=; b=h2lJ2/ uTAJuVBvALeij3E7HhDhVB7/fK2mdO61oqQuQUGso6rFwd3mqai5jyslxoAArUya G7AEv1uS4yCFb3QafOciA6sTPiEmxBa1mX7XqE8dQlOT/awHTHrT+9EyD//x77Zi xuu0OfvsAte5hCCHxQJd2F+OesgBwu3ifnUzPBi7Z/AU5vL+I5Bl0/rMNvmwZ6Pz AyCjlvju3pXnPiHUKYVAp6vcz+V2TfFDm4ABfuRbntk+ySkbOS9pN+bpgLfI9RqV kQYXAjgG9Vr0DxjGpR+MBeL5ah3ZlsiSZJxC9Qiv/FuwnI3vL3Pi+XU5xfIF7vR6 otuCNEvEKwnu6Bpg== Received: (qmail 3870228 invoked from network); 22 Mar 2024 14:26:28 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:28 +0100 X-UD-Smtp-Session: l3s3148p1@xr1uxT8UgJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/64] i2c: bcm2835: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:02 +0100 Message-ID: <20240322132619.6389-10-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-bcm2835.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index b92de1944221..62776e7fc586 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * BCM2835 master mode driver + * BCM2835 host controller mode driver */ #include @@ -25,7 +25,7 @@ #define BCM2835_I2C_DEL 0x18 /* * 16-bit field for the number of SCL cycles to wait after rising SCL - * before deciding the slave is not responding. 0 disables the + * before deciding the client is not responding. 0 disables the * timeout detection. */ #define BCM2835_I2C_CLKT 0x1c @@ -223,7 +223,7 @@ static void bcm2835_drain_rxfifo(struct bcm2835_i2c_dev *i2c_dev) /* * Repeated Start Condition (Sr) * The BCM2835 ARM Peripherals datasheet mentions a way to trigger a Sr when it - * talks about reading from a slave with 10 bit address. This is achieved by + * talks about reading from a client with 10 bit address. This is achieved by * issuing a write, poll the I2CS.TA flag and wait for it to be set, and then * issue a read. * A comment in https://github.com/raspberrypi/linux/issues/254 shows how the @@ -391,7 +391,7 @@ static u32 bcm2835_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm bcm2835_i2c_algo = { - .master_xfer = bcm2835_i2c_xfer, + .xfer = bcm2835_i2c_xfer, .functionality = bcm2835_i2c_func, }; 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: 781953 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C2B952F9B for ; Fri, 22 Mar 2024 13:26:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114007; cv=none; b=Ae/caeh7QeVjSKlP+p22O/FLps0IqLrIOm2vEtEVlc7p0V0UGXgx7InJb2lIblxTsrjcGUH8bKgI9sQsMJ6Os/dFTQi345buY7VsjwpoU8F7cky7JneJmGTsqwe6dGA4p5r7El6c5KYy9VirpTizjZe3GdHWbmih4xJXAl/axR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114007; c=relaxed/simple; bh=CpC8HnbTVThB6S+/pqooGf78jzq4no+HCFzgg6Qt6mU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WAz1D+Q2gR0GkDIvl2TWM0cYwrDbg2Po8NGgzbeL7fuGL3veWDxjQjsm4ZbJ0ynVfVgUGquMl5t89GYDUYMtVlOoXFDgLiv2ygxR8MA31cASJEVDXPORJ0xLux8tCKiLFxNg2LMWqbBilyzuMr7SWOu2SkNGTf3KosqBGE7re/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=hnc1nTnR; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="hnc1nTnR" 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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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, }; From patchwork Fri Mar 22 13:25:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783370 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86BA653E33 for ; Fri, 22 Mar 2024 13:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114008; cv=none; b=qKp07T8uCm0tbTT67T4GP+zftrO5dECpy75Y6kuItRb0CWFcZ8N67XS+E0LKfcmOK9gdlrdtDWz9Z2jNDg5Hg85cJDR+tA2P5h6fjfnRRMZnj1lyo9SO5Gt1dcfFyq8PVMKmAi/IcJAFYOrTf0pHscfF8mEF2RCExfVxFOa9lLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114008; c=relaxed/simple; bh=RdpvTecA4tz3IWeF3JWv+DS2tIVcREHLGWPjN6GdG0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XUDj/TL6L2WUojSr+Pzr/e/2/FZqibILxJrl5ZkcM9cDgNSY4LgQTfARhEQZLkSXnSYOLKdAyZ1FwR3ThQts5+GI0r1K70LenKehaOkHuTh8GsUTsavQE58SsEE4AwEtPK/scnHN7k+kwlpiI0lQ670jmgFN/nC/eUAu/l2PoSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=jgZFWcE8; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="jgZFWcE8" 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=sPIndfoTUi+H7yC2Vw2N54ArxxcZ9SSScdyIHb5qHpg=; b=jgZFWc E83WdTi0EfWJTud1ynqA2PplpkcyePEsxtQ20N51vsqmi7751ncZqB2hZfcSgEcR M97D6YCIAedDg71nlBfDvaMYMC5pMR/zdTvAEYuFMihhZf7zkksHYU+lsvX5YBLG oLny3r+tT+vkOGAabF/qJP32PiiehoOGiqoaa4bxQOQeicwUdhkiRzAcVWQYFwlP wKTCMciq3j4A0eFnEgP8StB+eaEkpYcpSMLACW/Z5hEhHI0KuXB4RtNtIJcIVsxL cZKJv71ldw6lYAiM3SRJ1XXuRiBcXbXpWF11UFGeRT1XrLtAFnkbfcRou8nbuGB+ Mg96S92tGG4xCD3w== Received: (qmail 3870265 invoked from network); 22 Mar 2024 14:26:30 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:30 +0100 X-UD-Smtp-Session: l3s3148p1@phGJxT8UjuBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Michal Simek , Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/64] i2c: cadence: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:04 +0100 Message-ID: <20240322132619.6389-12-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-cadence.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index 4bb7d6756947..91085e719689 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c @@ -808,7 +808,7 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, } /** - * cdns_i2c_master_xfer - The main i2c transfer function + * cdns_i2c_xfer - The main i2c transfer function * @adap: pointer to the i2c adapter driver instance * @msgs: pointer to the i2c message structure * @num: the number of messages to transfer @@ -817,7 +817,7 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, * * Return: number of msgs processed on success, negative error otherwise */ -static int cdns_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +static int cdns_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { int ret, count; @@ -947,7 +947,7 @@ static u32 cdns_i2c_func(struct i2c_adapter *adap) } #if IS_ENABLED(CONFIG_I2C_SLAVE) -static int cdns_reg_slave(struct i2c_client *slave) +static int cdns_reg_target(struct i2c_client *slave) { int ret; struct cdns_i2c *id = container_of(slave->adapter, struct cdns_i2c, @@ -972,7 +972,7 @@ static int cdns_reg_slave(struct i2c_client *slave) return 0; } -static int cdns_unreg_slave(struct i2c_client *slave) +static int cdns_unreg_target(struct i2c_client *slave) { struct cdns_i2c *id = container_of(slave->adapter, struct cdns_i2c, adap); @@ -990,11 +990,11 @@ static int cdns_unreg_slave(struct i2c_client *slave) #endif static const struct i2c_algorithm cdns_i2c_algo = { - .master_xfer = cdns_i2c_master_xfer, + .xfer = cdns_i2c_xfer, .functionality = cdns_i2c_func, #if IS_ENABLED(CONFIG_I2C_SLAVE) - .reg_slave = cdns_reg_slave, - .unreg_slave = cdns_unreg_slave, + .reg_target = cdns_reg_target, + .unreg_target = cdns_unreg_target, #endif }; From patchwork Fri Mar 22 13:25:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783369 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EA1656B91 for ; Fri, 22 Mar 2024 13:26:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114010; cv=none; b=DSrpi67Lm1TzOnBLKIWsbUzZFI2mTVGeZjm7xOvbEHt4/RDa9FEhPuAZPHiysfuuKdWy96c/HjrHlUUx0Vu2faD75GCNLQhmoJccKjCjiUYvhwJR1UXF5v8S7yFsTocMThLcj0MRMiAW0Er33wyKrzrz02m+8Xxp1BGwjGayTJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114010; c=relaxed/simple; bh=pdslGmCg7UYS904SRehvA69DAu8yAAOzUDQVvWox858=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=md0CEd8YQZ+7Y/Dmvai6UYZ5w2HCLh68W7NXEye161gAFjnvFEtybUU4FRvGMVmtLE+1wUdX1bjrfuy+xQPfdQ0Q1+RTQNVHx9n20kOwTHKq5YQ59CLUKz+/zzXNA3IH5kOQm+ICs3gysa0vK3QmmjHVCvzfFaSrG+EKFYOCJrA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=ME6arAZI; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="ME6arAZI" 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=Hb6ygo2gDcXeza4LMpivX7Jc9uJy+bbFjc6SX1hTOtQ=; b=ME6arA ZI2cusTJpPWViEnC9zUp/QZTz4Yc5gDU6uW6Ul0aHucW3lnFG66aB2hIGGvriPJo hZUcl1DX5x76PhoSiz4u1L7gmr88M2WEe5WUS6XOXqcrDsJ0ZEA0MW6qRVznJ7jn uaKyPZ8PZdMvDk7GBEbbZCUiL+3udddtWqbFXMikgBDArHIb46dXzRlP/NOUqLVh DOVYxjq7nKPMM/gdkn9MlHYCK3Wx07TFhaACIiAMYDzpmG+0XgVkpNmrcabAqO3s Wr+zUyjtkzUHWA8ren9RCUORiHqUceHl9JM4Oye+zzILXhRz7Qc/Qonu+55SpEW8 S6hq4FLuUErkY9qQ== Received: (qmail 3870300 invoked from network); 22 Mar 2024 14:26:31 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:31 +0100 X-UD-Smtp-Session: l3s3148p1@JxqWxT8UnuBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Hans de Goede , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 12/64] i2c: cht-wc: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:05 +0100 Message-ID: <20240322132619.6389-13-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-cht-wc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-wc.c index 0209933b9a84..52e3000626c5 100644 --- a/drivers/i2c/busses/i2c-cht-wc.c +++ b/drivers/i2c/busses/i2c-cht-wc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Intel CHT Whiskey Cove PMIC I2C Master driver + * Intel CHT Whiskey Cove PMIC I2C controller driver * Copyright (C) 2017 Hans de Goede * * Based on various non upstream patches to support the CHT Whiskey Cove PMIC: @@ -106,7 +106,7 @@ static irqreturn_t cht_wc_i2c_adap_thread_handler(int id, void *data) return IRQ_HANDLED; } -static u32 cht_wc_i2c_adap_master_func(struct i2c_adapter *adap) +static u32 cht_wc_i2c_adap_func(struct i2c_adapter *adap) { /* This i2c adapter only supports SMBUS byte transfers */ return I2C_FUNC_SMBUS_BYTE_DATA; @@ -168,7 +168,7 @@ static int cht_wc_i2c_adap_smbus_xfer(struct i2c_adapter *_adap, u16 addr, } static const struct i2c_algorithm cht_wc_i2c_adap_algo = { - .functionality = cht_wc_i2c_adap_master_func, + .functionality = cht_wc_i2c_adap_func, .smbus_xfer = cht_wc_i2c_adap_smbus_xfer, }; @@ -554,6 +554,6 @@ static struct platform_driver cht_wc_i2c_adap_driver = { }; module_platform_driver(cht_wc_i2c_adap_driver); -MODULE_DESCRIPTION("Intel CHT Whiskey Cove PMIC I2C Master driver"); +MODULE_DESCRIPTION("Intel CHT Whiskey Cove PMIC I2C controller driver"); MODULE_AUTHOR("Hans de Goede "); MODULE_LICENSE("GPL"); From patchwork Fri Mar 22 13:25:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781952 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B11AD56B64 for ; Fri, 22 Mar 2024 13:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114009; cv=none; b=Zowye57Hs5hrQoC7sktdfeGZykTXL2/pmJnVUJyvt3NyC8FPVYzmMPo98BcPDG3POCMqOCh7mDjTP3poLSPGMNe7+udW+a+QqhdRkVWVG3jQsT4Bp+j8niH5tiILO61eqQU3Z0Gb2qOUHEjPfhW8jEbJEngPhFoY+vY1yjkUzI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114009; c=relaxed/simple; bh=7oQmmJVaprR+HZKpfHw09qchZeoWx9o84q9t9JP0HQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oPoXxR9ZhQhk7y/pkQSvogoCta5aWwWRKuPcg2mJjtPEOcmY/Xm+3ywj1fm0IbMwqUd2D7ibPAKF9ME6jCRtaCDQUwO3u7TXGqNC25Zx3JYHyQkc5lBkEtQGpDZt7n5ldliBWXFhwRChyujsHNzBpuUNHSwUqrKyZ2gfgWWQDO8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=ik6n/zO9; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="ik6n/zO9" 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=fB9xqyjvQZDgbI6QWDiCYg5KgycLfSIzO8kZL2YkZsI=; b=ik6n/z O95g0ZW+iWO3WBHgcOmzS2H9kvlN7IDVaaa2QC5byEgoCPdTymwQsS0AJ9MN5tq+ iy4akf9H9k60bZjtYqKtpuRZg9Mlw6vuRWdmNTcbQgziN49iAxahtNOMbzJdgBhA NnnZ2ygFhmSHG5T8/TDofAl4iQsIIjNjHSQmL3FG0xhEBR0M3VD5JLbBZutUF7pp pWXlyx1GIrjZMbCAct8Hu4IM0ZqZwKHnIHXCx0UuwH5JRZ992O+r94cYWinPgmPL +NVjaan4grpMgjfgKJ3pCu+wFSzsRSiSBzhDjvvstKeZmNHndzESvUbTomiHtyiN P97ewOqPWmMaKEAQ== Received: (qmail 3870333 invoked from network); 22 Mar 2024 14:26:31 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:31 +0100 X-UD-Smtp-Session: l3s3148p1@bE6jxT8UquBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , =?utf-8?b?QmVuY2UgQ3M=?= =?utf-8?b?w7Nrw6Fz?= , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 13/64] i2c: cp2615: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:06 +0100 Message-ID: <20240322132619.6389-14-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-cp2615.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-cp2615.c b/drivers/i2c/busses/i2c-cp2615.c index cf3747d87034..91fffc39afa9 100644 --- a/drivers/i2c/busses/i2c-cp2615.c +++ b/drivers/i2c/busses/i2c-cp2615.c @@ -60,7 +60,7 @@ enum cp2615_i2c_status { CP2615_CFG_LOCKED = -6, /* read_len or write_len out of range */ CP2615_INVALID_PARAM = -4, - /* I2C slave did not ACK in time */ + /* I2C client did not ACK in time */ CP2615_TIMEOUT, /* I2C bus busy */ CP2615_BUS_BUSY, @@ -211,7 +211,7 @@ static int cp2615_check_iop(struct usb_interface *usbif) } static int -cp2615_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) +cp2615_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct usb_interface *usbif = adap->algo_data; int i = 0, ret = 0; @@ -250,7 +250,7 @@ cp2615_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm cp2615_i2c_algo = { - .master_xfer = cp2615_i2c_master_xfer, + .xfer = cp2615_i2c_xfer, .functionality = cp2615_i2c_func, }; From patchwork Fri Mar 22 13:25:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781951 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DB4F45C0C for ; Fri, 22 Mar 2024 13:26:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114011; cv=none; b=g+/T7JTxhad/5cXCKFQC4ZSezDU/hVzzHozGxIvh9AV1R/AoHonn4R6oPJR4AXtre74D1gW/jdoJeJ+Ut9PFhWcV8aWgedI5JjEcI+knHewWCl7SWPNarH1Gr57jT/+gUtLnGcXNLu5O9hgxxYo5f30nQXzMYmgnDMw7bV2Gwm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114011; c=relaxed/simple; bh=+VaxMN7cZnZJjhL9SNR43NWlUn9PaNRHhMOl/YlZsqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fHYKjhIVKTKPNwfYv4hPomHTeQMKvIvuDyOi5sPc0BKSlcjguD3rlauQcenD5JZDJoZmqI7ifZ8ICj/ZOCjTvLc8/euxk5sr6A3UshaR8Nco34FyNcXl/lgT6eeKTzv7jyS3BsS/aAA8O3XtmSptTGg/8c2aWdP9SKlmA9+S1FI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=N1vh2CY6; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="N1vh2CY6" 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=EAolHBSknmyHAIRGgTuBToiKe0Qd+7DMZZj0gDF7Amc=; b=N1vh2C Y6glG5MRwaBGI0w+5dr2w3TJMvEHi9bZTIuPfPkRF5KOBkEpp3vSs/D/qqkgzmIq T0MfVmIJJF4mbd+yXDq4c34FSkEZTmJYkPenM6fqO1Z8f6EG0ORHWs63/hmmsMuP EBa4nCRh/MqZ5EP/akN7B3mCjK/kPe6vU4ir4v57dC4heOzWhCiLOm+L177TuC4O MK52+Sk5YYLO8NmakmY+hhkB64W/d6YcH/3Ihs0J4/sxLYG1dlfVK13wr2ri7kSa vQYOta2Hcw7EGIKwk3BvrTZ+4uUkU7ZOKATLhLFdoF2KxoTzzjgzE9g0o87yvrb8 IbNMHGAOAYo5wvQA== Received: (qmail 3870347 invoked from network); 22 Mar 2024 14:26:32 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:32 +0100 X-UD-Smtp-Session: l3s3148p1@F4KwxT8UrOBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jochen Friedrich , Andi Shyti , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 14/64] i2c: cpm: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:07 +0100 Message-ID: <20240322132619.6389-15-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andi Shyti --- drivers/i2c/busses/i2c-cpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 4404b4aac676..306e397fec0a 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -402,7 +402,7 @@ static u32 cpm_i2c_func(struct i2c_adapter *adap) /* -----exported algorithm data: ------------------------------------- */ static const struct i2c_algorithm cpm_i2c_algo = { - .master_xfer = cpm_i2c_xfer, + .xfer = cpm_i2c_xfer, .functionality = cpm_i2c_func, }; @@ -570,7 +570,7 @@ static int cpm_i2c_setup(struct cpm_i2c *cpm) out_8(&cpm->i2c_reg->i2brg, brg); out_8(&cpm->i2c_reg->i2mod, 0x00); - out_8(&cpm->i2c_reg->i2com, I2COM_MASTER); /* Master mode */ + out_8(&cpm->i2c_reg->i2com, I2COM_MASTER); /* Host mode */ /* Disable interrupts. */ out_8(&cpm->i2c_reg->i2cmr, 0); 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: 783368 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB45B47A6B for ; Fri, 22 Mar 2024 13:26:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114011; cv=none; b=eVrImcCNwQw8vMTtqm1Bn2d3/k/HgNObqVIsp0CiqzDUgbAz5dxoi5tlMsV+4g7NGI6gMaRmvtwRdHwp1VyVJIov9pyiclpLsE1f433d2N1O0U/tVIJTuxpzK5Lc2gKVkvR4enKWjl1eUJLEg2nHKZO7NBaottIDVyCg6Cq92ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114011; c=relaxed/simple; bh=OAlNvTXGEkYV1iU16HT3reE5eFZpV/T3pdtkP4RibpM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N82MBmsZcddT0QL2i3U3IVY8vdcvcFJXP2JHaV+eeyRrGdJA1ni8z1GUakI+iGmoFEXrWDwNWEuMQ9aWT8YKhglSpO1CLzzPO9TRslnf1YW5+6RXtY9CqvpW/DU12+h7ep1o8kY0PEtygYhZrf5MSGtjq5l1IXlYeNLovGHfcgI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=TAdyd+hG; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="TAdyd+hG" 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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-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, }; From patchwork Fri Mar 22 13:25:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781950 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58E3046558 for ; Fri, 22 Mar 2024 13:26:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114012; cv=none; b=lipZQennL3fOiXUDTSno1hiL/QmAslvsslb7kq1mP23NO9siJod7Lm8Dz5RGnMYmwjdDTXs1V51SJOcVhK8ds+U22mZwXxafbJ5ww+lwV5+HRnPe83zzYP7P2/VLgD4rRyi3SC9OiD1omRXuaCQuer6PDe5EiyeENR4gcPyjufY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114012; c=relaxed/simple; bh=060GHiUn1CwotzIl6MBVCwJ278n1ziyGC1UQUnT2QEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=stqBNAoaIKGNxoQZAeVGYY0Dsx2ljN8q11n1/AyS20OUu3LCRNT7XuDG07mjo8EXX7zTa6fZGF5QgNNJnH1peZTISKTADBJQLnaR/v938A+wMKuWQvPXEOwaVuDs/rTUwh9nM5AG89+3g3w3+aVxV8U1iMTBDHhHaeRk+6BNWX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=K+HqkwMH; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="K+HqkwMH" 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=Qu3vk6w/0m8AM5GY0guKeGtY0uhOhyvvrd8UxUlbHVQ=; b=K+Hqkw MHpY2i1IaxFUSVbDNRcfcIgO7dod5HZW8PGN+Jf/bHeKSiLOnfja1ibkdVOWbJLr P7PfSih92G7W1yW4k67T+t89P31K6PTCIPPJsPb5vK13mOqWPRt7b69cj0GH5Fuc /wLDqEvUpAJMvHp8VuUihYHvc6rUKnOeWx/NHhnKnGjqffgiMdcMs/6GPFReC3wJ OOrcMGR/57+W5jskecPllC/z/5I31wAUb1dZ9zBD0Ir5oyyz1BqL+FLJLFDs1MKc AAUmBnxgPjO4elSKGAzOzX5Sn5sKpzqkyjHXi5bqcsGXBeybzgUwN9rLJQ7PoJ0P GEjdfmcm6/BtYZhQ== Received: (qmail 3870420 invoked from network); 22 Mar 2024 14:26:34 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:34 +0100 X-UD-Smtp-Session: l3s3148p1@XQbKxT8UxOBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Baruch Siach , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/64] i2c: digicolor: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:09 +0100 Message-ID: <20240322132619.6389-17-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-digicolor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c index 3462f2bc0fa8..0d777f5c6b41 100644 --- a/drivers/i2c/busses/i2c-digicolor.c +++ b/drivers/i2c/busses/i2c-digicolor.c @@ -281,7 +281,7 @@ static u32 dc_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm dc_i2c_algorithm = { - .master_xfer = dc_i2c_xfer, + .xfer = dc_i2c_xfer, .functionality = dc_i2c_func, }; @@ -372,5 +372,5 @@ static struct platform_driver dc_i2c_driver = { module_platform_driver(dc_i2c_driver); MODULE_AUTHOR("Baruch Siach "); -MODULE_DESCRIPTION("Conexant Digicolor I2C master driver"); +MODULE_DESCRIPTION("Conexant Digicolor I2C controller driver"); MODULE_LICENSE("GPL v2"); From patchwork Fri Mar 22 13:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783367 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EC2659B5F for ; Fri, 22 Mar 2024 13:26:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114013; cv=none; b=fzQVqK9EVH3Hy7juScAvhBe8Y+PoBEOf6MqUAEbUA3langVdC7ZNKlBf9EUa3dlPlmCeTRZQeHTMIC4+7V11k8FfBa9HcAWJYca37OkKeyr8QLl546Uefg6Me13qUnCSytdOY+QfV+r7DwwxPBgRsuqkoTXSfpXhckKUL403AW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114013; c=relaxed/simple; bh=hUFytOBaQzIkz4+MC+aL7QUUSke0EPUf9+Kdq/iJx08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d/Wkv9RNtn3BAZQANam9KmqFMQrtDFC2aP2S/vqDDjFuaDtKeEC7fuNlnJIHjIiwTXIvlT/syxcqziDZBA5plx9xFbKcU4LgLtVsJRjr/YaWy06BT5mc2hLZy8QPQa+lnjk0BQMaaqpLLagfVjwMTXpkGVReWPR6mrD8dpjsPvs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=lcw7pwGd; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="lcw7pwGd" 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=YFoX/7P6tBs5BWolxm81GzUi9hH6lpAklGphsTRZels=; b=lcw7pw Gd+1ni55mbb9KoOXkhHzN1idKU5Tmv2T0W1Mx2jpuz0uj7jM5LfGEGBZxiutZpVh Kniu3/+bpqjxaycG+/ZoUaHc4qQhzj9jHMxutkFCnD7mAXXAeX74cFAkedQAbevC wcg492XGli2ONu2r9NDAULdh7Du1noaUmB5hAUO3EonoJwXzXX+WwFwJXmSv5kWP n2kcUZp7jwqAaNssBC/HUYaRXl8jpWIzAm9iuUDrCAwumM7jTj3gmUvQy84/Okoi 05c+y6yjjhs+DDfZ7Y7BIAXFyDQNUJwG4KEDSOYqDZUEe1hZWXnFq8KWJKYdfOsC G9BQioFvYZjPZqdQ== Received: (qmail 3870451 invoked from network); 22 Mar 2024 14:26:35 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:35 +0100 X-UD-Smtp-Session: l3s3148p1@5+jVxT8U1OBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 17/64] i2c: dln2: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:10 +0100 Message-ID: <20240322132619.6389-18-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-dln2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-dln2.c b/drivers/i2c/busses/i2c-dln2.c index 631109c7a098..11ed055143d3 100644 --- a/drivers/i2c/busses/i2c-dln2.c +++ b/drivers/i2c/busses/i2c-dln2.c @@ -175,7 +175,7 @@ static u32 dln2_i2c_func(struct i2c_adapter *a) } static const struct i2c_algorithm dln2_i2c_usb_algorithm = { - .master_xfer = dln2_i2c_xfer, + .xfer = dln2_i2c_xfer, .functionality = dln2_i2c_func, }; @@ -251,6 +251,6 @@ static struct platform_driver dln2_i2c_driver = { module_platform_driver(dln2_i2c_driver); MODULE_AUTHOR("Laurentiu Palcu "); -MODULE_DESCRIPTION("Driver for the Diolan DLN2 I2C master interface"); +MODULE_DESCRIPTION("Driver for the Diolan DLN2 I2C controller interface"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:dln2-i2c"); From patchwork Fri Mar 22 13:25:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781949 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 681365BAE4 for ; Fri, 22 Mar 2024 13:26:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114014; cv=none; b=AHS2yiCwFR0+/ihKPBsGTx3OQjJIuAxYSCkIc+W+MwvboZ77rrYpL8Tz2tbjsXxsdoz2LNi4rwZOi5NmQNAFdic5uCSq88H3SIDJ8k0G/2TV0kmV80JqZnsvlnhF0s7Ru5xUbl8bWoJKgABObK5BX+Md3qt2uis9QyMNqx/PRpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114014; c=relaxed/simple; bh=c7ulUloqKhHobUEojOi16OanbpAka4XnACOJyGpmHu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gwqH7KIjFlXHOukvOcIKIQMUkbsjvpaXw3kpPmch2fJ0uLyycbeWc167nDH+e6CultKMRbPOWGrPHVMm8He/Vf1r5THHdVHe38PDn0ulxW1NzOFWz2Z/q5M7xHpoVvGAX9EhJDGpXOBw4Jow2eTSoDBLlNBulIBg6aRgEdo+HGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=XsRTRX/J; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="XsRTRX/J" 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=opwX34V+hA1PIYmS10OMLpeUb5fnTvJk3x0OTizccsI=; b=XsRTRX /JyBUCI2tpqfzHajpGbbgbmtQdXaa45fzoKqz6vlBSHo+MJKNv1D3eDxyu9kjEPq KB9sshddRNm8cyrNwBfFde4BslNDLUEsEeJ+A0J33b8SsBYluNWYUfdvPLw3WjKS 07IwvfqatCPyVfJbJq+plZeuLVYgYBDwKrnCY9O7A2aQQCAh+An6yVwFVU2YQNDM FeLLeIv9AJ0hQMSR/qQ6G5dAtjQg2Rs/1yB014L8602cA2jd9Y+RgKFQUcMhoYom MnUfoKJ6F+0ffV2MmJhZ6X5YBlQCfKjmDbugOouIcbr6wPEJejy+N7inLaIvQozH Kn9SeHmRPccdljmw== Received: (qmail 3870493 invoked from network); 22 Mar 2024 14:26:35 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:35 +0100 X-UD-Smtp-Session: l3s3148p1@0DzixT8U3uBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 18/64] i2c: eg20t: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:11 +0100 Message-ID: <20240322132619.6389-19-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andi Shyti --- drivers/i2c/busses/i2c-eg20t.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index 4914bfbee2a9..e95793036f5d 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c @@ -337,7 +337,7 @@ static int pch_i2c_wait_for_check_xfer(struct i2c_algo_pch_data *adap) adap->pch_event_flag = 0; if (ioread32(p + PCH_I2CSR) & PCH_GETACK) { - pch_dbg(adap, "Receive NACK for slave address setting\n"); + pch_dbg(adap, "Receive NACK for client address setting\n"); return -ENXIO; } @@ -382,7 +382,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap, buf = msgs->buf; addr = msgs->addr; - /* enable master tx */ + /* enable host tx */ pch_setbit(adap->pch_base_address, PCH_I2CCTL, I2C_TX_MODE); pch_dbg(adap, "I2CCTL = %x msgs->len = %d\n", ioread32(p + PCH_I2CCTL), @@ -406,7 +406,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap, addr_8_lsb = (addr & I2C_ADDR_MSK); iowrite32(addr_8_lsb, p + PCH_I2CDR); } else { - /* set 7 bit slave address and R/W bit as 0 */ + /* set 7 bit client address and R/W bit as 0 */ iowrite32(i2c_8bit_addr_from_msg(msgs), p + PCH_I2CDR); if (first) pch_i2c_start(adap); @@ -500,7 +500,7 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, buf = msgs->buf; addr = msgs->addr; - /* enable master reception */ + /* enable host reception */ pch_clrbit(adap->pch_base_address, PCH_I2CCTL, I2C_TX_MODE); if (first) { @@ -708,7 +708,7 @@ static u32 pch_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm pch_algorithm = { - .master_xfer = pch_i2c_xfer, + .xfer = pch_i2c_xfer, .functionality = pch_i2c_func }; From patchwork Fri Mar 22 13:25:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783366 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E19F25D72B for ; Fri, 22 Mar 2024 13:26:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114015; cv=none; b=BlZZgn6t8WY85qgofzL96ISN78ee1kj+Pk171kVmxaGMJzvP22a84//tqsK82LJwdNrwW3h5NwerS6sNWjzx+ENi4XthJqiixuzdPR3OXdtr/FUpTG6eEOZbN4tDlukfQDh/im1yjhpNnFtkW9HKTY4qdOhkEP79lcEwxJS8K7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114015; c=relaxed/simple; bh=FVpP8gUoUPw0PWyX7HyL4JNCQPt2zkfreDGXWCxyGkk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UDIRCnlHwCUdThV92RgaqXew8mshJmSwFZ1tiFzVlEsSXnPOaQcMlplbYlKZCg5/8/QkkWd/7luml//QLr4zqL2lwOlA8g/jrAsjaqcf0yoIQXNNQV+HqqbGIFufGb6qFsaf7iAwD0/KoD5r0GVgh06ES3wUpBWtrzIWFH1sS0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=geNmA+Xk; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="geNmA+Xk" 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=zciHgMoD1B5iI7bHKqcQfg5mAImSqokaqFAlMo9s3zY=; b=geNmA+ Xk/PkFxVZEpN7uQ41IheFU2gZ6VVyNAwPcLDqO2/ncFPSH04tw3JAA8PscIsFTrX zM607Lfpi1SUxvdbHOdMqMNW76WlsIr1DPZPaj0MMQNd7SYvvX5efVOpwXlGISyq TB7CsEpCFrKWjZTMxTmm6yn20lx98Gx2bLwdaQ577YjNKNrXwC5z6W6+kOy0ch1Q olQ7ExyfLv6Ag6vqno7GkWwUZ5qjesRjQefYFO+Qe9FgodY0wy24cbXsFHpm7rHt D4U/WTFn8+GIAGz8ycOiu1Ot3nusrbwI7Z1qW2+XMmZDZrw7s7k06xtxFcCTEprb u0idRjxNCvcMjhCA== Received: (qmail 3870529 invoked from network); 22 Mar 2024 14:26:36 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:36 +0100 X-UD-Smtp-Session: l3s3148p1@+rvuxT8U6uBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 19/64] i2c: emev2: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:12 +0100 Message-ID: <20240322132619.6389-20-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-emev2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c index 557409410445..e67c55abff88 100644 --- a/drivers/i2c/busses/i2c-emev2.c +++ b/drivers/i2c/busses/i2c-emev2.c @@ -314,7 +314,7 @@ static u32 em_i2c_func(struct i2c_adapter *adap) return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_SLAVE; } -static int em_i2c_reg_slave(struct i2c_client *slave) +static int em_i2c_reg_target(struct i2c_client *slave) { struct em_i2c_device *priv = i2c_get_adapdata(slave->adapter); @@ -332,7 +332,7 @@ static int em_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int em_i2c_unreg_slave(struct i2c_client *slave) +static int em_i2c_unreg_target(struct i2c_client *slave) { struct em_i2c_device *priv = i2c_get_adapdata(slave->adapter); @@ -352,10 +352,10 @@ static int em_i2c_unreg_slave(struct i2c_client *slave) } static const struct i2c_algorithm em_i2c_algo = { - .master_xfer = em_i2c_xfer, + .xfer = em_i2c_xfer, .functionality = em_i2c_func, - .reg_slave = em_i2c_reg_slave, - .unreg_slave = em_i2c_unreg_slave, + .reg_target = em_i2c_reg_target, + .unreg_target = em_i2c_unreg_target, }; static int em_i2c_probe(struct platform_device *pdev) From patchwork Fri Mar 22 13:25:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781948 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E610E5FBA0 for ; Fri, 22 Mar 2024 13:26:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114016; cv=none; b=jmFmYDpO4ux+XvpMLv4SRuE0dg4TX6cbis4VkeQFiqlOe4E4ciWBtt+3pBNA5leBLhbFs3KuOhkZeMKvW/ZXvscyMvM8PlLShlc7XXVqEO8ZHFO0Bcfs8NGZV0jL2xY33QJ9XeKX+0nUygebsR4zlQJsN42KMn2tmI4bX0s5nyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114016; c=relaxed/simple; bh=ILcQv+XMPcULM0Od7ox9jtX5Kx6Qqnb5MUap2X6BCj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GKZhE2Jc+rbPSlWkVF6Egq4bM/8EDV5J4WjwiK4ucSb2qWJq1UHCpvmFD/zRc8aWjXaE72STIURBrAHhwpOq2CdNbROW2/OrMfA9YFqyPSvz3RuTwdJ4eKUV8FIc1guvd9EBipTtL3k8PukSPT67z+SKhBfPoLpmvqoVaZ1WhHY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=BR2UeEu3; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="BR2UeEu3" 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=rF3P6J6pSBdQz8zQrkau4cQ2HrCjATGi3VINbjYPxk8=; b=BR2UeE u3ZhJZClbCnp6JJ7SSSGJFdeMkJJJRly8Xvfvt/D7xZNqRH2I78LMFzu6WttGKVf MKU8rrv+14plOq+L+lqqxU7M2CtigheDpoa/G8VYic2YxeY8xADOMxEqz8l0EdC8 rgMSALpEVJ5AZ7Ij8cnMQDk2tnov8pUKUJRkkJ+gCcblrQGR9OrBesVXTQnRIyT5 hN1Pjxf07K+UH1HLl14kSfTxKmT8TlhuFmTs2zkFwlDZCpMew2pQVfNyXODleFMF uojTCLh1UGANq71speTP3P2gNP5Yqo4OVDXWAgJLaohecPIxpzH3pnALtOS2L6Jw VoByjyA6mrD9aLlQ== Received: (qmail 3870567 invoked from network); 22 Mar 2024 14:26:37 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:37 +0100 X-UD-Smtp-Session: l3s3148p1@UMH8xT8U8OBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Eddie James , Andi Shyti , openbmc@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 20/64] i2c: fsi: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:13 +0100 Message-ID: <20240322132619.6389-21-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-fsi.c | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/i2c/busses/i2c-fsi.c b/drivers/i2c/busses/i2c-fsi.c index 10332693edf0..5eaf2c85a72c 100644 --- a/drivers/i2c/busses/i2c-fsi.c +++ b/drivers/i2c/busses/i2c-fsi.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * FSI-attached I2C master algorithm + * FSI-attached I2C controller algorithm * * Copyright 2018 IBM Corporation * @@ -145,7 +145,7 @@ /* choose timeout length from legacy driver; it's well tested */ #define I2C_ABORT_TIMEOUT msecs_to_jiffies(100) -struct fsi_i2c_master { +struct fsi_i2c_host { struct fsi_device *fsi; u8 fifo_size; struct list_head ports; @@ -155,7 +155,7 @@ struct fsi_i2c_master { struct fsi_i2c_port { struct list_head list; struct i2c_adapter adapter; - struct fsi_i2c_master *master; + struct fsi_i2c_host *host; u16 port; u16 xfrd; }; @@ -183,7 +183,7 @@ static int fsi_i2c_write_reg(struct fsi_device *fsi, unsigned int reg, return fsi_device_write(fsi, reg, &data_be, sizeof(data_be)); } -static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c) +static int fsi_i2c_dev_init(struct fsi_i2c_host *i2c) { int rc; u32 mode = I2C_MODE_ENHANCED, extended_status, watermark; @@ -214,7 +214,7 @@ static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c) static int fsi_i2c_set_port(struct fsi_i2c_port *port) { int rc; - struct fsi_device *fsi = port->master->fsi; + struct fsi_device *fsi = port->host->fsi; u32 mode, dummy = 0; rc = fsi_i2c_read_reg(fsi, I2C_FSI_MODE, &mode); @@ -236,7 +236,7 @@ static int fsi_i2c_set_port(struct fsi_i2c_port *port) static int fsi_i2c_start(struct fsi_i2c_port *port, struct i2c_msg *msg, bool stop) { - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; u32 cmd = I2C_CMD_WITH_START | I2C_CMD_WITH_ADDR; port->xfrd = 0; @@ -268,7 +268,7 @@ static int fsi_i2c_write_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg, { int write; int rc; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; int bytes_to_write = i2c->fifo_size - fifo_count; int bytes_remaining = msg->len - port->xfrd; @@ -294,7 +294,7 @@ static int fsi_i2c_read_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg, { int read; int rc; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; int bytes_to_read; int xfr_remaining = msg->len - port->xfrd; u32 dummy; @@ -330,7 +330,7 @@ static int fsi_i2c_get_scl(struct i2c_adapter *adap) { u32 stat = 0; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; fsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &stat); @@ -341,7 +341,7 @@ static void fsi_i2c_set_scl(struct i2c_adapter *adap, int val) { u32 dummy = 0; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; if (val) fsi_i2c_write_reg(i2c->fsi, I2C_FSI_SET_SCL, &dummy); @@ -353,7 +353,7 @@ static int fsi_i2c_get_sda(struct i2c_adapter *adap) { u32 stat = 0; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; fsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &stat); @@ -364,7 +364,7 @@ static void fsi_i2c_set_sda(struct i2c_adapter *adap, int val) { u32 dummy = 0; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; if (val) fsi_i2c_write_reg(i2c->fsi, I2C_FSI_SET_SDA, &dummy); @@ -377,7 +377,7 @@ static void fsi_i2c_prepare_recovery(struct i2c_adapter *adap) int rc; u32 mode; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; rc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_MODE, &mode); if (rc) @@ -392,7 +392,7 @@ static void fsi_i2c_unprepare_recovery(struct i2c_adapter *adap) int rc; u32 mode; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; rc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_MODE, &mode); if (rc) @@ -402,7 +402,7 @@ static void fsi_i2c_unprepare_recovery(struct i2c_adapter *adap) fsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, &mode); } -static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c, +static int fsi_i2c_reset_bus(struct fsi_i2c_host *i2c, struct fsi_i2c_port *port) { int rc; @@ -435,7 +435,7 @@ static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c, return fsi_i2c_dev_init(i2c); } -static int fsi_i2c_reset_engine(struct fsi_i2c_master *i2c, u16 port) +static int fsi_i2c_reset_engine(struct fsi_i2c_host *i2c, u16 port) { int rc; u32 mode, dummy = 0; @@ -478,7 +478,7 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status) unsigned long start; u32 cmd = I2C_CMD_WITH_STOP; u32 stat; - struct fsi_i2c_master *i2c = port->master; + struct fsi_i2c_host *i2c = port->host; struct fsi_device *fsi = i2c->fsi; rc = fsi_i2c_reset_engine(i2c, port->port); @@ -505,7 +505,7 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status) if (rc) return rc; - /* wait until we see command complete in the master */ + /* wait until we see command complete in the controller */ start = jiffies; do { @@ -579,7 +579,7 @@ static int fsi_i2c_wait(struct fsi_i2c_port *port, struct i2c_msg *msg, unsigned long start = jiffies; do { - rc = fsi_i2c_read_reg(port->master->fsi, I2C_FSI_STAT, + rc = fsi_i2c_read_reg(port->host->fsi, I2C_FSI_STAT, &status); if (rc) return rc; @@ -609,10 +609,10 @@ static int fsi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int i, rc; unsigned long start_time; struct fsi_i2c_port *port = adap->algo_data; - struct fsi_i2c_master *master = port->master; + struct fsi_i2c_host *host = port->host; struct i2c_msg *msg; - mutex_lock(&master->lock); + mutex_lock(&host->lock); rc = fsi_i2c_set_port(port); if (rc) @@ -633,7 +633,7 @@ static int fsi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, } unlock: - mutex_unlock(&master->lock); + mutex_unlock(&host->lock); return rc ? : num; } @@ -654,7 +654,7 @@ static struct i2c_bus_recovery_info fsi_i2c_bus_recovery_info = { }; static const struct i2c_algorithm fsi_i2c_algorithm = { - .master_xfer = fsi_i2c_xfer, + .xfer = fsi_i2c_xfer, .functionality = fsi_i2c_functionality, }; @@ -676,7 +676,7 @@ static struct device_node *fsi_i2c_find_port_of_node(struct device_node *fsi, static int fsi_i2c_probe(struct device *dev) { - struct fsi_i2c_master *i2c; + struct fsi_i2c_host *i2c; struct fsi_i2c_port *port; struct device_node *np; u32 port_no, ports, stat; @@ -699,7 +699,7 @@ static int fsi_i2c_probe(struct device *dev) return rc; ports = FIELD_GET(I2C_STAT_MAX_PORT, stat) + 1; - dev_dbg(dev, "I2C master has %d ports\n", ports); + dev_dbg(dev, "I2C controller has %d ports\n", ports); for (port_no = 0; port_no < ports; port_no++) { np = fsi_i2c_find_port_of_node(dev->of_node, port_no); @@ -712,7 +712,7 @@ static int fsi_i2c_probe(struct device *dev) break; } - port->master = i2c; + port->host = i2c; port->port = port_no; port->adapter.owner = THIS_MODULE; @@ -742,7 +742,7 @@ static int fsi_i2c_probe(struct device *dev) static int fsi_i2c_remove(struct device *dev) { - struct fsi_i2c_master *i2c = dev_get_drvdata(dev); + struct fsi_i2c_host *i2c = dev_get_drvdata(dev); struct fsi_i2c_port *port, *tmp; list_for_each_entry_safe(port, tmp, &i2c->ports, list) { @@ -772,5 +772,5 @@ static struct fsi_driver fsi_i2c_driver = { module_fsi_driver(fsi_i2c_driver); MODULE_AUTHOR("Eddie James "); -MODULE_DESCRIPTION("FSI attached I2C master"); +MODULE_DESCRIPTION("FSI attached I2C controller"); MODULE_LICENSE("GPL"); From patchwork Fri Mar 22 13:25:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783365 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBA035FDCB for ; Fri, 22 Mar 2024 13:26:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114016; cv=none; b=FCD5G68ea+E4MggOO2HTUDyCyc7RTBoPEDNnA57ihwMFb5KIDHeFCAitE3LA3mgHC/eZ1BI/cd6kSNLCfylKbh/KUoyWIJti+IMs9kTMw4NLug0lGEk4TqRWS9ZxtIeh4sybpXF3HSbW8vqQR/GTYI3AQ2TzZFYxvH/wLbdajHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114016; c=relaxed/simple; bh=WO3DbylpQPgN6NYC59JVZ3TCZs+4KFNv+oAPbFnZkS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPU1T87cOVLNbYAPoF3VId7HwbiW7J58RdX3EPpIbvTYChtB7+cDUTX+oRUpJuu4vrnY10PgdT74CA6YsPyJgg+/qXce+LZBsldcrjmz+co7hBqavh13WPWIUjFgV5FBxbOpcx3BTU4XKbqoZsJzpB/W3sCuIQet18euQ9IvQAQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=OtPpZIRd; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="OtPpZIRd" 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=DPk9C/eldcF/PegK95oT49FZFkWMxsc7VuXN/WF7JZk=; b=OtPpZI Rd87+dTKx4yAVMrc+FVVht8X5O3BALh2oEKo2DWYttlmQyMXc027dY3TStRnyVgR sQY6K5YWDb1Qs1O8g08fPDS9fXFsIjYNW83DS50UHSqr+hV8tG89kDbFh6aI4hCP d/SQp40oWBahcU7mjaxuFaptmgQtDUsfSq4h7GX+sQjd7SD6uAbm/jbXtAQzO2qC eCeJhaQfdcdPrMcIrl/rE1IWNfzVQVSgp3UVByeGFb5Lx3ADu/ohlhGt4IPHLNwf +I3zqTH6paaeURhTN2uM9uNuAQGVlAuQnNPysP1qFeIRznDLB2e72snpqLAwqcmY 6b79ufGgRwCDmcgg== Received: (qmail 3870598 invoked from network); 22 Mar 2024 14:26:38 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:38 +0100 X-UD-Smtp-Session: l3s3148p1@VVYIxj8U/OBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 21/64] i2c: gpio: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:14 +0100 Message-ID: <20240322132619.6389-22-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Andi Shyti --- drivers/i2c/busses/i2c-gpio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 4f1411b1a775..e0bd218e2f14 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -216,8 +216,8 @@ static int fops_lose_arbitration_set(void *data, u64 duration) priv->scl_irq_data = duration; /* - * Interrupt on falling SCL. This ensures that the master under test has - * really started the transfer. Interrupt on falling SDA did only + * Interrupt on falling SCL. This ensures that the controller under test + * has really started the transfer. Interrupt on falling SDA did only * exercise 'bus busy' detection on some HW but not 'arbitration lost'. * Note that the interrupt latency may cause the first bits to be * transmitted correctly. @@ -245,8 +245,8 @@ static int fops_inject_panic_set(void *data, u64 duration) priv->scl_irq_data = duration; /* - * Interrupt on falling SCL. This ensures that the master under test has - * really started the transfer. + * Interrupt on falling SCL. This ensures that the controller under test + * has really started the transfer. */ return i2c_gpio_fi_act_on_scl_irq(priv, inject_panic_irq); } From patchwork Fri Mar 22 13:25:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781947 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8571760250 for ; Fri, 22 Mar 2024 13:26:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114017; cv=none; b=NGbm57VdGEEHWL2NaPDYuquvtH2uV5Tkw9Y+Mup1L/mLZ4ESer9+EMxr/054/8X8viP6Nk+WWLiI9vn6l1hL3ZORvIUalBexL+O4ZbSiqczVRQ8LTBSQ4+Qjj6PQYfUoS0FIoprV3F8ngFnE4mdDgQz38pxwcSg0Ubs51sKCE0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114017; c=relaxed/simple; bh=57ZUMg6x237by2el+JilG1Bn2dEehlLOFvNktc90J1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dv+QpszvOMzxD5xCZMpyPUGGI15V01UDWuIu0MrOGQc0JWumpdC5PiZy+Ozzse0u9CiBDuZSIrKPebJBc22+CVukxEbm7AXUX0QRwgnYS1YEaqCnH5rEHbEaCXOGor913QJJeCM336AE8EO01DJzxWIdh4ycAUuleckSjS4AWnc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=IJqVo+FW; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="IJqVo+FW" 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=SHhyecuZpSri2t3mYMVojQTj080dpu1S9qK76O6Iknk=; b=IJqVo+ FWEY6rPPIMhSHn85Gcimka4V4pmS8o3xFVt2a/y36VFREAQCS0MAMSgAoTOPuBl7 Q1LcRc7zZslbb28ZZAAgVsJ7RXF6cTi79mSyejIr6cHv99iJB0XMOIwnAxsqWeWB inCUh35UAlMWoAmoLStc1Gk1b8M4p8XNpCOrWcMrC5FsTWLdV2+CVdndWjhujMiK H/TutO3nDCIyPkLN8BWwrpyH4kZRs3M3Rc8juGMqT6av2krHkmeqK/jtKLQ/1JhT r9mtwXeo65rr+rZTLrDIzewZUZDb8+Metqwn/lwNhBfrsGc8tJyLpGlpj/blRMIM kc0+ycoA5R8/LSTw== Received: (qmail 3870621 invoked from network); 22 Mar 2024 14:26:39 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:39 +0100 X-UD-Smtp-Session: l3s3148p1@tAcVxj8UBOFehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 22/64] i2c: highlander: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:15 +0100 Message-ID: <20240322132619.6389-23-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-highlander.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index 7922bc917c33..ec3546a5178b 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c @@ -331,7 +331,7 @@ static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, /* Ensure we're in a sane state */ highlander_i2c_done(dev); - /* Set slave address */ + /* Set client address */ iowrite16((addr << 1) | read_write, dev->base + SMSMADR); highlander_i2c_command(dev, command, dev->buf_len); From patchwork Fri Mar 22 13:25:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783364 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 542A0604AF for ; Fri, 22 Mar 2024 13:26:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114018; cv=none; b=lBpB/O8a6hhn7scy03guT3+hcVdhxyijNzJjF8oe0xECEAB/SigqBL/WbCVOtbBNa3qwJha90O/H9VHoMH1XjTYx69tXTMF2IiGpf+ONShwglnR4w1VM5Ypd4yzhLeiahOa/5ALLWyeovfNfrprCYtcJIfeYQRPryeBC4d22Hmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114018; c=relaxed/simple; bh=m7oBZiPiCYpAs48i0suwGRxvQW5vIb79oo+w8VDHE58=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fAcDLCTwhTTEo+vnrNAKphkXKKYnOMO0skJyyhls7vszMagE80oN8gt8h6H/5JdZxboI2bqdAqTg+/2VeXq6RPC13fUBK9vpuBw5bmkES46O5+b0p+RgG7KIVyL5RfRnp3qPphBb6486UDTEtOegHNayKPNXjhtoX4zAtd/cKBw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=SH4q4sck; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="SH4q4sck" 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=zHWcrqcqGocHIBXF4RitcyOSKbklqY+OmlrTvuEauIc=; b=SH4q4s ckAA+8fPDc59KFMUlUUyeLDLg+nI7lwTpVTrZ1ZDYtAf9Yp+3tfFzElEg1E5ZsXS 8Uzblu2k9EFn3Y9kVphWMLp5mDpFJASJuvWmJwTYRRVgaBPkKcNKyqGIHLR5EzWX mQME/y1cwEcFymaUfcdHW+GoaNNB+1jvSANciScJT4oZoa/PU97vKizpeoho1LGM SUlMm4ms7Kq1OCXE6DzJ3ygiSZrO2D8UExUtb1GSxn7xoupr0TSrD2X2eN0ppDxE B/gZNC4eTqJ0TTfTafFCRrwTj80g73t9aFEb9MpBwECSYkw3EgMvO++jxMFfh04g 2KwyBBje2379BtVg== Received: (qmail 3870645 invoked from network); 22 Mar 2024 14:26:40 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:40 +0100 X-UD-Smtp-Session: l3s3148p1@MQ4ixj8UnpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 23/64] i2c: hix5hd2: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:16 +0100 Message-ID: <20240322132619.6389-24-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-hix5hd2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c index 8e75515c3ca4..d7a834a7fec5 100644 --- a/drivers/i2c/busses/i2c-hix5hd2.c +++ b/drivers/i2c/busses/i2c-hix5hd2.c @@ -200,7 +200,7 @@ static void hix5hd2_read_handle(struct hix5hd2_i2c_priv *priv) /* the last byte don't need send ACK */ writel_relaxed(I2C_READ | I2C_NO_ACK, priv->regs + HIX5I2C_COM); } else if (priv->msg_len > 1) { - /* if i2c master receive data will send ACK */ + /* if i2c controller receive data will send ACK */ writel_relaxed(I2C_READ, priv->regs + HIX5I2C_COM); } else { hix5hd2_rw_handle_stop(priv); @@ -384,7 +384,7 @@ static u32 hix5hd2_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm hix5hd2_i2c_algorithm = { - .master_xfer = hix5hd2_i2c_xfer, + .xfer = hix5hd2_i2c_xfer, .functionality = hix5hd2_i2c_func, }; From patchwork Fri Mar 22 13:25:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783363 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D989605AE for ; Fri, 22 Mar 2024 13:26:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114019; cv=none; b=pN9Pxlopv4ZXTtVa9MHRZdz6/lGp3DKLXdMu+YN+koQIgziT/8t17zcQNqqTF368W6dNtlpNH5+Z0ezZxugAwatHoQY+p4pSNHNlpt2Ku+zjlXL71Adu6IsPXCPSsqGEZ/RIQuvT7iFTDyasewYDiELPOhRbfHwTtMtLEJvShuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114019; c=relaxed/simple; bh=KMlPjhymqUnFrcOezsGlxN4z0c5hiNab6hv/WcMS95s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HNaFi2kEEmAsTpoCL0UT/f9O813ikUUR2zT3n/CD3pSdm6AKw8FrVUOzb6PBxRBO0QLg8RlNejWRZOO9z6Vt7jEoQ+KhVni/ijjC0ARFIEhnvkjbqdJ+HkZFj30cRJv0ZWOaBKW9F9lIKDOqAjNE4GWGdsk9B31RuO7dG1Y2U1M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=dAN0vM62; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="dAN0vM62" 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=ELobiikT/EftdANZZNCWbmYEFMap38mTRb0PD3v43fw=; b=dAN0vM 62K1vHo9Ig88LNbKifyqaPmYYbUwnxrG6m7RtS1JzQPnwj9vhgxKQNoh4ekGjktW X+uN8FXdTbuyQ/PTyf0GOxoipXoWNr1Qum9c1zEGavTc2wp6qAbfw4LEBeuX7wBF bRG8GvBftkLNLBmOleniGhumM26A9+XXkoY8wn9HCR3j8KIIzk6T7r9yDFS1jhkU kBDT0vZ50ug8ci8bbZ5olezjWhNaJ51OfYO/VBGyitdAIkrj6KIiS5CUgLtB7/Gr IDfB4+E0Ffid8d9WosfStsYkTja6W0nf450JWcRO+V0B7UeJ62XyTtmFrHQYj0UO fuM6vzljcwadKqvg== Received: (qmail 3870679 invoked from network); 22 Mar 2024 14:26:41 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:41 +0100 X-UD-Smtp-Session: l3s3148p1@hVcvxj8UqJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 24/64] i2c: i801: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:17 +0100 Message-ID: <20240322132619.6389-25-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-i801.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index a6861660cb8c..68983f0a7fef 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -87,7 +87,7 @@ * Block buffer yes * Block process call transaction yes * I2C block read transaction yes (doesn't use the block buffer) - * Slave mode no + * Target mode no * SMBus Host Notify yes * Interrupt processing yes * @@ -1274,10 +1274,10 @@ static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv) i2c_new_client_device(&priv->adapter, &info); } -/* Register optional slaves */ -static void i801_probe_optional_slaves(struct i801_priv *priv) +/* Register optional clients */ +static void i801_probe_optional_clients(struct i801_priv *priv) { - /* Only register slaves on main SMBus channel */ + /* Only register clients on main SMBus channel */ if (priv->features & FEATURE_IDF) return; @@ -1304,7 +1304,7 @@ static void i801_probe_optional_slaves(struct i801_priv *priv) } #else static void __init input_apanel_init(void) {} -static void i801_probe_optional_slaves(struct i801_priv *priv) {} +static void i801_probe_optional_clients(struct i801_priv *priv) {} #endif /* CONFIG_X86 && CONFIG_DMI */ #if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI @@ -1756,7 +1756,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) /* We ignore errors - multiplexing is optional */ i801_add_mux(priv); - i801_probe_optional_slaves(priv); + i801_probe_optional_clients(priv); pci_set_drvdata(dev, priv); From patchwork Fri Mar 22 13:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781946 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 224A2604DA for ; Fri, 22 Mar 2024 13:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114019; cv=none; b=o+8a4ZB/e+P5VZvK0sGXnuDJzjGOJIexnNKSNUgBwfikWUEpxqXzwKETOms/hOJBz3jN9iBv5kczaZcVxlRYjsq5WRuc7y08fN0G25DWpTjz3qxkonLpB7eRuTLhcliBFIdFCs0+0Ne15EMd1FPVGhHbDg7acquy8gMmsYLqwWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114019; c=relaxed/simple; bh=G/Op5CTNc7pnGrKK6AxAzIHLRpIR4XjnsrHDY5BHeb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrFpb4+/sPT0hqSXTtg8bKmylEB1tunrjza/b3xuwSw/Y37CWJPNASyz5eYnj784Yy1KTWCyWQ37xlKJKzNIacHUZRsHaePOjMObaHclsOmaq9LAVz6k6Im5886DiE2oDbk0NmzEkA3Fcj7wuAxcT5bxHqP4oyvEwh0znl7/+I8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=MLlHPMNs; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="MLlHPMNs" 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=egjrsEBY1tV+MtY6pTP+RmKOqsl2JfskA20O5zDYvVQ=; b=MLlHPM NsuLK80+GWAgfjCSI1janf3ZqQYBWuJPq/mD1R/V0+AEqT0JwIy26qRL9SplGJpU P0/FWwwafrhI2CoHbaXysy8OwbdWILhHXclQUR+pNa++mFBLqPPz3807L6XDl8Nf EQauFleSzV4i4g6t4ND3wY0o6ZFlZsWQb+17auuNcpEM3ePWVZupLGT/TDN7DS/c EHvicm47M2AyaG9EBPMpDTk4GqFyGyjKPWdQMOzusiE/kY6+ZYzh+tFpN43MP3r5 um9oPawNSVm8h8TLiMsHEj545Rw1IbzK2l39YQcy9QivmnABwHcFrHdWlB5gdHmI kRNI6wP7t9H6isvA== Received: (qmail 3870734 invoked from network); 22 Mar 2024 14:26:41 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:41 +0100 X-UD-Smtp-Session: l3s3148p1@vrg8xj8UspRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 25/64] i2c: ibm_iic: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:18 +0100 Message-ID: <20240322132619.6389-26-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ibm_iic.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 7fb87b78923e..f94596074446 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -136,11 +136,11 @@ static void iic_dev_init(struct ibm_iic_private* dev) DBG("%d: init\n", dev->idx); - /* Clear master address */ + /* Clear client address */ out_8(&iic->lmadr, 0); out_8(&iic->hmadr, 0); - /* Clear slave address */ + /* Clear target address */ out_8(&iic->lsadr, 0); out_8(&iic->hsadr, 0); @@ -337,7 +337,7 @@ static irqreturn_t iic_handler(int irq, void *dev_id) } /* - * Get master transfer result and clear errors if any. + * Get host transfer result and clear errors if any. * Returns the number of actually transferred bytes or error (<0) */ static int iic_xfer_result(struct ibm_iic_private* dev) @@ -352,7 +352,7 @@ static int iic_xfer_result(struct ibm_iic_private* dev) out_8(&iic->extsts, EXTSTS_IRQP | EXTSTS_IRQD | EXTSTS_LA | EXTSTS_ICT | EXTSTS_XFRA); - /* Flush master data buffer */ + /* Flush host data buffer */ out_8(&iic->mdcntl, in_8(&iic->mdcntl) | MDCNTL_FMDB); /* Is bus free? @@ -401,7 +401,7 @@ static void iic_abort_xfer(struct ibm_iic_private* dev) } /* - * Wait for master transfer to complete. + * Wait for host transfer to complete. * It puts current process to sleep until we get interrupt or timeout expires. * Returns the number of transferred bytes or error (<0) */ @@ -452,9 +452,7 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){ return ret; } -/* - * Low level master transfer routine - */ +/* Low level host transfer routine */ static int iic_xfer_bytes(struct ibm_iic_private* dev, struct i2c_msg* pm, int combined_xfer) { @@ -511,9 +509,7 @@ static int iic_xfer_bytes(struct ibm_iic_private* dev, struct i2c_msg* pm, return ret > 0 ? 0 : ret; } -/* - * Set target slave address for master transfer - */ +/* Set client address for host transfer */ static inline void iic_address(struct ibm_iic_private* dev, struct i2c_msg* msg) { volatile struct iic_regs __iomem *iic = dev->vaddr; @@ -546,7 +542,7 @@ static inline int iic_address_neq(const struct i2c_msg* p1, } /* - * Generic master transfer entrypoint. + * Generic transfer entrypoint. * Returns the number of processed messages or error (<0) */ static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) @@ -604,11 +600,11 @@ static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) } } else { - /* Flush master data buffer (just in case) */ + /* Flush host data buffer (just in case) */ out_8(&iic->mdcntl, in_8(&iic->mdcntl) | MDCNTL_FMDB); } - /* Load slave address */ + /* Load client address */ iic_address(dev, &msgs[0]); /* Do real transfer */ @@ -624,7 +620,7 @@ static u32 iic_func(struct i2c_adapter *adap) } static const struct i2c_algorithm iic_algo = { - .master_xfer = iic_xfer, + .xfer = iic_xfer, .functionality = iic_func }; From patchwork Fri Mar 22 13:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781945 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32B43605C9 for ; Fri, 22 Mar 2024 13:26:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114020; cv=none; b=cLBuCxMenGxiMrP5SM/kNANXXVu0ro6LD75HPZqxTxJvFDMF1ksxh2CYQdQPi2IAUBnY+j8sYmn2zEXRgoE06ndU0Ny64lTRdjy/jRY8M3k3Hcpjx/54pmGu2YPyRL+4vHNSNlhRzumf5a53+/7/9ediQY1QFAelFKF7xm6ktwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114020; c=relaxed/simple; bh=IT1cLzX/MW7DWta6VFhg4vcgUE19Sls0w1v03CPRnGw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QxyYQdSWDWsRMsHWS3cym4ijQijak7VdfDQi+hbbKwZKhVB2o9v5mxPuAQmzWQkqAJea6QCTNiIRsP6jT0OHium2iR9GieK7mVrt9LRZCmVK+eCd32JwKRwG/2fQv8tsaY5DWAwrP/K5ZZbxyq++gMGeBLSzJ27wMKtKvUPXyrI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=dsjJPEhA; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="dsjJPEhA" 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=vWbyFOf4V5PXU0iX7KbH4cd/yxRPi16DHsMc4aLJqy8=; b=dsjJPE hALiYPDPqtAFQ9EyzYechmRJCyKo2h6c35ksfOQrlgN1rmUEg4Y7fLngd2J9G9p+ Oz0qQTHVz4dyoVxysc3oIAd6aqrD8dQRVBORRlMCPZGEdR4jQ2LW/DqZfTAfoosv +biP1HBKQbD508GCkIiyb+YRG9E/PbE7lFGuIFBsw79gPg0F2oH+mWImZLKKIpzs 9MltKvpsXhxOhqVMhDQwY4xWK9SoMDk6X9kz/J5121N3QLsWaVz5j4ZSUuswAA9g V3CWKqHMUpyk6P94HcL5l5ldZJhTATEzYi8BfVlUOJHG53Mw+tVekPrFcBCnzfwW gbk3bi9HmsyGDb7A== Received: (qmail 3870775 invoked from network); 22 Mar 2024 14:26:42 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:42 +0100 X-UD-Smtp-Session: l3s3148p1@rQJJxj8UupRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Dong Aisheng , Andi Shyti , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 26/64] i2c: imx-lpi2c: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:19 +0100 Message-ID: <20240322132619.6389-27-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-imx-lpi2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c index 6d72e4e126dd..337a55804463 100644 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c @@ -262,7 +262,7 @@ static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx) return 0; } -static int lpi2c_imx_master_enable(struct lpi2c_imx_struct *lpi2c_imx) +static int lpi2c_imx_host_enable(struct lpi2c_imx_struct *lpi2c_imx) { unsigned int temp; int ret; @@ -292,7 +292,7 @@ static int lpi2c_imx_master_enable(struct lpi2c_imx_struct *lpi2c_imx) return ret; } -static int lpi2c_imx_master_disable(struct lpi2c_imx_struct *lpi2c_imx) +static int lpi2c_imx_host_disable(struct lpi2c_imx_struct *lpi2c_imx) { u32 temp; @@ -459,7 +459,7 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, unsigned int temp; int i, result; - result = lpi2c_imx_master_enable(lpi2c_imx); + result = lpi2c_imx_host_enable(lpi2c_imx); if (result) return result; @@ -502,7 +502,7 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, result = -EIO; disable: - lpi2c_imx_master_disable(lpi2c_imx); + lpi2c_imx_host_disable(lpi2c_imx); dev_dbg(&lpi2c_imx->adapter.dev, "<%s> exit with: %s: %d\n", __func__, (result < 0) ? "error" : "success msg", @@ -554,7 +554,7 @@ static u32 lpi2c_imx_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm lpi2c_imx_algo = { - .master_xfer = lpi2c_imx_xfer, + .xfer = lpi2c_imx_xfer, .functionality = lpi2c_imx_func, }; From patchwork Fri Mar 22 13:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783362 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B42460897 for ; Fri, 22 Mar 2024 13:26:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114022; cv=none; b=IIX343mDAXhdfRz5hOo9q08LXzV9HYec0nogzqYD8hE9EA2l0iDtshhkNr9tInz8/05RCrN6eOziO0vTbPBaC3AQWh56QEEXk8zFY6nb1aemqiuGeasmV7GWjeSNeMVG9DBd1AaiBPGwe5/ksZV29/YhIT6ZUyvP65M6BwF3fxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114022; c=relaxed/simple; bh=q7JRzLfJ8eThPTGrFEoS5oDExGETXR2V5D9xqAe4mLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dyt+ORld5NViRB2QNM5HNLaoLbD93iEJNYHDoD/B4sn4cscubh5qzfWKCaFXkyIsxKx1P93bzQSsTT+wijCuOxZTvepHfecct1DCx1uKUK7T1Jk8EMK/BG5QJlC0RqRQcD9fWJEJ0fJEh7KfqEBco5wqniYxBrXMQPZbf653Qj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=NJwmyVON; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="NJwmyVON" 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=ItvkqPOxxoAxX6wP7vqtFYes8mnGS8tDMPsJtLe0c/I=; b=NJwmyV ONyXHx43Ket4ijy0PAu5NZ/Gq58i9u8de1ufZvKAFznoF4R/5fxqFMN8GLLxzlRH X6rQ9CzdCnO7pboqDfwxGWJ5a6Ah3b4bCyoJmAt75wWCCLFa6G5C09CdaNj//vFC MwpARqcLpkBenCPLCqii5Dz2jFmZGIEQPFfcmcqdAFf5YsrmFOO1APdhQqFKRtUr jYlnocSCLj7+HgcobbG1eeQLOuq3a4CzrcANVd4IzmNtI3J8aKWbH1/0IRx9bU9y iAI/DLoYVopoPnMvSgHgueinejOLizZNjpJpcdbjkOIXzlF2bza81/NGMymJvA3M pMdxdVg61oa+SxrA== Received: (qmail 3870828 invoked from network); 22 Mar 2024 14:26:43 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:43 +0100 X-UD-Smtp-Session: l3s3148p1@kuNVxj8UwJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 27/64] i2c: iop3xx: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:20 +0100 Message-ID: <20240322132619.6389-28-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-iop3xx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 2e5f0165c3d3..9973f7d83205 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -22,7 +22,7 @@ * - Make it work with IXP46x chips * - Cleanup function names, coding style, etc * - * - writing to slave address causes latchup on iop331. + * - writing to own client address causes latchup on iop331. * fix: driver refuses to address self. */ @@ -234,7 +234,7 @@ iop3xx_i2c_send_target_addr(struct i2c_algo_iop3xx_data *iop3xx_adap, int status; int rc; - /* avoid writing to my slave address (hangs on 80331), + /* avoid writing to my client address (hangs on 80331), * forbidden in Intel developer manual */ if (msg->addr == MYSAR) { @@ -350,10 +350,10 @@ iop3xx_i2c_handle_msg(struct i2c_adapter *i2c_adap, struct i2c_msg *pmsg) } /* - * master_xfer() - main read/write entry + * xfer() - main read/write entry */ static int -iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, +iop3xx_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) { struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; @@ -384,7 +384,7 @@ iop3xx_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm iop3xx_i2c_algo = { - .master_xfer = iop3xx_i2c_master_xfer, + .xfer = iop3xx_i2c_xfer, .functionality = iop3xx_i2c_func, }; From patchwork Fri Mar 22 13:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781944 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B45560898 for ; Fri, 22 Mar 2024 13:26:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114023; cv=none; b=dJSM0EUlNkIzLKiNJEb+WRd6SmZrsocavvkWrSfoJomJGcfv2eTHS2yXpUb5jABlWwjLClf8ZDQF2O2wckbRPtlrUCP/yYS5Cyr1V4TUqNnHuNuBLMgjmHEITlW1vGFIeRc4d5Qg+vzMOxRUIsQKuxJvAWGI3FDgB9PVj9curDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114023; c=relaxed/simple; bh=GAY5ft5NyrayMYnRBVE9b/3C6FO7J6omqMboPfkPyJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p3ypmuUj/dNREckQigcQwNfYcF6Y7wFtp4b1ip89onXh9led/beqJ/YVfaBiZGSUqQX4y3SRE9PVaJWj+ifAYJ2NQudcpgQSI+rCP6qbR1S0UDmkceqB+3U3qYKV80pyyw28V0DUD5QN8bd/Pz6wXrj2G3U1y2DYexP0wMky1Eg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=i/lY9Qmd; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="i/lY9Qmd" 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=ha2oisARdYVLXS1jZiTtFGRJALZMNbKy5spP2HTyWXA=; b=i/lY9Q mdnGtjoRzM/ks8HxUNOpzXZmGFanUtRHvykViSfKGPGEQ1PfWtcZdIyWdMo94hcF I3hA91jiWmW0zYazPTlLOCkkE/FUnGdq3kxGjOV5ztIRi7lmj74NGx5veDqBMKza lfaSmpfSbpVOmnzqj2iRPIhyQAnSJOYR4f8S5pu3/UBSqUX3pet5mdKu3EbzI1xm eim2LABOilzx1KHuDzU6xXanmUYpX6bvObS7tJAl3Z2HdeIqyxnjXpwGbKEyj3lE lCIZcaPhK+Sl3LnyT8GMd7BgkaqqJ3SiJfrKFdKVXJZmeLK4RJfEmpV+j3zB3oUi TTv/lAbovc1Zv+ig== Received: (qmail 3870872 invoked from network); 22 Mar 2024 14:26:44 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:44 +0100 X-UD-Smtp-Session: l3s3148p1@zwlixj8UypRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 28/64] i2c: isch: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:21 +0100 Message-ID: <20240322132619.6389-29-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-isch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index 416a9968ed28..389202625964 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c @@ -104,7 +104,7 @@ static int sch_transaction(void) result = -EIO; dev_dbg(&sch_adapter.dev, "Bus collision! SMBus may be " "locked until next hard reset. (sorry!)\n"); - /* Clock stops and slave is stuck in mid-transmission */ + /* Clock stops and client is stuck in mid-transmission */ } else if (temp & 0x02) { result = -EIO; dev_err(&sch_adapter.dev, "Error: no response!\n"); From patchwork Fri Mar 22 13:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783361 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBF4E60B92 for ; Fri, 22 Mar 2024 13:27:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; cv=none; b=ghpr1PPSBOzhQTZ8jpVtbJhNwH1P2fpNEOK8abQs3k2+mrusQYXNEmr5IHN4p5I03WaxTI//2VCzvU4XOIra+DMAS3sHTY6SPiQPeYOcz4ESMH3pnPzQ2D1/FZdT1GEgAKi1Q/wFaJK4CQS9pavPQRIIQ7Hy4xo0gi/xpOIpgng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; c=relaxed/simple; bh=RtFoAyLcCQAVrIeloyED9nr4JSNfmYnMtLZOqpvL+II=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mMLRlB3KLv+tXymjhkkT0hMq9RPX7jaZ3PziTfZkocfyVfnNwNrfQnnDr+ctX2MIVCAOBz1VzvF4b87kIL9pIDT7YaMf8GzK7Crcb9cdIBC6Fu6AmH8yzRRNDaglA9VIWjyF4NmCqJ4hVpsr37c41zgCa9zgS8WeEw9/IGavfpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=hcAuZfdn; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="hcAuZfdn" 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=Ei3VpnwDSCVWbsA8vB5GPAX0gbkybV134bZz1zMqk2o=; b=hcAuZf dnkvEJXt3fmeoraiD8cctR5nkr84Zdp+C62+V3Uub2c/pVyz1V9RcGhs63wQ5Uch CkeNnTjT0heKbLUNIgPHszaivDWUi+/W2pU4/lUPaTBNoP0pvhyPnMCXPHL1pIgG kl/vOZcSQCkEL2TvWBhCrVUsdsUelf3c3cCbJSiXbMWHVClA/9j8kJ06HfX6Q8JL kWI1JQh9+Poq0X5RYiD8kz2EJQ0ikRu8mda3NxCE7khD3BsV35EeYsEGzSUugTJO dL17Gm4YvZd6ekWqss/98A6Gdox7hbQe6fPR3R2v0GUzE2q0S/8LPHaMsuRHp9z6 Ln05B0WOT7edNceg== Received: (qmail 3870921 invoked from network); 22 Mar 2024 14:26:45 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:45 +0100 X-UD-Smtp-Session: l3s3148p1@/mZuxj8UzJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Seth Heasley , Neil Horman , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 29/64] i2c: ismt: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:22 +0100 Message-ID: <20240322132619.6389-30-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ismt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index c74985d77b0e..67c9d9768edd 100644 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c @@ -54,7 +54,7 @@ * Hardware PEC yes * Block buffer yes * Block process call transaction yes - * Slave mode no + * Target mode no */ #include From patchwork Fri Mar 22 13:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783360 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9482347A58 for ; Fri, 22 Mar 2024 13:27:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; cv=none; b=kIUsIDmFrwjdKVYzfQukFcKB0ej+lrLA91JX72JYmMJdvfVisNDe1lsAxXv3PCsj4WH0eYMYV/2Lp+MZ3bblrJtunCm2K8TfG2VORAwOrOrV7o6xZmPHFhJY2Azp5y93f2Zb+a8vEr2AUmlETSCeyXk43m01oBJQCPI2EFbuvCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; c=relaxed/simple; bh=5o/b35YNWQ+wW36J+YG/JPEDdnYdO9wYpwztsTCGkIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SXTBWB96tAL/0Qi5ufd3WrZyV0yv2lxAzP1p95Z+SbYt8L7uQy2RVuvUqWUYL+tpThf5i53wIjJIZWdAfBKatQq4wuO+2jyLQyj+cYGWP0oBV240EycIgSwiYWgacREV5+2eYo8OoMJkrtJuY9pKelJqS2QLQWw1rBSSFs80eRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=diFskzFT; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="diFskzFT" 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=ZPs4SN1QjrsLyzCteCcuLANMhkdslo1oiN7EMNDt0Gs=; b=diFskz FTvbsjRXw5JFZ/q64n52ZW8erhRKO3tmycaKhSLyw3592Ztl4vtnbUO+1OikjsTJ Bp66MBdJgfkpjPT5H+fZApgoPEaffvFKWe0WstgrfuLCqFVLEl7cjQNCbkVjHb8o zVL4vLWhszWp+o2OumbsXVod/rT94ym5S4z8/Ln3Pr43bsBbaJgEwB3rDE7oDgJH 2YoK38bqHxS5qL9cG8yTbd6uE/st2Sn6SsvKMFkPR7C13RMZzMKIn5ramtC0smps vxC6+vcrGkiVJC1/jFDZD9yyB8W9seO+oNFDGpUBlmRU2IABTG4gky2tBxu3UzXp 6HiqDWy+sBHI2R1g== Received: (qmail 3870956 invoked from network); 22 Mar 2024 14:26:46 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:46 +0100 X-UD-Smtp-Session: l3s3148p1@NSN7xj8U3JRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 30/64] i2c: ljca: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:23 +0100 Message-ID: <20240322132619.6389-31-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ljca.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-ljca.c b/drivers/i2c/busses/i2c-ljca.c index b4927622177c..68aae0632f26 100644 --- a/drivers/i2c/busses/i2c-ljca.c +++ b/drivers/i2c/busses/i2c-ljca.c @@ -76,7 +76,7 @@ static int ljca_i2c_init(struct ljca_i2c_dev *ljca_i2c, u8 id) return ret < 0 ? ret : 0; } -static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr, +static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 client_addr, enum ljca_xfer_type type) { struct ljca_i2c_rw_packet *w_packet = @@ -88,7 +88,7 @@ static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr, w_packet->id = ljca_i2c->i2c_info->id; w_packet->len = cpu_to_le16(sizeof(*w_packet->data)); - w_packet->data[0] = (slave_addr << 1) | type; + w_packet->data[0] = (client_addr << 1) | type; ret = ljca_transfer(ljca_i2c->ljca, LJCA_I2C_START, (u8 *)w_packet, struct_size(w_packet, data, 1), (u8 *)r_packet, @@ -107,7 +107,7 @@ static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr, return 0; } -static void ljca_i2c_stop(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr) +static void ljca_i2c_stop(struct ljca_i2c_dev *ljca_i2c, u8 client_addr) { struct ljca_i2c_rw_packet *w_packet = (struct ljca_i2c_rw_packet *)ljca_i2c->obuf; @@ -169,16 +169,16 @@ static int ljca_i2c_pure_read(struct ljca_i2c_dev *ljca_i2c, u8 *data, u8 len) return 0; } -static int ljca_i2c_read(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr, u8 *data, +static int ljca_i2c_read(struct ljca_i2c_dev *ljca_i2c, u8 client_addr, u8 *data, u8 len) { int ret; - ret = ljca_i2c_start(ljca_i2c, slave_addr, LJCA_I2C_READ_XFER_TYPE); + ret = ljca_i2c_start(ljca_i2c, client_addr, LJCA_I2C_READ_XFER_TYPE); if (!ret) ret = ljca_i2c_pure_read(ljca_i2c, data, len); - ljca_i2c_stop(ljca_i2c, slave_addr); + ljca_i2c_stop(ljca_i2c, client_addr); return ret; } @@ -213,16 +213,16 @@ static int ljca_i2c_pure_write(struct ljca_i2c_dev *ljca_i2c, u8 *data, u8 len) return 0; } -static int ljca_i2c_write(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr, +static int ljca_i2c_write(struct ljca_i2c_dev *ljca_i2c, u8 client_addr, u8 *data, u8 len) { int ret; - ret = ljca_i2c_start(ljca_i2c, slave_addr, LJCA_I2C_WRITE_XFER_TYPE); + ret = ljca_i2c_start(ljca_i2c, client_addr, LJCA_I2C_WRITE_XFER_TYPE); if (!ret) ret = ljca_i2c_pure_write(ljca_i2c, data, len); - ljca_i2c_stop(ljca_i2c, slave_addr); + ljca_i2c_stop(ljca_i2c, client_addr); return ret; } @@ -266,7 +266,7 @@ static const struct i2c_adapter_quirks ljca_i2c_quirks = { }; static const struct i2c_algorithm ljca_i2c_algo = { - .master_xfer = ljca_i2c_xfer, + .xfer = ljca_i2c_xfer, .functionality = ljca_i2c_func, }; From patchwork Fri Mar 22 13:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781943 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50E0346558 for ; Fri, 22 Mar 2024 13:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; cv=none; b=jK7ey6OVdUMaSZ8VnyJitPfihiDVEal72CD/LXKNuV2wawiO8OLaXHOnbVzqLRjmJxJkjKBerSMD3Qho6FeIrXSUqBXAV9SyYdPV9tEF45miALNWdVAppxaYpOFKybcTd+NaloUURAZLH49QfdVLHdyWLh5ShQKQb0v8Us8K8aU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114024; c=relaxed/simple; bh=AAok3TR/hDjTzx7rUMsoBzmbQBA2Sf7tkal4DuSe3wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LjHuY99FiFVn0dlx5tcJLOsiJNLgc+gHvrnsQ7l2hs8H4JR9gY+Ap3uZ/4Y4OBP1x+DxEKZMDeXcU12I6bW6RWNRfOlhPl0/sfXIFnSCZux7iqIIIuL886k18PkIxzgJufyRLPEvp89x4E/2fOkYwBjiPG8n6ojNZBhWJ6dy5vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=ewDbTvO/; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="ewDbTvO/" 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=bxTOjroMQTFdH0tamjYqLu6EXC9WA3N/+/W5k3pAme4=; b=ewDbTv O/KmCvY4DF9BpDUr32mSq6++5TXqeP7aIBnT2Fi+pL7afcGap5lAI91qqjgSNlD1 ikSM+5pgzN47cyyzG+LAMTlplOurxuEYeFIsrMfKx47B2G0yzFgb7T3FNja1qjT3 H45X54rBZSO9k3H80mfuFM1466I2Ov9aBP81i5UPT7jb+bxPVE6qtInjYE5Z7wcR CBzhdxDOP3KSj/rv8rQWsM/P9Fmhjc0Bdv5oAINB1oxeRFzU3OqNWqapQVXzHLAe U79ydGjQYFbdvoU8gJu7bGslIBAFGa060s1zSu1iI3NA/PIPbg6u72nnIOyiqyPf 9Mimqz9l+BlUkoaQ== Received: (qmail 3871008 invoked from network); 22 Mar 2024 14:26:46 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:46 +0100 X-UD-Smtp-Session: l3s3148p1@RjaHxj8U6pRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Vladimir Zapolskiy , Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 31/64] i2c: lpc2k: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:24 +0100 Message-ID: <20240322132619.6389-32-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-lpc2k.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-lpc2k.c b/drivers/i2c/busses/i2c-lpc2k.c index e3660333e91c..f0cb217973c1 100644 --- a/drivers/i2c/busses/i2c-lpc2k.c +++ b/drivers/i2c/busses/i2c-lpc2k.c @@ -50,7 +50,7 @@ /* * 26 possible I2C status codes, but codes applicable only - * to master are listed here and used in this driver + * to host mode are listed here and used in this driver */ enum { M_BUS_ERROR = 0x00, @@ -157,7 +157,7 @@ static void i2c_lpc2k_pump_msg(struct lpc2k_i2c *i2c) break; case MR_ADDR_R_ACK: - /* Receive first byte from slave */ + /* Receive first byte from client */ if (i2c->msg->len == 1) { /* Last byte, return NACK */ writel(LPC24XX_AA, i2c->base + LPC24XX_I2CONCLR); @@ -196,7 +196,7 @@ static void i2c_lpc2k_pump_msg(struct lpc2k_i2c *i2c) } /* - * One pre-last data input, send NACK to tell the slave that + * One pre-last data input, send NACK to tell the client that * this is going to be the last data byte to be transferred. */ if (i2c->msg_idx >= i2c->msg->len - 2) { @@ -338,7 +338,7 @@ static u32 i2c_lpc2k_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm i2c_lpc2k_algorithm = { - .master_xfer = i2c_lpc2k_xfer, + .xfer = i2c_lpc2k_xfer, .functionality = i2c_lpc2k_functionality, }; From patchwork Fri Mar 22 13:25:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781942 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCDDF60BB1 for ; Fri, 22 Mar 2024 13:27:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114025; cv=none; b=UHH9xTbulru1b2UZ7Lt90oM/42vKAxSRgEyQC9atkdiUpnzyu51LJSH7eaTxB4h5Ds3yNv5GjX2rlyK5Svd3xPYGccL8c5mW8jUlEKNCCXBEBP6jVOIKFgonmENGf0bTpAoS6bDGDdhmkdrJKi7SyDEyTnzXFAuNqW8j+r0uthA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114025; c=relaxed/simple; bh=LqqomsdktA9PTDP493BWKLGoi/VPntCQe2jcifDjxWY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S7EJLzzdZf+AKuKQOncz3mHG7Vp9h/eOLlauv6+xAONal33NUaRFHqo4saZm4p2fjkjEfpydvp11RgnAiaL9Ufnq5OeQVWgMejcSxwcFucaZXuNvXOuREmr21BeWq+7FqBGiDPiz78cGoVsmlE//+JkXcd6efpmJ3RIl4BH+LmA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=ef2WfHRK; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="ef2WfHRK" 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=sbE/F8+G/icLLI8X84PqoQEotRP5kSI8t6RtImPL4Eo=; b=ef2WfH RKpBRv/nQII0Z9hDSaM4KgARYRCWVeIjqsmxpdBuwfUsoGpAsGv0s5pocRBAGwTk a/Z7pt1wBDHhWQPWba7vRsJCkAGtmSVS1cf4O0o5KhCPaQxuzS7pHcEpkSTriZtE JiMks0bWOeDVhImRqeC0xwh2CCr2b/ecXWQjvn+ot+TGeRu4agwtY1Rx8+R4uh5H 7Slg3aJJh4JEEy1lGxOUjczxcu3nySlBL5dDCI7t8MiSM/EKe28Pqm0js1qRp2Dr iIYNw0nABiqFdMAyc4F7OcQNMk5G2cHvE6oUm8jY20ik/xQE2FjTZeVwnfum4hGv GBIlJfkP9a55KS1A== Received: (qmail 3871041 invoked from network); 22 Mar 2024 14:26:47 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:47 +0100 X-UD-Smtp-Session: l3s3148p1@RKGTxj8U8pRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Binbin Zhou , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 32/64] i2c: ls2x: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:25 +0100 Message-ID: <20240322132619.6389-33-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-ls2x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-ls2x.c b/drivers/i2c/busses/i2c-ls2x.c index ebae6035701d..99fbc561e7f6 100644 --- a/drivers/i2c/busses/i2c-ls2x.c +++ b/drivers/i2c/busses/i2c-ls2x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Loongson-2K/Loongson LS7A I2C master mode driver + * Loongson-2K/Loongson LS7A I2C host controller mode driver * * Copyright (C) 2013 Loongson Technology Corporation Limited. * Copyright (C) 2014-2017 Lemote, Inc. @@ -51,7 +51,7 @@ /* Control Register Bit */ #define LS2X_CTR_EN BIT(7) /* 0: I2c frequency setting 1: Normal */ #define LS2X_CTR_IEN BIT(6) /* Enable i2c interrupt */ -#define LS2X_CTR_MST BIT(5) /* 0: Slave mode 1: Master mode */ +#define LS2X_CTR_MST BIT(5) /* 0: Target mode 1: Host mode */ #define CTR_FREQ_MASK GENMASK(7, 6) #define CTR_READY_MASK GENMASK(7, 5) @@ -251,7 +251,7 @@ static int ls2x_i2c_xfer_one(struct ls2x_i2c_priv *priv, return ret; } -static int ls2x_i2c_master_xfer(struct i2c_adapter *adap, +static int ls2x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { int ret; @@ -273,7 +273,7 @@ static unsigned int ls2x_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm ls2x_i2c_algo = { - .master_xfer = ls2x_i2c_master_xfer, + .xfer = ls2x_i2c_xfer, .functionality = ls2x_i2c_func, }; From patchwork Fri Mar 22 13:25:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783359 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B1D2605AB for ; Fri, 22 Mar 2024 13:27:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114026; cv=none; b=cW6tHHOUtvstsfvJyyy8/gvzulKJQHzfAHEh/zWB8dBE5g5W2RGg+hp/gvNpkCb1Pws158a1Ojg3UUTSX+qGFUWSeIBEzT7wZsMOgkvR9Etm8DTfAtVOgSSIVLWGhRFQSc7le/GlVRqAMciKsBcovWJnU4G2cg6ygV1nIREn/rE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114026; c=relaxed/simple; bh=mdqtIYLI7ySB5WYgm0DkMef6gSKJXMJEWXd0lTDdv8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j5Je3Q3sdXqx+0NQF6SpW9cOzb7o3FjqxsVE8DR09Sqn6EISZMxuJ2EMTIr8vwWdr2VwMax1AUGUSMJc4IgycjoDjXabX1lEZdjtT49/O/bxx99syDfpdisVIGW10ZB2BOY0N/6xsKeEkZOFrhMdl11GODlRE6DONvk0CLy1kCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=KIJgdC3w; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="KIJgdC3w" 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=7UuWxIPnybw+fXmWOR+T6chr++eA07KTFJ+uAPsLliA=; b=KIJgdC 3wpJyX69tIEPo75mbwkhPyX3KJ7WdYUi+TlfounlBHSbtouIquSRDNpF/PgEgtEz 06CfZ07a5KllrIFS0bXI/SNzjHoyjeh3qj29hpyGLfni0n3GIIVzIlEwvtENF+Rl P7P5iwUenB7BB3I1Z1IHSrVAvsVTZFv8ygz8kvs9aHj/xz+GzrXlVluCROWiJoUJ rYxi5mDaLWNhs+ou5r5GAf5WvhyjmCLtRe1gO6g0BqRncN8Lhi/YcNN5cd7rXebt HYh2dcmFC1krakK6e/PnX0yvfNhK2vBQI0tuZVMrA870eYMjG84PIt4zQC5IHI9o GVTJQK/GSMTL66cA== Received: (qmail 3871095 invoked from network); 22 Mar 2024 14:26:48 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:48 +0100 X-UD-Smtp-Session: l3s3148p1@geygxj8U/pRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Tharun Kumar P , Kumaravel Thiagarajan , Microchip Linux Driver Support , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 33/64] i2c: mchp-pci1xxxx: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:26 +0100 Message-ID: <20240322132619.6389-34-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-mchp-pci1xxxx.c | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/i2c/busses/i2c-mchp-pci1xxxx.c b/drivers/i2c/busses/i2c-mchp-pci1xxxx.c index 5ef136c3ecb1..48fd69c87af7 100644 --- a/drivers/i2c/busses/i2c-mchp-pci1xxxx.c +++ b/drivers/i2c/busses/i2c-mchp-pci1xxxx.c @@ -414,13 +414,13 @@ static void pci1xxxx_i2c_set_clear_FW_ACK(struct pci1xxxx_i2c *i2c, bool set) writeb(regval, i2c->i2c_base + SMB_CORE_CTRL_REG_OFF); } -static void pci1xxxx_i2c_buffer_write(struct pci1xxxx_i2c *i2c, u8 slaveaddr, +static void pci1xxxx_i2c_buffer_write(struct pci1xxxx_i2c *i2c, u8 clientaddr, u8 transferlen, unsigned char *buf) { void __iomem *p = i2c->i2c_base + SMBUS_MST_BUF; - if (slaveaddr) - writeb(slaveaddr, p++); + if (clientaddr) + writeb(clientaddr, p++); if (buf) memcpy_toio(p, buf, transferlen); @@ -775,7 +775,7 @@ static void pci1xxxx_i2c_clear_flags(struct pci1xxxx_i2c *i2c) pci1xxxx_ack_high_level_intr(i2c, ALL_HIGH_LAYER_INTR); } -static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 slaveaddr, +static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 clientaddr, unsigned char *buf, u16 total_len) { void __iomem *p2 = i2c->i2c_base + SMB_CORE_COMPLETION_REG_OFF3; @@ -799,10 +799,10 @@ static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 slaveaddr, * The I2C transfer could be more than 128 bytes. Our Core is * capable of only sending 128 at a time. * As far as the I2C read is concerned, initailly send the - * read slave address along with the number of bytes to read in - * ReadCount. After sending the slave address the interrupt - * is generated. On seeing the ACK for the slave address, reverse the - * buffer direction and run the DMA to initiate Read from slave. + * read client address along with the number of bytes to read in + * ReadCount. After sending the client address the interrupt + * is generated. On seeing the ACK for the client address, reverse the + * buffer direction and run the DMA to initiate Read from client. */ for (count = 0; count < total_len; count += transferlen) { @@ -836,8 +836,8 @@ static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 slaveaddr, pci1xxxx_i2c_set_transfer_dir(i2c, I2C_DIRN_WRITE); pci1xxxx_i2c_send_start_stop(i2c, 1); - /* Write I2c buffer with just the slave addr. */ - pci1xxxx_i2c_buffer_write(i2c, slaveaddr, 0, NULL); + /* Write I2c buffer with just the client addr. */ + pci1xxxx_i2c_buffer_write(i2c, clientaddr, 0, NULL); /* Set the count. Readcount is the transfer bytes. */ pci1xxxx_i2c_set_count(i2c, 1, 1, transferlen); @@ -872,7 +872,7 @@ static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 slaveaddr, /* Read the completion reg to know the reason for DMA_TERM. */ regval = readb(p2); - /* Slave did not respond. */ + /* Client did not respond. */ if (regval & COMPLETION_MNAKX) { writeb(COMPLETION_MNAKX, p2); retval = -ETIMEDOUT; @@ -896,7 +896,7 @@ static int pci1xxxx_i2c_read(struct pci1xxxx_i2c *i2c, u8 slaveaddr, return retval; } -static int pci1xxxx_i2c_write(struct pci1xxxx_i2c *i2c, u8 slaveaddr, +static int pci1xxxx_i2c_write(struct pci1xxxx_i2c *i2c, u8 clientaddr, unsigned char *buf, u16 total_len) { void __iomem *p2 = i2c->i2c_base + SMB_CORE_COMPLETION_REG_OFF3; @@ -934,14 +934,14 @@ static int pci1xxxx_i2c_write(struct pci1xxxx_i2c *i2c, u8 slaveaddr, if (count == 0) { pci1xxxx_i2c_send_start_stop(i2c, 1); - /* -1 for the slave address. */ + /* -1 for the client address. */ transferlen = min_t(u16, SMBUS_BUF_MAX_SIZE - 1, remainingbytes); - pci1xxxx_i2c_buffer_write(i2c, slaveaddr, + pci1xxxx_i2c_buffer_write(i2c, clientaddr, transferlen, &buf[count]); /* * The actual number of bytes written on the I2C bus - * is including the slave address. + * is including the client address. */ actualwritelen = transferlen + 1; } else { @@ -993,13 +993,13 @@ static int pci1xxxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct pci1xxxx_i2c *i2c = i2c_get_adapdata(adap); - u8 slaveaddr; + u8 clientaddr; int retval; u32 i; i2c->i2c_xfer_in_progress = true; for (i = 0; i < num; i++) { - slaveaddr = i2c_8bit_addr_from_msg(&msgs[i]); + clientaddr = i2c_8bit_addr_from_msg(&msgs[i]); /* * Send the STOP bit if the transfer is the final one or @@ -1016,10 +1016,10 @@ static int pci1xxxx_i2c_xfer(struct i2c_adapter *adap, i2c->flags &= ~I2C_FLAGS_SMB_BLK_READ; if (msgs[i].flags & I2C_M_RD) - retval = pci1xxxx_i2c_read(i2c, slaveaddr, + retval = pci1xxxx_i2c_read(i2c, clientaddr, msgs[i].buf, msgs[i].len); else - retval = pci1xxxx_i2c_write(i2c, slaveaddr, + retval = pci1xxxx_i2c_write(i2c, clientaddr, msgs[i].buf, msgs[i].len); if (retval < 0) @@ -1048,7 +1048,7 @@ static u32 pci1xxxx_i2c_get_funcs(struct i2c_adapter *adap) } static const struct i2c_algorithm pci1xxxx_i2c_algo = { - .master_xfer = pci1xxxx_i2c_xfer, + .xfer = pci1xxxx_i2c_xfer, .functionality = pci1xxxx_i2c_get_funcs, }; From patchwork Fri Mar 22 13:25:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781941 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04EE460EF8 for ; Fri, 22 Mar 2024 13:27:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114027; cv=none; b=PyMe+M+C9wRRVEWJy1hQWg7NnB5pt6Rxxp2WpUC2olKtgdWc3Tu1o+vA0LI6hZXf+T7sx5OShrJldbPU9V9UgXjjSfqtKPB59fdPukicJiSTstw1AKFaZETWE309mp8of36IT0O3SF+b/bpfhqGlAf61g+eYrLsVpI2NImJyBhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114027; c=relaxed/simple; bh=w0h843T81O+CzW4YGtWlq/y3kUMxeT1ZLaogKPRPBYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sSMHKpAUVC5ZReMulyIgCSpgwGgQ/rbx8vodqKbPMR+RkBSNmEygRm+i6d5Q2qK8BE/jer3lfWAIwzxYvKXDgsWkizdM9XA2i9xvk1glJC41vJW1vuWJq7QbFZczCkMPgKDDz5qNEiBjreAN7iMDI9LXHeMjVH9yD1Y2MQoklZA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=mcEMV1/Q; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="mcEMV1/Q" 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=pVA6WDf6g9/z8AGBcr1q1z0H9ceUAD/J3z3hoNEhDL4=; b=mcEMV1 /QvfbwmXZCuOmcBG+YtKHi2v2j8xLgFoFDWW4naekAG8tUAkxvHcrotg5HgWkBcY 4uTnmOnfpIh+MKA+o7PntGhAAgbmbDm2dRb/xfMR+1uRuxLuIxnITDIzTg+cGnc8 zUyVxoW+hdIvP9rvwOI367bbUJBVF1DtOsHD7Y5muQwP1UjkEMaEfrJ6i0Rj5RE7 xIHk8/vg6+opmBWlEYwh1E4l7G4emXOkF+LyERCXOS2Gz4J1VSpuQeunbAZl8sHv s45c0A/pvpebeF8Wojg/454bxYah/qOVKzYn05E4nsUGGVLS8ANDSBpnyeh3OXzU xJ20u+1VaH0w4ykA== Received: (qmail 3871141 invoked from network); 22 Mar 2024 14:26:49 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:49 +0100 X-UD-Smtp-Session: l3s3148p1@CDeuxj8UBpVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Conor Dooley , Daire McNamara , Andi Shyti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 34/64] i2c: microchip-corei2c: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:27 +0100 Message-ID: <20240322132619.6389-35-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Conor Dooley --- drivers/i2c/busses/i2c-microchip-corei2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-microchip-corei2c.c b/drivers/i2c/busses/i2c-microchip-corei2c.c index 0b0a1c4d17ca..53a7a1bd535c 100644 --- a/drivers/i2c/busses/i2c-microchip-corei2c.c +++ b/drivers/i2c/busses/i2c-microchip-corei2c.c @@ -100,7 +100,7 @@ * @bus_clk_rate: current i2c bus clock rate * @isr_status: cached copy of local ISR status * @msg_len: number of bytes transferred in msg - * @addr: address of the current slave + * @addr: address of the current client */ struct mchp_corei2c_dev { void __iomem *base; @@ -359,7 +359,7 @@ static u32 mchp_corei2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm mchp_corei2c_algo = { - .master_xfer = mchp_corei2c_xfer, + .xfer = mchp_corei2c_xfer, .functionality = mchp_corei2c_func, }; From patchwork Fri Mar 22 13:25:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783358 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59F8E612FB for ; Fri, 22 Mar 2024 13:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114029; cv=none; b=F5NgecHdeCj/mS8FbOPuvS8IW9luqpFDdcCNpQOvrm3y43IZU7EJN4L8OpkIxSsvDLHVfnD9n/7Cpkgu6d2LhmTsFi89oppAUuSyhJeFBY9kzVeOO1QtiBBLbytIt7iQ2hoOdV84GZYixe5v8o77SDOzUzQdiWXSsPoFpKv7fjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114029; c=relaxed/simple; bh=Utw2r13APhGJGHRgleJw24zaHa7nQwrB1ATDLUDnkXQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SHtkk725WC4O25e6RsK2r4coPPwAEG9b0+bQZFFMS0DXjdGu1UEZI8dpLEMbI1zva7bWlZNFOw2ve3vGs7Hp8i2X3EM4sl/uSW/ZYZsUFm27d2e2TxO9ioBS2SCNztluJEeqil/F9GEF71SshSlDGMKCbmGXVu152iQdqDKM2uw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Ivy4xdl7; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Ivy4xdl7" 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=p70V7uufpI7lQfL99SKyvMzqYL4U7/6gT69ebNmbx34=; b=Ivy4xd l7vl8AflXMIp2nU8MBQ+KFx+gieGuMV6jrQHPOOyVef/7Fj7mdxdKJ/7La3Zckks 6Dz6NdUfQRN/QsYzFffOK813xU3QV184aVxnfYY68S+OCSg2aqZOfzNZyawj8Q78 tt1OUUmqtCYpcITNcas2T3xk0102w4wn2PXzjbH8ZerSNgyQDuL1AQWizmNTANEj cefoiCz0C7iy0J9IUpwITEgD5cJyqRMafW5R9tna/lNUWO3LhJsVEUGocYZnzlkx 434vgwuPDsL5Ax4l4I/A0Qiy6PfpWOZOcyL7l48tm85DGIx86+770MP5dXxyrqzg XTCqAVqnl6xJs9vw== Received: (qmail 3871173 invoked from network); 22 Mar 2024 14:26:50 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:50 +0100 X-UD-Smtp-Session: l3s3148p1@D5S7xj8UPLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Vadim Pasternak , Michael Shych , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 35/64] i2c: mlxcpld: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:28 +0100 Message-ID: <20240322132619.6389-36-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-mlxcpld.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c index 099291a0411d..786d4c51f65a 100644 --- a/drivers/i2c/busses/i2c-mlxcpld.c +++ b/drivers/i2c/busses/i2c-mlxcpld.c @@ -197,8 +197,8 @@ static int mlxcpld_i2c_check_status(struct mlxcpld_i2c_priv *priv, int *status) if (val & MLXCPLD_LPCI2C_TRANS_END) { if (val & MLXCPLD_LPCI2C_STATUS_NACK) /* - * The slave is unable to accept the data. No such - * slave, command not understood, or unable to accept + * The client is unable to accept the data. No such + * client, command not understood, or unable to accept * any more data. */ *status = MLXCPLD_LPCI2C_NACK_IND; @@ -280,7 +280,7 @@ static int mlxcpld_i2c_wait_for_free(struct mlxcpld_i2c_priv *priv) } /* - * Wait for master transfer to complete. + * Wait for host transfer to complete. * It puts current process to sleep until we get interrupt or timeout expires. * Returns the number of transferred or read bytes or error (<0). */ @@ -315,7 +315,7 @@ static int mlxcpld_i2c_wait_for_tc(struct mlxcpld_i2c_priv *priv) /* * Actual read data len will be always the same as * requested len. 0xff (line pull-up) will be returned - * if slave has no data to return. Thus don't read + * if client has no data to return. Thus don't read * MLXCPLD_LPCI2C_NUM_DAT_REG reg from CPLD. Only in case of * SMBus block read transaction data len can be different, * check this case. @@ -375,7 +375,7 @@ static void mlxcpld_i2c_xfer_msg(struct mlxcpld_i2c_priv *priv) } /* - * Set target slave address with command for master transfer. + * Set client address with command for host transfer. * It should be latest executed function before CPLD transaction. */ cmd = (priv->xfer.msg[0].addr << 1) | priv->xfer.cmd; @@ -449,7 +449,7 @@ static u32 mlxcpld_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm mlxcpld_i2c_algo = { - .master_xfer = mlxcpld_i2c_xfer, + .xfer = mlxcpld_i2c_xfer, .functionality = mlxcpld_i2c_func }; From patchwork Fri Mar 22 13:25:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781940 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C1A161671 for ; Fri, 22 Mar 2024 13:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114029; cv=none; b=ejed5+DUKaZrr3x/INB6JC272ZNeza7Ln1rkyHp2p2g5WKx8dP3A3xI0oxbdnUb0zISg45MEWPgG/dKK2FZrzqd+DV3vxJ4VEuH3GwR+WJkRCoyTlj8Mnwc+3ajpCsV9wrocjSRT0+ex+xKGudPWM2LTnWwKsLbhjsWfZUyGtBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114029; c=relaxed/simple; bh=PaE14FgF8utjw+iOuMQaOI1ODl2G/f5apZi+i46cVdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rGcrmdwF8tWtZAjjtz4VznrVz8mCPw5H/fJIJzOAsUMZrkcgDpihypwaeM45V+wMdCrZ744DoXTQFk874XF1i5RQzbHoXZxNWZK07CKsQ6L7h06vD3HspQVHZ4fqm4KJvl24wyNO12r5K3e9dlUTA4slgXve6jBflMa2qipJnw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=FgprhwLl; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="FgprhwLl" 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=1r2o49i7iw+BKKFei4mEIEQYijZQXuvYnywkJfqsTjQ=; b=Fgprhw Llnp5iR3M6IPiI56wO8nJCI7jZd/zEbWlbLTVXlQRy+gGmcLyYL+fNvI/TinEqsv M5ZWaf2y8ehQ8skw+bJFc0sPlXZOQW2JNNJBSRCBZTDKb/mxj0c/7TSdFEULFfa+ fGcZP1emXrPg4GRIhwYZ9ku4mjpVfi+EacxIc6wpQaCEs5hLSnLILkmowsTCVsoz mk5htHbmdauGJp43DeRm3yfvyBzWbt8wzSo7IUR6WWSUGMYOzQ6UHB/yd0eT0cqf 3qhIETDK7LVEAKSN7dCrRelO4AnpnerlxuYfqEQmAnOFu3NDsEOGdvDk/c0b/HDq WkEuPqtaykzHvvaw== Received: (qmail 3871212 invoked from network); 22 Mar 2024 14:26:51 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:51 +0100 X-UD-Smtp-Session: l3s3148p1@OKTIxj8USLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Chris Packham , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 36/64] i2c: mpc: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:29 +0100 Message-ID: <20240322132619.6389-37-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-mpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 8d73c0f405ed..135889fdb43e 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -115,7 +115,7 @@ static inline void writeccr(struct mpc_i2c *i2c, u32 x) writeb(x, i2c->base + MPC_I2C_CR); } -/* Sometimes 9th clock pulse isn't generated, and slave doesn't release +/* Sometimes 9th clock pulse isn't generated, and client doesn't release * the bus, because it wants to send ACK. * Following sequence of enabling/disabling and sending start/stop generates * the 9 pulses, each with a START then ending with STOP, so it's all OK. @@ -762,7 +762,7 @@ static int fsl_i2c_bus_recovery(struct i2c_adapter *adap) } static const struct i2c_algorithm mpc_algo = { - .master_xfer = mpc_xfer, + .xfer = mpc_xfer, .functionality = mpc_functionality, }; From patchwork Fri Mar 22 13:25:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783357 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D6946169F for ; Fri, 22 Mar 2024 13:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114031; cv=none; b=K2gGaP2B92ZQVPiBrL97pThYPvwavMWA4KinZ+L34rcvIZO+1PaLnaKNYP3pVIKf60LAKbQObViGExkfYw5aJFcpocN/JY0bJGO6zghE0a6EHIOqE97JYn+LWOGP1G58pOtVHIrurdFVDsoZjJ+/92K8Lku2cXD7QRHY2XjuA60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114031; c=relaxed/simple; bh=d93/wLGnI5/n0fe59/25C/Z1j+ZGzmWXJC4x/8Nz3Pc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GLZ9I63HrzNqnO8S5vMS18T/EyQAopAydhXbFeJeE/sG47whdgfidbnEq9F0XP/SRGhFdrRGAMbyFTXxC6FDKgdCCpZdnqqASkrb9Z+WzHZQI8PP0zZEn+FNAhEbJdw/U5MDtb10YkDqvVwTEBCzb3FOrE5gg+Y8t4IOrdxxClU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=JCMAymug; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="JCMAymug" 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=IJHYhfVob2IIWsQ5AQJ5s3UyVYL/b57GkPzyj7v/jBg=; b=JCMAym uga3ra3pl3AOnmrwJi+DoCpjdViinewm+Jrkxp2tUUg5+4qvjHsMoVJDnMYzdOdP Rc9GL2yFF8CmeEY+oX5O+hrHfZnckry2xlToCZuJ6LGvjDwBU5cOzQyv2kkXRdmv JS8OVBwmZTDS9PqcEF99N57dVzwLQNXwvDxMeuCmtqBC9eaMDIlFM+YAyZRwLtLq t5+4ttz9MxH3DOPGqSiIR+S1pd7/p7+DiPO2hygssgv3ZBw4OYt9TxJe4g1/TBn9 FJlquben0fO4ZN1YD/GYRLqXAxwBY63oNrCbfL+VHWLFG49I55JAP1XwVl3IJqVx x3fhs7hLAXxyq6IA== Received: (qmail 3871264 invoked from network); 22 Mar 2024 14:26:51 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:51 +0100 X-UD-Smtp-Session: l3s3148p1@y13Wxj8UVLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Stefan Roese , Andi Shyti , Matthias Brugger , AngeloGioacchino Del Regno , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH 37/64] i2c: mt7621: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:30 +0100 Message-ID: <20240322132619.6389-38-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-mt7621.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c index 81d46169bc1f..c567a2cf4a90 100644 --- a/drivers/i2c/busses/i2c-mt7621.c +++ b/drivers/i2c/busses/i2c-mt7621.c @@ -117,26 +117,26 @@ static int mtk_i2c_check_ack(struct mtk_i2c *i2c, u32 expected) return ((ack & ack_expected) == ack_expected) ? 0 : -ENXIO; } -static int mtk_i2c_master_start(struct mtk_i2c *i2c) +static int mtk_i2c_host_start(struct mtk_i2c *i2c) { iowrite32(SM0CTL1_START | SM0CTL1_TRI, i2c->base + REG_SM0CTL1_REG); return mtk_i2c_wait_idle(i2c); } -static int mtk_i2c_master_stop(struct mtk_i2c *i2c) +static int mtk_i2c_host_stop(struct mtk_i2c *i2c) { iowrite32(SM0CTL1_STOP | SM0CTL1_TRI, i2c->base + REG_SM0CTL1_REG); return mtk_i2c_wait_idle(i2c); } -static int mtk_i2c_master_cmd(struct mtk_i2c *i2c, u32 cmd, int page_len) +static int mtk_i2c_host_cmd(struct mtk_i2c *i2c, u32 cmd, int page_len) { iowrite32(cmd | SM0CTL1_TRI | SM0CTL1_PGLEN(page_len), i2c->base + REG_SM0CTL1_REG); return mtk_i2c_wait_idle(i2c); } -static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct mtk_i2c *i2c; @@ -157,7 +157,7 @@ static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, goto err_timeout; /* start sequence */ - ret = mtk_i2c_master_start(i2c); + ret = mtk_i2c_host_start(i2c); if (ret) goto err_timeout; @@ -169,14 +169,14 @@ static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, if (pmsg->flags & I2C_M_RD) addr |= 1; iowrite32(addr, i2c->base + REG_SM0D0_REG); - ret = mtk_i2c_master_cmd(i2c, SM0CTL1_WRITE, 2); + ret = mtk_i2c_host_cmd(i2c, SM0CTL1_WRITE, 2); if (ret) goto err_timeout; } else { /* 7 bits address */ addr = i2c_8bit_addr_from_msg(pmsg); iowrite32(addr, i2c->base + REG_SM0D0_REG); - ret = mtk_i2c_master_cmd(i2c, SM0CTL1_WRITE, 1); + ret = mtk_i2c_host_cmd(i2c, SM0CTL1_WRITE, 1); if (ret) goto err_timeout; } @@ -202,7 +202,7 @@ static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, cmd = SM0CTL1_WRITE; } - ret = mtk_i2c_master_cmd(i2c, cmd, page_len); + ret = mtk_i2c_host_cmd(i2c, cmd, page_len); if (ret) goto err_timeout; @@ -222,7 +222,7 @@ static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, } } - ret = mtk_i2c_master_stop(i2c); + ret = mtk_i2c_host_stop(i2c); if (ret) goto err_timeout; @@ -230,7 +230,7 @@ static int mtk_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, return i; err_ack: - ret = mtk_i2c_master_stop(i2c); + ret = mtk_i2c_host_stop(i2c); if (ret) goto err_timeout; return -ENXIO; @@ -247,7 +247,7 @@ static u32 mtk_i2c_func(struct i2c_adapter *a) } static const struct i2c_algorithm mtk_i2c_algo = { - .master_xfer = mtk_i2c_master_xfer, + .xfer = mtk_i2c_xfer, .functionality = mtk_i2c_func, }; From patchwork Fri Mar 22 13:25:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781939 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B94C62160 for ; Fri, 22 Mar 2024 13:27:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114032; cv=none; b=kbb8s0ooKI94HflmoX/4OiyBAiOm4owpKKkkk9YDj++ay8mQqr1Zc8NusS6ZDP9zEMi1VyOFM7Qua3JmK4NqMLlD3tCcEoAhjGXGfZtnnekHl70VGR8QZWK8O1DzOuHa/GE4CYnLaUWhqkPgTb9hAKu1rMK4T1/SiAEHtQw7gVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114032; c=relaxed/simple; bh=FYnBTFpKVQeWLm0SBhcUe8AAmDxIAkTBFh0KEqCtkgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YlHDzfz3StB0AKLx0CChDi0xAhGWfU/agYEhqIlP2sn/nSLjeia/caHtHlrlS1rHdBwzA+nNOPl5YfLvc997yFT6UNGQif6dyFFxkJShPy/UAOI5F5h9MMC1uJYtT8KLlSYhWz2ju6I5AA0JKZfmByaicj5TQRHzMXohka9oDGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=e/SN81VT; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="e/SN81VT" 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=yAE6JmthRrlChk2Hy2WlGkeEMuMtkH5UUitAAJeFiNw=; b=e/SN81 VT4ZooC20O7AFo7XIzW3sE6T/Z7TlVwP8fwf7bYvfX0Xbdpg85d7f94AeWX649P5 nxA+hzSd6QZFLBRyT4KcSy6/MPWaq5pE5ZXh/shtLku4C/JtGpbqfXzNhQqWclgZ j//Lm1KhmIe8drTLOog1b8uXhVppdsh0Qgg10Pad20v5kWC48Zss51baUk3CWdng 7/sohoDbJhrVhrdDY0c+kSnRvf+Jj6DMw1V7IaJR61PmrhDNdK+tubgs78nX4sLp Zr7n/fmFBUMJ1JZ5bUSGZOrTgHGQMbF9RZv4anjWYdOvizN19nrDz3GF1jVRlR8Z yRRBtUJVSKlH+Fcw== Received: (qmail 3871294 invoked from network); 22 Mar 2024 14:26:52 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:52 +0100 X-UD-Smtp-Session: l3s3148p1@Hc7ixj8UYrBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Gregory CLEMENT , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 38/64] i2c: mv64xxx: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:31 +0100 Message-ID: <20240322132619.6389-39-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-mv64xxx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index dc160cbc3155..0814f5bc8362 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -89,8 +89,8 @@ enum { MV64XXX_I2C_STATE_WAITING_FOR_RESTART, MV64XXX_I2C_STATE_WAITING_FOR_ADDR_1_ACK, MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK, - MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK, - MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA, + MV64XXX_I2C_STATE_WAITING_FOR_CLIENT_ACK, + MV64XXX_I2C_STATE_WAITING_FOR_CLIENT_DATA, }; /* Driver actions */ @@ -279,7 +279,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) } else { drv_data->action = MV64XXX_I2C_ACTION_SEND_DATA; drv_data->state = - MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK; + MV64XXX_I2C_STATE_WAITING_FOR_CLIENT_ACK; drv_data->bytes_left--; } break; @@ -307,7 +307,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA; drv_data->bytes_left--; } - drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA; + drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_CLIENT_DATA; if ((drv_data->bytes_left == 1) || drv_data->aborting) drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_ACK; @@ -797,8 +797,8 @@ static int mv64xxx_i2c_xfer_atomic(struct i2c_adapter *adap, } static const struct i2c_algorithm mv64xxx_i2c_algo = { - .master_xfer = mv64xxx_i2c_xfer, - .master_xfer_atomic = mv64xxx_i2c_xfer_atomic, + .xfer = mv64xxx_i2c_xfer, + .xfer_atomic = mv64xxx_i2c_xfer_atomic, .functionality = mv64xxx_i2c_functionality, }; From patchwork Fri Mar 22 13:25:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783356 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28C8A626B2 for ; Fri, 22 Mar 2024 13:27:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114033; cv=none; b=enIUheWHHJe1dLfwmxx5p7AjoKLNMTzOuvw2/xjFkOM6I0tTkrLLOD24RFL49lpH1+I+ugg52ochaOCae1BMXhoRdYC+T+pT7l5ZJQyM9Fo9i9LLgTKhS9kXEb6V6k0dVyM2tWTEkGKTgi7U7+KH/vW1Hoh9K1H4EiMh0zpOcuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114033; c=relaxed/simple; bh=+RS+UhS6WUjSbCY0xfU+zM9YHKbLEi8gdstYXT6GhQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g8zQwJPlgI/kkJ6UjRZlIR39y16BDjG0LrQZmoGtHzvHmechWhzDtAuJ0aTTSEgS8sFxuxcEcklFozn8ibFkPocm8Tfu/HrbwpsMOoxqRiLXv3ZnBGWrkYvM8JGBrDvo3QHVrxQ8TzHW9EQBt5KpdGOVKw++PEMlTob6glzVFr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=OQ0uH+2W; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="OQ0uH+2W" 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=udgUjkpefuQ9OwJPC3EPycZIK/sxdg4g3sqFLxJebvM=; b=OQ0uH+ 2WnKS8IffATf4BWVHvcEa2AgwrtH8px3F2SELW7HV4ZsdRcKoa0yhp6qk7t5rImU sJLJzbas/WdMD1al3K66D/hCW59ZRbfq4oaGUKVBa1iuU7+UZOalN5aWDdPQaFQb QABMkiX2uzowp9UEe9e7iMDBrakyuSm/HwYhIeH29iAutn8VH0XdvwIgMDqqGmWy hh7smvMWSQrdsRL3ON8auBlSBSZI6GInGpoARaXe9LQyhtrKqF6+ymZ5HC3jXeXG jRjSmo2Tr1+O+LOFV2c5BlWgvvqZK88fyBpkWY5QzmrKswW353WRx4bG3LEfbHrf YTkOfrJvSrAoacbA== Received: (qmail 3871338 invoked from network); 22 Mar 2024 14:26:53 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:53 +0100 X-UD-Smtp-Session: l3s3148p1@Wvvvxj8UarBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Robert Richter , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 39/64] i2c: octeon-core: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:32 +0100 Message-ID: <20240322132619.6389-40-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-octeon-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c index 845eda70b8ca..a0e6c9a43168 100644 --- a/drivers/i2c/busses/i2c-octeon-core.c +++ b/drivers/i2c/busses/i2c-octeon-core.c @@ -215,14 +215,14 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read) case STAT_LOST_ARB_B0: return -EAGAIN; - /* Being addressed as slave, should back off & listen */ + /* Being addressed as target, should back off & listen */ case STAT_SLAVE_60: case STAT_SLAVE_70: case STAT_GENDATA_ACK: case STAT_GENDATA_NAK: return -EOPNOTSUPP; - /* Core busy as slave */ + /* Core busy as target */ case STAT_SLAVE_80: case STAT_SLAVE_88: case STAT_SLAVE_A0: @@ -595,7 +595,7 @@ static int octeon_i2c_hlc_comp_write(struct octeon_i2c *i2c, struct i2c_msg *msg } /** - * octeon_i2c_xfer - The driver's master_xfer function + * octeon_i2c_xfer - The driver's xfer function * @adap: Pointer to the i2c_adapter structure * @msgs: Pointer to the messages to be processed * @num: Length of the MSGS array 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: 781938 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9773627E2 for ; Fri, 22 Mar 2024 13:27:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114033; cv=none; b=U8dU7m+g7AQ09lAD3EVCP19OIxXRbWch+7eGru09JN2xZP9WRuJR5UmLFsSRmbimdg2K9DB125xDdpcQrSc2Dhstm7qcF4gd9KpugLD72k1rmkFUgStdfzl9EwyAWv0q5HC2I00WUZyQiDICH/ENdM9fJOlgOdUgHJHB7Ez977I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114033; c=relaxed/simple; bh=sAo9kbPJRiEtE7HLaqvTjdIVANrbDgOoZYHJpbnhpMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlg/PGlU1fZnC5U58sCLSlBEf2hIbKrfnVsMR9/pcPsS0Hehuv/SJGIBdqUWoxsJnY695ddRdFqUyAPqeIZ4QmMLsF4x0DVb68Oz7ZTJgOLe2ArACPVl6QUYqhC0wFtLhzPGJzArced7qpcH9Q8yFxSL0XiiELRgqE8vX98j1F4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=fDvcCs/o; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="fDvcCs/o" 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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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, }; From patchwork Fri Mar 22 13:25:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783355 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E761562807 for ; Fri, 22 Mar 2024 13:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114034; cv=none; b=IN8AIW2axnTds4YTSudA+06uZj6WZI2M7j9A+hoWzdRoc/VSidHnb/cLLg0u+8UlGC3vBGlaf95Ac907TLSbKNUoJN6OCVnmABi5yHfU2/uWjL8d5TJKmM4sOqbEdV1qPLJ3Mh01DfkHScYt3oUQXJeGmoPTItOqmmc1fliso1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114034; c=relaxed/simple; bh=4jU5UrYVuKboOqguTAQNiprTpycabJ/ha8XLQxZAE+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gQbY8btWn8M1mH8uxNee8/4Xit58bxFmJJVDdz+OVI+ilg71v5UohWcVjglJdGl4Ca2g8bWkhglVLoBGHDqjLzI50k0q7xfn+Jzv0tiBHgXCQbDI5tTewesq/WKHULGIA4rbi50rm4jvgnQ0zxtazfS6VtfkHWD+gAzy6Y3oXXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Xo4CUIDO; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Xo4CUIDO" 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=jtQWgUHLJBsBn4k0hPCfptVF721mjEvpbVebl9Y7Pm4=; b=Xo4CUI DO/VElG0PJ52AZRRwzu5LRWgKWRmpxFP5+3SXwccn2imURSgyH5j/tU0sIcPlFtT 9Dl0ea5R7ailNpRYciMmqGWRTfvH8b2uLEZz6xgGyh7Y8m21cGp2QrRui1YF21XH yPpGIO6bs4bLeTr38ULKTylbR/ezyWIfl78sraHAzm73kXBF+tOjq73KMGIimX1P zRQBOewsfliIYYrEsF+PVBdkuDCjIvYUNfzkmwkfjhsqPVPKV2rXXk4PmP3dmnWN atUWGxwyqegBt/XYanPBIgEcmriwMg5xIHMeN1PrI4J2zsecVakgjvwZ7/60SuPI sCeEwLH6pgvvj2DA== Received: (qmail 3871408 invoked from network); 22 Mar 2024 14:26:55 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:55 +0100 X-UD-Smtp-Session: l3s3148p1@uVQJxz8UerBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 41/64] i2c: piix4: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:34 +0100 Message-ID: <20240322132619.6389-42-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-piix4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 6a0392172b2f..1f6223b88146 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -589,7 +589,7 @@ static int piix4_transaction(struct i2c_adapter *piix4_adapter) result = -EIO; dev_dbg(&piix4_adapter->dev, "Bus collision! SMBus may be " "locked until next hard reset. (sorry!)\n"); - /* Clock stops and slave is stuck in mid-transmission */ + /* Clock stops and client is stuck in mid-transmission */ } if (temp & 0x04) { From patchwork Fri Mar 22 13:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781937 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B91B562A08 for ; Fri, 22 Mar 2024 13:27:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114036; cv=none; b=ksHwtTQvnhXLGfd5p7M5v3TUAQWs6MhLl/fqwyTsxH39m6/Rv7Ln3gLDDpEh+u0Tc5xiCf58/5808oChms693dmbZVfaWr/496RJ4tEuXppNL3hOr3SxtoUWgwbhikHG4slUFuxsnOSK8pubNMfWdWOtgB8HeWiQAf6kXQXOdM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114036; c=relaxed/simple; bh=DeTqKdsiejBH+wRIa/M4NTukOGyfLyvqMN1tQylxrUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FuUEuB9Y/DMG/FvXjXPnvzoX9p2H1zGJlk5cQcg+RKZx/F8UdsPHAikeZ2L5hIDe2XMopFzYhBbXWDLmHVrtpMsRIKQlObb3ztKWK1QFwwHe2buaPDuP8iTTP+NjfVbUTttHgvVxRha0sUs5xm7O9YgtVYskMGdq3+yHWTTK9e8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=j5w+mNFM; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="j5w+mNFM" 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=va8vNqc+zL5cgGG+Iw+afAtq26+B226YZpwpqFLNgOs=; b=j5w+mN FMDRK5YOf4guug8Ig9fZ1bSeTpXeJ7j/XXuEg4MIWvaY8dsq7cphzqVA5u1hhRdy 9UQBj0LmMlscXjO0aGOU5eADSLZtwkU732kzjJ2rYmq5YsrL1XEnRLHizTepZNHi tNG6MFnCt50+MqHjI2tnI/Dfn3e0YytD8xEAY7ql1nJek5o+/7Y/f6ycDlCIYHrm 7jGqGWkaITt6mHoKGz03HL0E2vzYq9IuxAjMvM774UoAC4UD2XqLwsFu16ZU8IBN 5jXz/kDrygaz2ow2iqPhuWWQr0NerJLpOq1N2FJ9Cofsj4fxDdvJU31rArK7xWdX RtkV/+rHc99cBZSQ== Received: (qmail 3871489 invoked from network); 22 Mar 2024 14:26:56 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:56 +0100 X-UD-Smtp-Session: l3s3148p1@NvkVxz8UgrBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 42/64] i2c: powermac: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:35 +0100 Message-ID: <20240322132619.6389-43-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-powermac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 8e57ebe595be..03abc5f3cb9e 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -25,7 +25,7 @@ MODULE_LICENSE("GPL"); /* * SMBUS-type transfer entrypoint */ -static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, +static s32 i2c_powermac_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, @@ -127,11 +127,11 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, } /* - * Generic i2c master transfer entrypoint. This driver only support single + * Generic i2c transfer entrypoint. This driver only supports single * messages (for "lame i2c" transfers). Anything else should use the smbus * entry point */ -static int i2c_powermac_master_xfer( struct i2c_adapter *adap, +static int i2c_powermac_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { @@ -180,7 +180,7 @@ static u32 i2c_powermac_func(struct i2c_adapter * adapter) /* For now, we only handle smbus */ static const struct i2c_algorithm i2c_powermac_algorithm = { .smbus_xfer = i2c_powermac_smbus_xfer, - .master_xfer = i2c_powermac_master_xfer, + .xfer = i2c_powermac_xfer, .functionality = i2c_powermac_func, }; From patchwork Fri Mar 22 13:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781936 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D210B627FB for ; Fri, 22 Mar 2024 13:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114038; cv=none; b=RHz9UaJLlvMhIoQeuHPZg1uIl5v1scb8kNW3xUgVTzzmMwXt56ULV2N7hvHiWFi+q+nZM8qRx6zPVpEqZTe6ZCiMzuYFzP9AQC3NctOvUV0BkOQi0TQpIcEOIDfV+tOM/SVkCKisbsySe9rzxc9E9GfSp0lLhWgikqY56BKV39I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114038; c=relaxed/simple; bh=sEAELQLoQ2hS4arLKa+DxKB9SNqWtO4/+EZW54gUmF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C1PYelWBn589fx9GQIIEQ0GM+2u+NFMxWQ9GxOEk7NnfDAeBEo9k8Cv2qWIpsMwaucsWrJMozT3uYr/1MNkMgysFMFm8K/hoj0FZn9mpL3jAe8zhBsq5nZcCt1I164u3DgDMfuTN8ZyqrTeqCjyuZC7jCX79vm2UFZqU5T2v/bw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=HjUJjr4Q; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="HjUJjr4Q" 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=PPIIXUWR6FyUlW8Np95mNAvjfB9Snsx3N+J9VU7GsLo=; b=HjUJjr 4QmT6Q3K+DxUF+o40VvmZXna6ZaDyN7WH6JFnyPFMc01i4iDZgj6sfiUQOq7qvpo SJCnfdUEhiYOicHs6FeETZQkUjjvZDMjXWLLrif5O0nXGca/SVfM+GB2uffK6mSe MwiCICPkChXUVB3kodi0nm4UD/WPR07UDgA0zCmZSIqyb5YYpzj3WJHh3MvpI3RL TEQ5/T8IsaTPXXjq3vIH68Pdzl7xiECgnMippjtdsKZVTIprgqisK0RjOchEPF2U nU2EqvFr+p/Nq3xY3TchM2KcHPWJjdJcdF6lS51CCePFL9hYIKOkPbHgG65Qy1/Z acMaBsMpnI7IZCMA== Received: (qmail 3871541 invoked from network); 22 Mar 2024 14:26:56 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:56 +0100 X-UD-Smtp-Session: l3s3148p1@UTIixz8UhrBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 43/64] i2c: pxa-pci: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:36 +0100 Message-ID: <20240322132619.6389-44-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-pxa-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c index 08b3229c443d..6b3c6a733368 100644 --- a/drivers/i2c/busses/i2c-pxa-pci.c +++ b/drivers/i2c/busses/i2c-pxa-pci.c @@ -4,7 +4,7 @@ * Author: Sebastian Andrzej Siewior * * The CE4100's I2C device is more or less the same one as found on PXA. - * It does not support slave mode, the register slightly moved. This PCI + * It does not support target mode, the register slightly moved. This PCI * device provides three bars, every contains a single I2C controller. */ #include From patchwork Fri Mar 22 13:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783354 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 872B9481A5 for ; Fri, 22 Mar 2024 13:27:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114037; cv=none; b=DevGCjO8RKjT/z/txgq5yunxUrn06tezqCNIsHkTq7M4RktU3l9NwmGXVlcQruS5rkXH0kdiKIqDnq+5GJ2rIiJTP7OMp2++oWtAib9aSQonmuuzJJe7+bumYk+uZWTGYL3ImCZCNtndAicVGkVVhnTG/1PjnPjvbyGQ8GmWU1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114037; c=relaxed/simple; bh=hrwddtOWhwwpqzStqurX6HURaRQDq+BjbBtzHhWU8Bk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VyWAjlo5kD+osW/puq6dX/0rGmjzzZmGVO5Ro5l34pSu/QgB2wVqjVinqr9G5CeDzPy15gp57mfNZo2as43948M+SAAuAdFxYGw/9h0KVLan6xjF75DbBii32DOeJwbaUpjm2WEI7RhvNpy33d2ZDGP1mdQLH7Wrc2iLac2r6ys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=gu6ckw/j; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="gu6ckw/j" 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=8yl6l8CkHfdh1vd7TC3m/0eTvcj1wzr11O3P2GhLYlk=; b=gu6ckw /j1sujDiqodFSTHjDoqOUHGPeCyL4rRf6TDUR15YE8Bx+n60+uvG/bVjzECbXKw3 HgSWA7Rag2IveYUbgNN4x1hMtqMNfORBMSVXV+QwRjL9cmxhc8ARL/wzRkHhOgYt QsmoiscxE/zj8O6Hubzg9eKU+IUH1Co3t8/QYlMo3kNWK/ylwB0bLBmoGE3tuiZP z1xfxVdkvYAVEFt8Ans04dp9aFSgTNtPNnoJGO989x6DvkKeHCoZhRDyPrEsDc7s 2zIg3bUAfdhrja5nm7Rebb8jKn9vmyx/tp+F0fmN/QNAR6qGct2bONNaSbnfS7qs d9I/d1ig8x+fj6rA== Received: (qmail 3871579 invoked from network); 22 Mar 2024 14:26:57 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:57 +0100 X-UD-Smtp-Session: l3s3148p1@a9wuxz8UkLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Bjorn Andersson , Konrad Dybcio , Andi Shyti , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 44/64] i2c: qup: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:37 +0100 Message-ID: <20240322132619.6389-45-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-qup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 598102d16677..2aeb5c33a711 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -380,7 +380,7 @@ static int qup_i2c_poll_state_mask(struct qup_i2c_dev *qup, u32 state; /* - * State transition takes 3 AHB clocks cycles + 3 I2C master clock + * State transition takes 3 AHB clocks cycles + 3 I2C host clock * cycles. So retry once after a 1uS delay. */ do { @@ -1607,12 +1607,12 @@ static u32 qup_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm qup_i2c_algo = { - .master_xfer = qup_i2c_xfer, + .xfer = qup_i2c_xfer, .functionality = qup_i2c_func, }; static const struct i2c_algorithm qup_i2c_algo_v2 = { - .master_xfer = qup_i2c_xfer_v2, + .xfer = qup_i2c_xfer_v2, .functionality = qup_i2c_func, }; From patchwork Fri Mar 22 13:25:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783353 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0755663103 for ; Fri, 22 Mar 2024 13:27:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114040; cv=none; b=Iq49LZjf2SbviLB9V0iSWFWxpS8O4UNs8P5JFh9ESMH0pwtM/6LeA7v6dDPwdd2GGxRHba14jyriBAzxC9wYtVVz4PfgtumswAc203bxJ97WB+XQ5NoTkcOkk+3A03hrtNDlzNcZNiwNeI9JlIbXEkx5a/SvFLh8xf1rMZdL268= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114040; c=relaxed/simple; bh=Z2Hc75yQ/GB7kDy0hCnplUfj/Lhtq/ZVfUNTGDEWA0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c4HAd5I8LDK28/2NbrsZxAFmgArGfk9yYouvTa9ENukCSRzWzjqKsBTQOxzkLsY0NIRnI/eFKycxhrX7Yxubj7GXKhrL9PGMJYtw8vRPEY0BJEBAmMXtvkvDgC9CctaMjOEu+o8WW4muhi042tEvxDynlgTkvuYmglZGlRKoq/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=G2hiM6Ye; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="G2hiM6Ye" 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=YFfxxcM7IZESAWxygyHRNhKxCiTmb92VHtczUKfIfeI=; b=G2hiM6 YehXH0uSM5XIHYFm7Xy7zSp8zjyQwmDvYLxHCtZYxwcqNjeGubqIp/7E7fHDhHb+ ot1cenyeZVBldWjgFHPtkAYmJms0uHAszgBXoTHdF2IjRbtvRoYTMbBKzmpm9Xgu vzxlMnVIzDS+CtsxEU/hWNM1D64cCanznLdGUYTe72P/yQ2ldBwyzHhgLZsVQL/+ pg/3Y4wSgfUri6P7m5TXhnbpS2WjXj+35oBw67+8t05D1bO3VVMq2CM28o5NXeQi M0ICcFOhWoWNLyVKOdncjiYTiFt0PyERC/0qZZJ209P1lIpg36zA66IdBUpRywCI o+iJKQQHsRwl7EmQ== Received: (qmail 3871631 invoked from network); 22 Mar 2024 14:26:58 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:58 +0100 X-UD-Smtp-Session: l3s3148p1@i0o8xz8UmLBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 45/64] i2c: rcar: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:38 +0100 Message-ID: <20240322132619.6389-46-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-rcar.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 828aa2ea0fe4..4be75fdc7187 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -883,7 +883,7 @@ static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv) 100, false, priv->rstc); } -static int rcar_i2c_master_xfer(struct i2c_adapter *adap, +static int rcar_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { @@ -944,7 +944,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, return ret; } -static int rcar_i2c_master_xfer_atomic(struct i2c_adapter *adap, +static int rcar_i2c_xfer_atomic(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { @@ -1003,7 +1003,7 @@ static int rcar_i2c_master_xfer_atomic(struct i2c_adapter *adap, return ret; } -static int rcar_reg_slave(struct i2c_client *slave) +static int rcar_reg_target(struct i2c_client *slave) { struct rcar_i2c_priv *priv = i2c_get_adapdata(slave->adapter); @@ -1025,7 +1025,7 @@ static int rcar_reg_slave(struct i2c_client *slave) return 0; } -static int rcar_unreg_slave(struct i2c_client *slave) +static int rcar_unreg_target(struct i2c_client *slave) { struct rcar_i2c_priv *priv = i2c_get_adapdata(slave->adapter); @@ -1066,11 +1066,11 @@ static u32 rcar_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm rcar_i2c_algo = { - .master_xfer = rcar_i2c_master_xfer, - .master_xfer_atomic = rcar_i2c_master_xfer_atomic, + .xfer = rcar_i2c_xfer, + .xfer_atomic = rcar_i2c_xfer_atomic, .functionality = rcar_i2c_func, - .reg_slave = rcar_reg_slave, - .unreg_slave = rcar_unreg_slave, + .reg_target = rcar_reg_target, + .unreg_target = rcar_unreg_target, }; static const struct i2c_adapter_quirks rcar_i2c_quirks = { From patchwork Fri Mar 22 13:25:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781935 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE5CC6311F for ; Fri, 22 Mar 2024 13:27:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114041; cv=none; b=uab5trKmvMQ1/YTvD2D+IbkXHNcZu8y5saf1quuY/Z4D691eZDECpNoYK3/rg8unJdHNrz9Wb5TXQVA1vlvunG2MbVnuoX2HSQrMNsPvU35Vm3HmTcZhjqmd0b66pe31EBCHNH9TW0jaY5Y7D4pQTI7S1RKHgaqSXhpE8fzzGz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114041; c=relaxed/simple; bh=DlphXw+PfNwwdHim1IX+oCGQAydGlsH9nRSJ1RNWhdI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lpKBwmLFcIMS2E2x9Py883SoOf/nfulurg+aQ+SioU3C4QgfWPsfWNphB4Tz3/+r1dpmPf45xKMMD/NsxJTIymKvESUPv3ddU4ISFEUFp4e6odX85jqb5G6oqFf7FOjx92y7uu8N/XwQ6rfgg/XzWqvNefiEfgNunnEMwC5a+zY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Xppii2Pj; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Xppii2Pj" 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=9k0vNAOFbxWmwwP3EGdtCr1xKoYDgECbQng1/UH7/wo=; b=Xppii2 PjOww9HnQK208URk5exVXFAAJ7w6iu7c+tZt7hkzr0wVle2Olx0zTHPx6ALn1/Ml o6724hiZGCL45ph01FOubplwHMe48WIip001udORfrSPnPu2o4gOMPe/8eGkZ6N/ RWpoXcJh+1VMCLh5oGSExGWE5r1RUPKImbipVfeBWqhtq2uRTi0mttR/wWGqh8o5 KY90rhOCrtqHolZYaC0Ky7pvqx51yEiQ/triTl4C62BudoX6hrAVQ+WJZupmUAuU Ul/uSgd3hbaIZbXNnaDh8JbWU7ILC+/HID5ofn2JCPvUWJnO1XHujIW/w1CVxJ/t HgTtDthHseqvSjXQ== Received: (qmail 3871677 invoked from network); 22 Mar 2024 14:26:59 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:59 +0100 X-UD-Smtp-Session: l3s3148p1@FohIxz8UnrBehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Chris Brandt , Andi Shyti , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 46/64] i2c: riic: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:39 +0100 Message-ID: <20240322132619.6389-47-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-riic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-riic.c b/drivers/i2c/busses/i2c-riic.c index e43ff483c56e..685a65153fa8 100644 --- a/drivers/i2c/busses/i2c-riic.c +++ b/drivers/i2c/busses/i2c-riic.c @@ -12,9 +12,9 @@ * * 1) The main xfer routine kicks off a transmission by putting the start bit * (or repeated start) on the bus and enabling the transmit interrupt (TIE) - * since we need to send the slave address + RW bit in every case. + * since we need to send the client address + RW bit in every case. * - * 2) TIE sends slave address + RW bit and selects how to continue. + * 2) TIE sends client address + RW bit and selects how to continue. * * 3a) Write case: We keep utilizing TIE as long as we have data to send. If we * are done, we switch over to the transmission done interrupt (TEIE) and mark @@ -276,7 +276,7 @@ static u32 riic_func(struct i2c_adapter *adap) } static const struct i2c_algorithm riic_algo = { - .master_xfer = riic_xfer, + .xfer = riic_xfer, .functionality = riic_func, }; From patchwork Fri Mar 22 13:25:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783352 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A7C96312C for ; Fri, 22 Mar 2024 13:27:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114041; cv=none; b=eX6liWHJdAyTbWBTK/pN/Izmap/PmX7ScGlw2GPeg+T/IXWCGhAzw4ZJeLjcBQ2oYzj946wslB/aXUoWbxTj3d4E8wTGXsGxs40aDHXKs5aeFwsYpJc4aa2VgwxFsD+OjECrF2a25PDX3elsLFik5wuURpd5GdiXTttXrmnbl1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114041; c=relaxed/simple; bh=fdHLsR9DB1wn8D9bwxN/WM7+gQ8o/IS36gtdobO3PDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QyHUpdjt0sh5zImlbGMtHikLanZkYOik/EzlxxkP/jbnOmkGD+eOnMpg9SnnACyyRoBpD7vICy+tT2lxpgGxHiQ+h2zHGVp4Ci1JiG8a15jXH5i7J7ezrx1CR0iVeG0OWx9eYtED2fcsUw58/x1HdodlUnRPY/2drTrfh4DAqrU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=EHt8A5K4; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="EHt8A5K4" 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=+hOidMzQoPW9FHhIvSwRON+Z3xIeGflbT7fmNTj31kw=; b=EHt8A5 K4PaG12m12qc8DQFQX600kMWpr/bc6hl5B4LVHXRSeCg2rWPiwMWLAC0h4f7wZp0 aC4CFWfOgRoORdJOTuDgGHrOnGMYvL2eufHzKH2SYPdfq3z00V8fL079lgA6LpjF OgOjYGlU1GkHjoRg/ZfW6S07owCZf09PC4WIkOLC0MrERZNdwBKvIyAwMXHhAZ6l r/k3cA26FwfwPbnOsSYTQXq+tIhbd9UAnjzi2ii3TxB6ILfl1Sqc+E0BiZ7FmkR9 kAEXsRsWPCm/6HKJD6OvTd2eyHy0MFTRyzdJpf+ok0y+JmfT3STzNePa5g7WZGP8 XlbsQAa86GIjBu9g== Received: (qmail 3871717 invoked from network); 22 Mar 2024 14:27:00 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:00 +0100 X-UD-Smtp-Session: l3s3148p1@7yFVxz8UCJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Heiko Stuebner , Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 47/64] i2c: rk3x: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:40 +0100 Message-ID: <20240322132619.6389-48-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-rk3x.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index 086fdf262e7b..01febd886bdd 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -28,8 +28,8 @@ /* Register Map */ #define REG_CON 0x00 /* control register */ #define REG_CLKDIV 0x04 /* clock divisor register */ -#define REG_MRXADDR 0x08 /* slave address for REGISTER_TX */ -#define REG_MRXRADDR 0x0c /* slave register address for REGISTER_TX */ +#define REG_MRXADDR 0x08 /* client address for REGISTER_TX */ +#define REG_MRXRADDR 0x0c /* client register address for REGISTER_TX */ #define REG_MTXCNT 0x10 /* number of bytes to be transmitted */ #define REG_MRXCNT 0x14 /* number of bytes to be received */ #define REG_IEN 0x18 /* interrupt enable */ @@ -68,8 +68,8 @@ enum { /* REG_IEN/REG_IPD bits */ #define REG_INT_BTF BIT(0) /* a byte was transmitted */ #define REG_INT_BRF BIT(1) /* a byte was received */ -#define REG_INT_MBTF BIT(2) /* master data transmit finished */ -#define REG_INT_MBRF BIT(3) /* master data receive finished */ +#define REG_INT_MBTF BIT(2) /* host data transmit finished */ +#define REG_INT_MBRF BIT(3) /* host data receive finished */ #define REG_INT_START BIT(4) /* START condition generated */ #define REG_INT_STOP BIT(5) /* STOP condition generated */ #define REG_INT_NAKRCV BIT(6) /* NACK received */ @@ -184,7 +184,7 @@ struct rk3x_i2c_soc_data { * @wait: the waitqueue to wait for i2c transfer * @busy: the condition for the event to wait for * @msg: current i2c message - * @addr: addr of i2c slave device + * @addr: addr of i2c client device * @mode: mode of i2c transfer * @is_last_msg: flag determines whether it is the last msg in this transfer * @state: state of i2c transfer @@ -979,7 +979,7 @@ static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num) /* * The I2C adapter can issue a small (len < 4) write packet before * reading. This speeds up SMBus-style register reads. - * The MRXADDR/MRXRADDR hold the slave address and the slave register + * The MRXADDR/MRXRADDR hold the client address and the client register * address in this case. */ @@ -1016,7 +1016,7 @@ static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num) addr |= 1; /* set read bit */ /* - * We have to transmit the slave addr first. Use + * We have to transmit the client addr first. Use * MOD_REGISTER_TX for that purpose. */ i2c->mode = REG_CON_MOD_REGISTER_TX; @@ -1162,8 +1162,8 @@ static u32 rk3x_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm rk3x_i2c_algorithm = { - .master_xfer = rk3x_i2c_xfer, - .master_xfer_atomic = rk3x_i2c_xfer_polling, + .xfer = rk3x_i2c_xfer, + .xfer_atomic = rk3x_i2c_xfer_polling, .functionality = rk3x_i2c_func, }; From patchwork Fri Mar 22 13:25:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781934 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C9ED47F64 for ; Fri, 22 Mar 2024 13:27:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114043; cv=none; b=lmWKGfMYru/yNcPBS8S8GogX6xJTeS08dqjVEBavjr723ypiBD7FL6ecWTshZgsU3nVeW7w1iyIXQ1dZ3M8FqaWXHbpUsIr70A4s8PEnI2bW0KTgzsKxxkjwQQUX3IUdTJVm0AljAojvtsPw5EBZEiWH3oDH1qp2OY2ySs2e1TE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114043; c=relaxed/simple; bh=IyxDQg3Eeu2VTbNzfWVfCI3dAf1Hdea1OkK2fa+bIDA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kSyaN3azHktcntetkZlSDO+5NA7NHe23FKWB3bWFIHJpD54TOy9aPbwbXZZOgPQnxf16HIMlLXdRVdTqT2UC4LM1i98L6YHqIEezrcRoRhRxDTRYwfFodTvsd04Yy3jiQiAQkhkLoyrsxBM4dGbpeGxCjBhH1mEP0vGX9z5Z4nw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=apZjvTY7; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="apZjvTY7" 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=k7I/P2iBDaF4EwyJ0IZtGeh8AwgbSdfw3r/JA/5EzLM=; b=apZjvT Y7pq6/gOGSSsqKRLFQTCMDskrdvPc+xYxN9q6UvrhEAos7v1dVWG96qbcqyXkBkg 9XKnvgMW2HUHLMUd8boOWv01jpptuBNemhPxYs0H4Odwtx6EG4rvBD7MH2xuuoZU ZOHL7w5dim79P3/vZKJHqdwxGkXUulLSwpw6S3vNmKL8vJreTrBZIOPOQeAvBcbP WEx8mm27Ew/PFPjyvNSBJgnNDkO1Ubg4J3908GCkfYb22SeciQlwZKrb4AAZ72bE j5ZjX9yqbzsu7+qCdGBPe7iviVpT5uWz84eMlS2YEO2+l3lKfXcaol5osg8/hlI3 Bglwy3sg7DTlQ6TQ== Received: (qmail 3871771 invoked from network); 22 Mar 2024 14:27:01 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:01 +0100 X-UD-Smtp-Session: l3s3148p1@SMBhxz8UDJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 48/64] i2c: sh7760: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:41 +0100 Message-ID: <20240322132619.6389-49-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-sh7760.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c index 8a043f5fca1e..49e83ca89101 100644 --- a/drivers/i2c/busses/i2c-sh7760.c +++ b/drivers/i2c/busses/i2c-sh7760.c @@ -55,7 +55,7 @@ #define MSR_MDE 0x08 #define MSR_MDT 0x04 #define MSR_MDR 0x02 -#define MSR_MAT 0x01 /* slave addr xfer done */ +#define MSR_MAT 0x01 /* addr xfer done */ #define MIE_MNRE 0x40 /* nack irq en */ #define MIE_MALE 0x20 /* arblos irq en */ @@ -154,7 +154,7 @@ static irqreturn_t sh7760_i2c_irq(int irq, void *ptr) goto out; } - /* i2c slave addr was sent; set to "normal" operation */ + /* i2c client addr was sent; set to "normal" operation */ if (msr & MSR_MAT) OUT32(id, I2CMCR, MCR_MIE); @@ -236,14 +236,14 @@ static irqreturn_t sh7760_i2c_irq(int irq, void *ptr) } -/* prepare and start a master receive operation */ +/* prepare and start a host receive operation */ static void sh7760_i2c_mrecv(struct cami2c *id) { int len; id->flags |= IDF_RECV; - /* set the slave addr reg; otherwise rcv wont work! */ + /* set the target addr reg; otherwise rcv won't work! */ OUT32(id, I2CSAR, 0xfe); OUT32(id, I2CMAR, (id->msg->addr << 1) | 1); @@ -262,14 +262,14 @@ static void sh7760_i2c_mrecv(struct cami2c *id) OUT32(id, I2CFIER, FIER_RXIE); } -/* prepare and start a master send operation */ +/* prepare and start a host send operation */ static void sh7760_i2c_msend(struct cami2c *id) { int len; id->flags |= IDF_SEND; - /* set the slave addr reg; otherwise xmit wont work! */ + /* set the target addr reg; otherwise xmit won't work! */ OUT32(id, I2CSAR, 0xfe); OUT32(id, I2CMAR, (id->msg->addr << 1) | 0); @@ -300,7 +300,7 @@ static inline int sh7760_i2c_busy_check(struct cami2c *id) return (IN32(id, I2CMCR) & MCR_FSDA); } -static int sh7760_i2c_master_xfer(struct i2c_adapter *adap, +static int sh7760_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { @@ -362,7 +362,7 @@ static int sh7760_i2c_master_xfer(struct i2c_adapter *adap, OUT32(id, I2CMIER, 0); OUT32(id, I2CFIER, 0); - /* reset slave module registers too: master mode enables slave + /* reset target module registers too: host mode enables target * module for receive ops (ack, data). Without this reset, * eternal bus activity might be reported after NACK / ARBLOST. */ @@ -379,7 +379,7 @@ static u32 sh7760_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm sh7760_i2c_algo = { - .master_xfer = sh7760_i2c_master_xfer, + .xfer = sh7760_i2c_xfer, .functionality = sh7760_i2c_func, }; From patchwork Fri Mar 22 13:25:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781933 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE8CE62178 for ; Fri, 22 Mar 2024 13:27:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114044; cv=none; b=qjv6aeCiCGAkbDrK0Wb6F2cAfBEwIJ4laIRD0z026Pr6mxucWUJmThMZQ+mLelncKB2a3dvt+Zoo/Fl0eolPbFU/1M7ykYUDBy15DbNnnQiz/cVlxiKaG4swGfLFUxG5d4DbJB9xEOkwM4EXzVkk98kk3fLlcyHF4nWb7JGyf7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114044; c=relaxed/simple; bh=VMxSxsDrMIWOAp623V5jvSZ4cL+pryV8GSIsKQDn4HM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UV5JF7Gt8gpbvVIZGq7/3efmTas0FgluwoUapTI032cWlrTsh1Kd4gYSBWN13gAORF8wPO/xG0NG3qBBHKE/xhpxBMJOtl1go7qwpyQ/szy0YdPHI3wB03QI7ws7CoBwBV3c7jRXbK/74we6hAQVqzye5qkELVDLWHHflIc9q4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=IunH1A6N; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="IunH1A6N" 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=kmFZAXTAUJkEHBINWtZi5gZBA3xVRr2hXYbcafka3So=; b=IunH1A 6NiWhsejL+KPndU6242octjCHvXtl9fAgeq7JQxjHvdjeK04DE+0Y8aBV4Pas+yt TxqKF5wS4gv0rHrtUCzzW6zdxAdBVF+ssRd1hRo9OfUV09sOVEXs9dNPdMH4Z1aU G7XzV4Dqc2NmEwqM1Y5RoANQY9m9mplnos8IzAAbRfcYQkF8/BTIWZyyirnQeen+ 2X8pIWBGJZWwprrEfFu1P+CUdzS6S0JlY7tRucaiZmPO70kVLmOGMPXFNAvAHOCX gefZEEaqNMANXn5f4EOp0WSa4ZwKjL5nGwenat/QrV6EJmOSi42tD37Rt4mSAgeI Wwk4u6Ubdy/j1Euw== Received: (qmail 3871800 invoked from network); 22 Mar 2024 14:27:01 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:01 +0100 X-UD-Smtp-Session: l3s3148p1@lDxuxz8UGJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 49/64] i2c: sh_mobile: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:42 +0100 Message-ID: <20240322132619.6389-50-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-sh_mobile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index c65ac3d7eadc..276a036d8ef0 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -53,7 +53,7 @@ /* */ /* Receive operation: */ /* */ -/* 0 byte receive - not supported since slave may hold SDA low */ +/* 0 byte receive - not supported since client may hold SDA low */ /* */ /* 1 byte receive [TX] | [RX] */ /* BUS: S A8 ACK | D8(1) ACK P(*) */ @@ -93,7 +93,7 @@ /* _______________________________________________ */ /* BUSY __/ \_ */ /* */ -/* (*) The STOP condition is only sent by the master at the end of the last */ +/* (*) The STOP condition is only sent by the host at the end of the last */ /* I2C message or if the I2C_M_STOP flag is set. Similarly, the BUSY bit is */ /* only cleared after the STOP condition, so, between messages we have to */ /* poll for the DTE bit. */ @@ -495,7 +495,7 @@ static struct dma_chan *sh_mobile_i2c_request_dma_chan(struct device *dev, ret = dmaengine_slave_config(chan, &cfg); if (ret) { - dev_dbg(dev, "slave_config failed for %s (%d)\n", chan_name, ret); + dev_dbg(dev, "DMA config failed for %s (%d)\n", chan_name, ret); dma_release_channel(chan); return ERR_PTR(ret); } @@ -540,7 +540,7 @@ static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd) read ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!txdesc) { - dev_dbg(pd->dev, "dma prep slave sg failed, using PIO\n"); + dev_dbg(pd->dev, "dma prep sg failed, using PIO\n"); sh_mobile_i2c_cleanup_dma(pd, false); return; } @@ -740,8 +740,8 @@ static u32 sh_mobile_i2c_func(struct i2c_adapter *adapter) static const struct i2c_algorithm sh_mobile_i2c_algorithm = { .functionality = sh_mobile_i2c_func, - .master_xfer = sh_mobile_i2c_xfer, - .master_xfer_atomic = sh_mobile_i2c_xfer_atomic, + .xfer = sh_mobile_i2c_xfer, + .xfer_atomic = sh_mobile_i2c_xfer_atomic, }; static const struct i2c_adapter_quirks sh_mobile_i2c_quirks = { From patchwork Fri Mar 22 13:25:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783351 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D70863121 for ; Fri, 22 Mar 2024 13:27:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114044; cv=none; b=ejy79bYc+rp3FM1LP2IwUo+R4ca9/I5XbaISaRdQAu9PPildZXzbZOI9YnAz3btxk7GDHkF9zAv5iwrAjh+yZfQ4NTE6ZpbAwoePveHigzVdACMMJ9PNqdJRdk/xA5a7I+QVHk00grM0ZRQKcjAgRnPcdkumeHChsSnVAmtKBW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114044; c=relaxed/simple; bh=gSJCKAfsXYEX11Ce8qfxfrsskafXE1oEiD5eqfxB7XU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rqxU3pe/gRsNLPuKuzHPEvPL0bWWH7DpTkL36JdORrO0v1SWfEiqLtnAtdmWofxYpIdyk8f5JFeQHWMlw5L+fGFryyspLmLKkMTcgISI3uTgKReFp9NHb5O4InCahPEv9wqvCyKqHcvsLrgBozvLPX3wZi09Pp42sVATWtDKiJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=CqkWjw9V; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="CqkWjw9V" 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=ZOkUyh2PPBfs/TtcNX0aDE3PwaWXSyikNW3QoCUR2Z4=; b=CqkWjw 9VgMuR9+QAuQGKhGWBPrNS4twp5dh801okqJ4FsWHkJO0ID01OQifoo23+kYXSXi BtRtTf2YCDxqhsX74M1OsbX853qlr8m1lHJHRzd+SXE5O0caEX9Wtw5NTjFNa3jA QsO+mzvVFNHSg+8LTyZIyH8SNyMtl4xpXHkKiYKz/B0WehSFiMNg6sQyRUh/JL1I 4EMpFiRrlS2kq9TsR8jLsolth6KCrs80cbsjGucYx33gzig2wF8Sit5X/pmy1QqF yjfH/azHRK1dUhfy4nNTem9u3sDIW9s6nqCkZx58wB6Nj+QMch8biRMHTFJwkYb4 nD7mhMkDykfwDhxw== Received: (qmail 3871838 invoked from network); 22 Mar 2024 14:27:02 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:02 +0100 X-UD-Smtp-Session: l3s3148p1@s0R6xz8UIpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 50/64] i2c: sis5595: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:43 +0100 Message-ID: <20240322132619.6389-51-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-sis5595.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index 32476dc10ad6..198ba39a2651 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c @@ -257,7 +257,7 @@ static int sis5595_transaction(struct i2c_adapter *adap) if (temp & 0x20) { dev_err(&adap->dev, "Bus collision! SMBus may be locked until " "next hard reset (or not...)\n"); - /* Clock stops and slave is stuck in mid-transmission */ + /* Clock stops and client is stuck in mid-transmission */ result = -EIO; } From patchwork Fri Mar 22 13:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783350 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3349A634FE for ; Fri, 22 Mar 2024 13:27:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114045; cv=none; b=hfhvMk4KKi3Nydcc6EiKlTfSQGNGNRrFR+CNc/mQOLmvU5dLiznA8EwU3VGnb1p84zUbzGTTY1lB05LmKfJVq438wgQEf/CP34w33A0UoXEtSY7tFG4C1xeCb2N7uo7o6LHxr4Vxxp3x1AO3Dg+wN6v7MoYZ2rMGL7qRU/x8dOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114045; c=relaxed/simple; bh=JopqC1CUA53KwbARMzk2PCnsUdhS27WGHgIgrl130yc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u/YI1poH3xeg0fwUMwLHpmJCkJ1KeLXuQkSvnqFKQ2fm6Jxfw7aCDu35DRVrsZj9mW6MnSQtmzCieXxAbSxFobRDepJLndRJveN8GujvfRaZK5Ya00Pv1A+be1GhXxz4L3AHE8icDpbqD7dcKo9xck3ztU5smOeFBv6g2z8/r7Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=lmVKV8Fv; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="lmVKV8Fv" 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=83ypbEc9zEl6mc8ZY/BhWqheV6O8ZhghdvuHQYn8SGw=; b=lmVKV8 Fv7W7PwTQKacO0Czh2T3OLVPheHj/dZG/Y1qnKYwxa+4V76ajiIV71HpaXJ8APPY Vlz08qZ7Hrq5Zmycyj0/3901kolybUfUlsOb3nXVtE/5Ej7I7bXefHcJPUMjFoTo ujOkZ0RDCSk4Xt1FUM61EWbUHf0BlE4y4OBKth00hiMNtBq44ciECxAODUQYs8Q8 0aKxYcdtk/pjE77HyOIUlir79KMbuTBazs2VxKdkdceZVpug5WAapNT//cdb2Xji Xn4nUaaMUTws28u+fwr8JfF0SILwDB/p+8Nc39rfXupgJiw0VcMjDmocurJ4DDjB 9j+Z0kSvivo91URg== Received: (qmail 3871861 invoked from network); 22 Mar 2024 14:27:03 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:03 +0100 X-UD-Smtp-Session: l3s3148p1@CtiFxz8UMJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 51/64] i2c: sis630: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:44 +0100 Message-ID: <20240322132619.6389-52-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-sis630.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 3505cf29cedd..7910ba2fce15 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c @@ -18,7 +18,7 @@ +------------------------+--------------------+-------------------+ | Clock | 14kHz/56kHz | 55.56kHz/27.78kHz | | SMBus registers offset | 0x80 | 0xE0 | - | SMB_CNT | Bit 1 = Slave Busy | Bit 1 = Bus probe | + | SMB_CNT | Bit 1 = Client Busy| Bit 1 = Bus probe | | (not used yet) | Bit 3 is reserved | Bit 3 = Last byte | | SMB_PCOUNT | Offset + 0x06 | Offset + 0x14 | | SMB_COUNT | 4:0 bits | 5:0 bits | @@ -56,8 +56,8 @@ /* SMB_CNT register */ #define MSTO_EN 0x40 /* Host Master Timeout Enable */ -#define SMBCLK_SEL 0x20 /* Host master clock selection */ -#define SMB_PROBE 0x02 /* Bus Probe/Slave busy */ +#define SMBCLK_SEL 0x20 /* Host clock selection */ +#define SMB_PROBE 0x02 /* Bus Probe/Client busy */ #define SMB_HOSTBUSY 0x01 /* Host Busy */ /* SMBHOST_CNT register */ @@ -93,7 +93,7 @@ static bool high_clock; static bool force; module_param(high_clock, bool, 0); MODULE_PARM_DESC(high_clock, - "Set Host Master Clock to 56KHz (default 14KHz) (SIS630/730 only)."); + "Set Host Clock to 56KHz (default 14KHz) (SIS630/730 only)."); module_param(force, bool, 0); MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!"); @@ -144,8 +144,7 @@ static int sis630_transaction_start(struct i2c_adapter *adap, int size, dev_dbg(&adap->dev, "saved clock 0x%02x\n", *oldclock); - /* disable timeout interrupt, - * set Host Master Clock to 56KHz if requested */ + /* disable timeout interrupt, set Host Clock to 56KHz if requested */ if (high_clock) sis630_write(SMB_CNT, SMBCLK_SEL); else @@ -201,10 +200,7 @@ static void sis630_transaction_end(struct i2c_adapter *adap, u8 oldclock) dev_dbg(&adap->dev, "SMB_CNT before clock restore 0x%02x\n", sis630_read(SMB_CNT)); - /* - * restore old Host Master Clock if high_clock is set - * and oldclock was not 56KHz - */ + /* restore old Host Clock if high_clock is set and oldclock was not 56KHz */ if (high_clock && !(oldclock & SMBCLK_SEL)) sis630_write(SMB_CNT, sis630_read(SMB_CNT) & ~SMBCLK_SEL); From patchwork Fri Mar 22 13:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781932 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 134EB64A87 for ; Fri, 22 Mar 2024 13:27:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114046; cv=none; b=djK97JCTWBTkvg1AqY/BnLZ9SA/luPElFl+UFx95K+zMMbpqXe/jwzvhFZbvUcAx0/vLO8/aeBR/j2l7h3iRI3nT1Rl66okxV2lbh6kxR+kOubu4LpIQjt5NgTJWeoT/ZTfbEuT62tJ7z4UcQRNDjIL1M3zc58MaGM/2K0u1f84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114046; c=relaxed/simple; bh=KsrGCMJkM/BN/H4+pbAJYnvwKmCMdAIEIfiSmEJTKbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qYW5LALIgF6NH5sRnBL+FcJJSneX7uGYyeXigsZlZtyx4z/84pMKF91ht3LytDDW7VmWPra57OcUeZf+cExmJ7uM4Aj2x20stkmE4bpDjuIH7P+F8Ua8nMMP02l5S8hZmPAJxjk5je+/bHi36CTWG5KZyhS92Yy3eNQzts3fOrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=FZdxy/ub; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="FZdxy/ub" 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=lqe4UEUa872JnIqAlpZ6cZkudSkhxFiVgkhEQslGLLU=; b=FZdxy/ ubvyPfwY1+sfcFyAWR5w89KmNRJ9dFMb/qACNko50UMeOQzignrqEOej+8BH1Yj1 J9kXJpGF4uEmPcBFblwRrfWiepiSmPXZg+iAW/08lbNEbbu5BWxUHs5fDbpf2tCz l48b54Nyuo4kJ52Df/hiM9XkoeUJTxFQpzgq50CS7FBsy4qRVgrXVZvxQaeNylmy GBYfoRJmPpEpVnb5EPq7pFMRixWN7z4x6gUm5Cwk+uylaQsWJCrgSQXxtfqvBPSo +Kr0nvaZ1FTyi1nfQu5ft4hBWR67BxLBBfJo2bOkDFKiCuJpKu76zlWjWoSFr8cz Ao8y1tGm5j3agh0g== Received: (qmail 3871891 invoked from network); 22 Mar 2024 14:27:04 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:04 +0100 X-UD-Smtp-Session: l3s3148p1@REiSxz8UNpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Orson Zhai , Baolin Wang , Chunyan Zhang , linux-kernel@vger.kernel.org Subject: [PATCH 52/64] i2c: sprd: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:45 +0100 Message-ID: <20240322132619.6389-53-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Baolin Wang --- drivers/i2c/busses/i2c-sprd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index 28c88901d9bc..f1a8375ccc17 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -283,7 +283,7 @@ static int sprd_i2c_handle_msg(struct i2c_adapter *i2c_adap, return i2c_dev->err; } -static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap, +static int sprd_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) { struct sprd_i2c *i2c_dev = i2c_adap->algo_data; @@ -314,7 +314,7 @@ static u32 sprd_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm sprd_i2c_algo = { - .master_xfer = sprd_i2c_master_xfer, + .xfer = sprd_i2c_xfer, .functionality = sprd_i2c_func, }; @@ -378,12 +378,12 @@ static irqreturn_t sprd_i2c_isr_thread(int irq, void *dev_id) i2c_tran = i2c_dev->count; /* - * If we got one ACK from slave when writing data, and we did not + * If we got one ACK from client when writing data, and we did not * finish this transmission (i2c_tran is not zero), then we should * continue to write data. * * For reading data, ack is always true, if i2c_tran is not 0 which - * means we still need to contine to read data from slave. + * means we still need to contine to read data from client. */ if (i2c_tran && ack) { sprd_i2c_data_transfer(i2c_dev); @@ -393,7 +393,7 @@ static irqreturn_t sprd_i2c_isr_thread(int irq, void *dev_id) i2c_dev->err = 0; /* - * If we did not get one ACK from slave when writing data, we should + * If we did not get one ACK from client when writing data, we should * return -EIO to notify users. */ if (!ack) @@ -422,7 +422,7 @@ static irqreturn_t sprd_i2c_isr(int irq, void *dev_id) i2c_tran = i2c_dev->count; /* - * If we did not get one ACK from slave when writing data, then we + * If we did not get one ACK from client when writing data, then we * should finish this transmission since we got some errors. * * When writing data, if i2c_tran == 0 which means we have writen @@ -653,5 +653,5 @@ static struct platform_driver sprd_i2c_driver = { module_platform_driver(sprd_i2c_driver); -MODULE_DESCRIPTION("Spreadtrum I2C master controller driver"); +MODULE_DESCRIPTION("Spreadtrum I2C host controller driver"); MODULE_LICENSE("GPL v2"); From patchwork Fri Mar 22 13:25:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783349 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56567481DB for ; Fri, 22 Mar 2024 13:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114047; cv=none; b=Kp4DuUoqBXX+TYtFQGVGFfNCCJdlMQJsMGF5XEvjY2GIfJahmZoHFYufMJzMi+FzzS9mbwRBT8UTJNLsoecakRTwfSUpFor7ZEbVtXuqmNMei63une2xwJuBnDYQIOrjNGg+0ebMJ0qPdfoiIbz7aP9+moExggg2b9Va7GPSgLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114047; c=relaxed/simple; bh=Vnl7xgaAkjx+04bzp8e0wepchmi5dvt8Fv1N7l11klg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BQUHAFtYwJgmA3geFrA5Z2SKLxs2fe61fsjIqeBZeSyeTJFHIWAhpSg6+jZDY/BBxDwNn11ohtmh7V7ateFeo6oVFYq73+uGqaGk/zHHkQG/yYJ3w47g5ITN6UJtK5S5E0r5VBzdvb2WetDDwdiRFbRDbIaM+QU80sAJv++bKD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=WXjSqLKr; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="WXjSqLKr" 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=q9awUK66ih3cxClf+OK6PD+a5C0mloAeIXzXtRewe0s=; b=WXjSqL KrBBsD1jGigAfGAL+K4qkhUyPMVxqmUNq+ABWOAYICUcC/yz7dGMFFTbEHGwjuQC ul49r+QkL8I8OJZLIIJ/s/VWr8PtA7dYORzVfmKv/YdEq3cu4VS+gqVYGLFeOFgB R0KK1ufbVJhh5UNICcd1LCCtGKfNZHCyZK/axqPlXdKF+VC4xlNvfH/J86nuD3Ut eNJmFKbMTEeCPW4pw7+7MmLhYmiZr4mFnk4VoPMbMpixRnv/JNYvkuRV2gqb/G4r jBJEp+wvuHL9/CXABQu4L8T70zUjJPkdm2Ra4ewakHivIbPPfZLlsQu8Ae5FwApt 3afwCr5rpMG2G0rg== Received: (qmail 3871926 invoked from network); 22 Mar 2024 14:27:05 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:05 +0100 X-UD-Smtp-Session: l3s3148p1@HMKfxz8UPpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Patrice Chotard , Andi Shyti , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 53/64] i2c: st: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:46 +0100 Message-ID: <20240322132619.6389-54-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-st.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c index ce2333408904..9bd45ae83c0c 100644 --- a/drivers/i2c/busses/i2c-st.c +++ b/drivers/i2c/busses/i2c-st.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2013 STMicroelectronics * - * I2C master mode controller driver, used in STMicroelectronics devices. + * I2C host controller driver, used in STMicroelectronics devices. * * Author: Maxime Coquelin */ @@ -150,7 +150,7 @@ struct st_i2c_timings { /** * struct st_i2c_client - client specific data - * @addr: 8-bit slave addr, including r/w bit + * @addr: 8-bit client addr, including r/w bit * @count: number of bytes to be transfered * @xfered: number of bytes already transferred * @buf: data buffer @@ -647,7 +647,7 @@ static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg, { struct st_i2c_client *c = &i2c_dev->client; u32 ctl, i2c, it; - unsigned long timeout; + unsigned long time_left; int ret; c->addr = i2c_8bit_addr_from_msg(msg); @@ -667,7 +667,7 @@ static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg, i2c |= SSC_I2C_ACKG; st_i2c_set_bits(i2c_dev->base + SSC_I2C, i2c); - /* Write slave address */ + /* Write client address */ st_i2c_write_tx_fifo(i2c_dev, c->addr); /* Pre-fill Tx fifo with data in case of write */ @@ -685,15 +685,12 @@ static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg, st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STRTG); } - timeout = wait_for_completion_timeout(&i2c_dev->complete, + time_left = wait_for_completion_timeout(&i2c_dev->complete, i2c_dev->adap.timeout); ret = c->result; - if (!timeout) { - dev_err(i2c_dev->dev, "Write to slave 0x%x timed out\n", - c->addr); + if (!time_left) ret = -ETIMEDOUT; - } i2c = SSC_I2C_STOPG | SSC_I2C_REPSTRTG; st_i2c_clr_bits(i2c_dev->base + SSC_I2C, i2c); @@ -769,7 +766,7 @@ static u32 st_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm st_i2c_algo = { - .master_xfer = st_i2c_xfer, + .xfer = st_i2c_xfer, .functionality = st_i2c_func, }; From patchwork Fri Mar 22 13:25:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781931 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C2B76519E for ; Fri, 22 Mar 2024 13:27:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114048; cv=none; b=AdPfwmvweQS+QOO8DMZCga2zCne7lWn5mgP0LZhTuBStv5sWHfd3lIUqqIOZoS8sPen7uQ9MFAUaodu8mTJXzp6bpWavq1+2dO6e9zCH+Cvjt9RhnmyAPCAFmfo918RVK3d0ZwA5jKB3SOpsCOGTpGgZmzGJDO6vnFOk8Y5p4sY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114048; c=relaxed/simple; bh=fHpjjT7VWPlWf89q6pOUOQOpJIvNvwHkfmzjVoejNB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l1PlFGp9Nx5Df6AGO1R19gxYPCQeATO7Dnz3lVu6vDu2OIjNfI9fB75tT+3RY2L7nGB06idlYtPGOy1UtKszOZ2xwYCYQPx53NEaGOewotXoD4DCPHpzyaUMnqJ7rl01tZGcW9S2BFG7URmWsUAZKzjVIgSmjA36xTgGFXQ8tV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=dZ9TpqDj; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="dZ9TpqDj" 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=v5icbxJz6JkP2dpvAuHf8kDHkY/a+aKxThUJ7RMnku8=; b=dZ9Tpq DjfvPnqYwJtDQcHEgBqxDnzAKKnJ3VU1tjc/rrXPkf+9nnGOnfOqlSGafJGIVZP6 ROpLbnxNrSAowYXsvgKf+8YD27AVoKRd+CVNAIrkcowPWR5gaxqRMM/5kKWpycTs D5ChfZAmfkQqsFyFXea1/goq4Df0dQqRWeyXY+XuloF9LqgKrxpGJJtGazDyhLIW D4dHOqL1MLnS0EXK+ZDAhjzcDoqPvyr79MbAQ0tNAz5bWtMSBDoXvnpp0N3O8qXV AcN1wn7/pHqFLP9Dksau7EbNIhSSyHUDyg2N6+2NCu+RZ+0JUigNg3+k01lDOpU3 vnczVBL9ntCLhMbg== Received: (qmail 3871957 invoked from network); 22 Mar 2024 14:27:05 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:05 +0100 X-UD-Smtp-Session: l3s3148p1@liKsxz8UQpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Pierre-Yves MORDRET , Alain Volmat , Andi Shyti , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 54/64] i2c: stm32f4: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:47 +0100 Message-ID: <20240322132619.6389-55-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-stm32f4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c index 859ac0cf7f6c..297f2ace6b94 100644 --- a/drivers/i2c/busses/i2c-stm32f4.c +++ b/drivers/i2c/busses/i2c-stm32f4.c @@ -95,7 +95,7 @@ /** * struct stm32f4_i2c_msg - client specific data - * @addr: 8-bit slave addr, including r/w bit + * @addr: 8-bit client addr, including r/w bit * @count: number of bytes to be transferred * @buf: data buffer * @result: result of the transfer @@ -480,7 +480,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) /** * stm32f4_i2c_handle_rx_addr() - Handle address matched interrupt in case of - * master receiver + * host receiver * @i2c_dev: Controller's private data */ static void stm32f4_i2c_handle_rx_addr(struct stm32f4_i2c_dev *i2c_dev) @@ -643,7 +643,7 @@ static irqreturn_t stm32f4_i2c_isr_error(int irq, void *data) /* * Acknowledge failure: - * In master transmitter mode a Stop must be generated by software + * In host transmitter mode a Stop must be generated by software */ if (status & STM32F4_I2C_SR1_AF) { if (!(msg->addr & I2C_M_RD)) { @@ -749,7 +749,7 @@ static u32 stm32f4_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm stm32f4_i2c_algo = { - .master_xfer = stm32f4_i2c_xfer, + .xfer = stm32f4_i2c_xfer, .functionality = stm32f4_i2c_func, }; From patchwork Fri Mar 22 13:25:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783348 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C54765BBF for ; Fri, 22 Mar 2024 13:27:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114049; cv=none; b=pbwkzi+anG+wKUdJP7/fT0aTv2A/NuKqvmonUk6Gp34qfAH04jEqPPI3sbOXRFV7DGUYMFzikm1jePnv0U9bmj+6v4Wrd5kNL6uT4AWlw9E8vGrKAfOIqupwnrsJ2tS1xlxaHn4q9DBCXMJNbipObcb2my8PSrnvda3PldA0yH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114049; c=relaxed/simple; bh=A4Mzc2nTZGdzFMcgWqISDzq4egh98/WrwYY5nCHZFUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qu8kuisTabE+KvPAIvYkuD7YauUKnaRnbdj59CFgEEr/EvLIgTEQoA1HOVdI12QXz7iCYDwI7znZr0Ig4vcEgYEMdxRuqBpqNrlfhU3DJ3CxVNXpWmZ88blXjAPOdgbEjhWgJO8leAkph2ttW64UL0bom/O7MNsAMuC5Lk/oBHY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Inynn4cA; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Inynn4cA" 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=ytanu7H5eyBZ7/uQQrpibeDO0nDWqRUtTfFni6jgrYU=; b=Inynn4 cAKloAbOe1BMSWTKEXk7UMn0qEswaNtZvclzB3S8odDdfdfITHmo2/62ZfDZpNIR 8fl7Bcf9mY4DQlRcYBuLInnJiv7UNO37dnV4mCw0kboQkBLO590Br59mJNhuefCB FJmIU9jS1nMraNXQjhwNKQCvJU2z6WJpvROZs/TYehnzltuqj9SJ0DR+XgGRBbtr krLYxgtd0VQYdvlc2NdAZzSe/ewx7ruXzuojGVSqkQrGqXbzYFudnKeDZHLSh2XB +iZh2fE7d5xyyssuuO5gBMEZNik5iPgqNvmkdXr7VqLfd61D2vxpkdfP25Zelayr OzhdHCVcZJECLJZA== Received: (qmail 3872005 invoked from network); 22 Mar 2024 14:27:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:06 +0100 X-UD-Smtp-Session: l3s3148p1@rO+4xz8URpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 55/64] i2c: sun6i-p2wi: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:48 +0100 Message-ID: <20240322132619.6389-56-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-sun6i-p2wi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c index 85e035e7a1d7..bb01746738b1 100644 --- a/drivers/i2c/busses/i2c-sun6i-p2wi.c +++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c @@ -10,7 +10,7 @@ * The P2WI controller looks like an SMBus controller which only supports byte * data transfers. But, it differs from standard SMBus protocol on several * aspects: - * - it supports only one slave device, and thus drop the address field + * - it supports only one client device, and thus drop the address field * - it adds a parity bit every 8bits of data * - only one read access is required to read a byte (instead of a write * followed by a read access in standard SMBus protocol) @@ -88,7 +88,7 @@ struct p2wi { void __iomem *regs; struct clk *clk; struct reset_control *rstc; - int slave_addr; + int client_addr; }; static irqreturn_t p2wi_interrupt(int irq, void *dev_id) @@ -121,7 +121,7 @@ static int p2wi_smbus_xfer(struct i2c_adapter *adap, u16 addr, struct p2wi *p2wi = i2c_get_adapdata(adap); unsigned long dlen = P2WI_DLEN_DATA_LENGTH(1); - if (p2wi->slave_addr >= 0 && addr != p2wi->slave_addr) { + if (p2wi->client_addr >= 0 && addr != p2wi->client_addr) { dev_err(&adap->dev, "invalid P2WI address\n"); return -EINVAL; } @@ -188,7 +188,7 @@ static int p2wi_probe(struct platform_device *pdev) unsigned long parent_clk_freq; u32 clk_freq = I2C_MAX_STANDARD_MODE_FREQ; struct p2wi *p2wi; - u32 slave_addr; + u32 client_addr; int clk_div; int irq; int ret; @@ -207,7 +207,7 @@ static int p2wi_probe(struct platform_device *pdev) } if (of_get_child_count(np) > 1) { - dev_err(dev, "P2WI only supports one slave device\n"); + dev_err(dev, "P2WI only supports one client device\n"); return -EINVAL; } @@ -215,24 +215,24 @@ static int p2wi_probe(struct platform_device *pdev) if (!p2wi) return -ENOMEM; - p2wi->slave_addr = -1; + p2wi->client_addr = -1; /* * Authorize a p2wi node without any children to be able to use an * i2c-dev from userpace. - * In this case the slave_addr is set to -1 and won't be checked when + * In this case the client_addr is set to -1 and won't be checked when * launching a P2WI transfer. */ childnp = of_get_next_available_child(np, NULL); if (childnp) { - ret = of_property_read_u32(childnp, "reg", &slave_addr); + ret = of_property_read_u32(childnp, "reg", &client_addr); if (ret) { - dev_err(dev, "invalid slave address on node %pOF\n", + dev_err(dev, "invalid client address on node %pOF\n", childnp); return -EINVAL; } - p2wi->slave_addr = slave_addr; + p2wi->client_addr = client_addr; } p2wi->regs = devm_platform_ioremap_resource(pdev, 0); From patchwork Fri Mar 22 13:25:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781930 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5535664AE for ; Fri, 22 Mar 2024 13:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114051; cv=none; b=b9PwsYso4fODWS4LLrlLmFCgznG1fV0CasUyJ7b3vuXG3I24En5dLmzD3M2ykpLtn1QE+3FMTkZWUPENM/tI1wvO5v5OI3txjYulWaOKTUEVqlTYbic0xa660puf18ayzeOa3Uy0ih9Ctl4ivs94F4LywtxVqbbmk0hYGhYpykM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114051; c=relaxed/simple; bh=davqUUNYoFMJd9cuuCgS4qa50oOKjp/hyawfu0kSf8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EHDS5yCwrmbdde3NcWhxoB3b9VYK0KqUGyS2KUxvMuejt2Iv02s2dvpitOfU/oMalrk7elNFZ+rsHdz3Fnswib2KhtICqdBq71tVvVZkjXAiWDBpudalQGJdJ+xZOlgR38RV7CtuQbGuJHD9upFCSucYs28KFcz2S2AWurIZyrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=dZhWVheL; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="dZhWVheL" 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=HNFDL564snpTrcZlSonI/bbMFLyUUlB4WqrmT/WwUQo=; b=dZhWVh eLxihLYJT4sUEdwllrstHBW+BF/bGt5PqsDqmrfOSZCIhUnAZiTmLDlR6fwxpXxM ImpUEkuObM5ymxmzs4HUgzEmzTkIF8tnVWAgbxxy1JbNjSZWdI8WNESgHs3Jm6Cp IWYo1hn8jhEWzs4XcieQbmLzRT2fjJWRbb/6HtQjdMAXDI62eGF9SVHrow17BydM FZBHcon3SCANlSaZ4Choslr7LK4eevjTrDGfBHov5gd/HVnohnX5vWUSdU8GKBb1 EFNYLJvlCcyFOtry4GFmrs8hbwxQIW8BTzXPlv4c1QaO901qut0AQq+hnAxdiRiy VsnvYHmZuR2U7D6A== Received: (qmail 3872067 invoked from network); 22 Mar 2024 14:27:07 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:07 +0100 X-UD-Smtp-Session: l3s3148p1@OfPFxz8UTpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Ard Biesheuvel , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 56/64] i2c: synquacer: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:49 +0100 Message-ID: <20240322132619.6389-57-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-synquacer.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c index bbea521b05dd..2fa528daaf5f 100644 --- a/drivers/i2c/busses/i2c-synquacer.c +++ b/drivers/i2c/busses/i2c-synquacer.c @@ -66,16 +66,16 @@ #define SYNQUACER_I2C_BUS_CLK_FR(rate) (((rate) / 20000000) + 1) /* STANDARD MODE frequency */ -#define SYNQUACER_I2C_CLK_MASTER_STD(rate) \ +#define SYNQUACER_I2C_CLK__STD(rate) \ DIV_ROUND_UP(DIV_ROUND_UP((rate), I2C_MAX_STANDARD_MODE_FREQ) - 2, 2) /* FAST MODE frequency */ -#define SYNQUACER_I2C_CLK_MASTER_FAST(rate) \ +#define SYNQUACER_I2C_CLK__FAST(rate) \ DIV_ROUND_UP((DIV_ROUND_UP((rate), I2C_MAX_FAST_MODE_FREQ) - 2) * 2, 3) /* (clkrate <= 18000000) */ /* calculate the value of CS bits in CCR register on standard mode */ #define SYNQUACER_I2C_CCR_CS_STD_MAX_18M(rate) \ - ((SYNQUACER_I2C_CLK_MASTER_STD(rate) - 65) \ + ((SYNQUACER_I2C_CLK__STD(rate) - 65) \ & SYNQUACER_I2C_CCR_CS_MASK) /* calculate the value of CS bits in CSR register on standard mode */ @@ -83,7 +83,7 @@ /* calculate the value of CS bits in CCR register on fast mode */ #define SYNQUACER_I2C_CCR_CS_FAST_MAX_18M(rate) \ - ((SYNQUACER_I2C_CLK_MASTER_FAST(rate) - 1) \ + ((SYNQUACER_I2C_CLK__FAST(rate) - 1) \ & SYNQUACER_I2C_CCR_CS_MASK) /* calculate the value of CS bits in CSR register on fast mode */ @@ -92,22 +92,22 @@ /* (clkrate > 18000000) */ /* calculate the value of CS bits in CCR register on standard mode */ #define SYNQUACER_I2C_CCR_CS_STD_MIN_18M(rate) \ - ((SYNQUACER_I2C_CLK_MASTER_STD(rate) - 1) \ + ((SYNQUACER_I2C_CLK__STD(rate) - 1) \ & SYNQUACER_I2C_CCR_CS_MASK) /* calculate the value of CS bits in CSR register on standard mode */ #define SYNQUACER_I2C_CSR_CS_STD_MIN_18M(rate) \ - (((SYNQUACER_I2C_CLK_MASTER_STD(rate) - 1) >> 5) \ + (((SYNQUACER_I2C_CLK__STD(rate) - 1) >> 5) \ & SYNQUACER_I2C_CSR_CS_MASK) /* calculate the value of CS bits in CCR register on fast mode */ #define SYNQUACER_I2C_CCR_CS_FAST_MIN_18M(rate) \ - ((SYNQUACER_I2C_CLK_MASTER_FAST(rate) - 1) \ + ((SYNQUACER_I2C_CLK__FAST(rate) - 1) \ & SYNQUACER_I2C_CCR_CS_MASK) /* calculate the value of CS bits in CSR register on fast mode */ #define SYNQUACER_I2C_CSR_CS_FAST_MIN_18M(rate) \ - (((SYNQUACER_I2C_CLK_MASTER_FAST(rate) - 1) >> 5) \ + (((SYNQUACER_I2C_CLK__FAST(rate) - 1) >> 5) \ & SYNQUACER_I2C_CSR_CS_MASK) /* min I2C clock frequency 14M */ @@ -255,15 +255,13 @@ static void synquacer_i2c_hw_reset(struct synquacer_i2c *i2c) WAIT_PCLK(100, i2c->pclkrate); } -static int synquacer_i2c_master_start(struct synquacer_i2c *i2c, +static int synquacer_i2c_start(struct synquacer_i2c *i2c, struct i2c_msg *pmsg) { unsigned char bsr, bcr; writeb(i2c_8bit_addr_from_msg(pmsg), i2c->base + SYNQUACER_I2C_REG_DAR); - dev_dbg(i2c->dev, "slave:0x%02x\n", pmsg->addr); - /* Generate Start Condition */ bsr = readb(i2c->base + SYNQUACER_I2C_REG_BSR); bcr = readb(i2c->base + SYNQUACER_I2C_REG_BCR); @@ -281,7 +279,7 @@ static int synquacer_i2c_master_start(struct synquacer_i2c *i2c, i2c->base + SYNQUACER_I2C_REG_BCR); } else { if (bcr & SYNQUACER_I2C_BCR_MSS) { - dev_dbg(i2c->dev, "not in master mode"); + dev_dbg(i2c->dev, "not in host mode"); return -EAGAIN; } dev_dbg(i2c->dev, "Start Condition"); @@ -329,7 +327,7 @@ static int synquacer_i2c_doxfer(struct synquacer_i2c *i2c, i2c->msg_idx = 0; i2c->state = STATE_START; - ret = synquacer_i2c_master_start(i2c, i2c->msg); + ret = synquacer_i2c_start(i2c, i2c->msg); if (ret < 0) { dev_dbg(i2c->dev, "Address failed: (%d)\n", ret); return ret; @@ -429,7 +427,7 @@ static irqreturn_t synquacer_i2c_isr(int irq, void *dev_id) i2c->msg++; /* send the new start */ - ret = synquacer_i2c_master_start(i2c, i2c->msg); + ret = synquacer_i2c_start(i2c, i2c->msg); if (ret < 0) { dev_dbg(i2c->dev, "restart error (%d)\n", ret); synquacer_i2c_stop(i2c, -EAGAIN); @@ -473,7 +471,7 @@ static irqreturn_t synquacer_i2c_isr(int irq, void *dev_id) i2c->msg_idx++; i2c->msg++; - ret = synquacer_i2c_master_start(i2c, i2c->msg); + ret = synquacer_i2c_start(i2c, i2c->msg); if (ret < 0) { dev_dbg(i2c->dev, "restart error (%d)\n", ret); synquacer_i2c_stop(i2c, -EAGAIN); @@ -521,7 +519,7 @@ static u32 synquacer_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm synquacer_i2c_algo = { - .master_xfer = synquacer_i2c_xfer, + .xfer = synquacer_i2c_xfer, .functionality = synquacer_i2c_functionality, }; From patchwork Fri Mar 22 13:25:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783347 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6225C664BB for ; Fri, 22 Mar 2024 13:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114051; cv=none; b=bpj5fq99Ex28KfpOHsY+63t90Y71Y+HLg0ePNn1XigCqsymmGPiyDgpmWXcqpGMM3cAWU3LaaWoyFrcLzQcDTN3lG4d4it6p+1ysxsspX9iWZPUo29midAL40/GWQZmNdt0WJ8pRdf565BAz7/GkURDNzg+TNeGMmDTXE7/w5zU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114051; c=relaxed/simple; bh=keBBjANmZEAG5ti6G+/K6pZJny5cyPijU0Et7tidAZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VnuKPBgTGg1OnKT5CMbGhxjUi0gtBnff7l5K34UdFcVOieaMI5cUrBGonaI6zxg8ZfhU/WXhhOh6oL1yxv6BgJ+GR3CnGr+SGVgoSGbOMdehcJ0uZE6ZW938aEo9pRco6mwm1M9csatGV7ZeLKrZU30QTdjnLlTC++/CizK7mVw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=HHeNgDj5; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="HHeNgDj5" 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=LATMV+ftB6Wzcslw/1km6fP5fTaQpx9jv+n5ET3YDxA=; b=HHeNgD j5Q79pRAf24P7ToKboQzgZB54htEVJNHQ2z7UAXO6JYvIa7lIPHgJtp3hC5TMbr3 oueR1jWNecd5as35NhQRPQ+7BHg6N++12j1zY5O5pXSBDV03/Q2ELCC/pKRfTogJ fwJNZklq6pGMb3YFDnyBUjnABi1dGNwU1SE/QjgmwyLNR4illLNVgt9Us8Y3rgpC SHkhcdhJpFQbb5FadzRs1QIvocpGLvwKXC2zb/mFVPRyx4/byC1/MqHndDJuDBHz pB8/hkM8w+VqvJ7ELtTwksvWDgcccqmpZeXsuWK3nDItbdIcyFdt7YREBRJNRV3o 8OXOnKxElKCddO/w== Received: (qmail 3872103 invoked from network); 22 Mar 2024 14:27:08 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:08 +0100 X-UD-Smtp-Session: l3s3148p1@OFDSxz8UVpRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 57/64] i2c: taos-evm: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:50 +0100 Message-ID: <20240322132619.6389-58-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-taos-evm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-taos-evm.c b/drivers/i2c/busses/i2c-taos-evm.c index b0f0120793e1..cb97f72291bc 100644 --- a/drivers/i2c/busses/i2c-taos-evm.c +++ b/drivers/i2c/busses/i2c-taos-evm.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Driver for the TAOS evaluation modules - * These devices include an I2C master which can be controlled over the + * These devices include an I2C controller which can be controlled over the * serial port. * * Copyright (C) 2007 Jean Delvare From patchwork Fri Mar 22 13:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781929 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E5FF664D6 for ; Fri, 22 Mar 2024 13:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114052; cv=none; b=r+2+jOAvZmFuq3kEyTnxfaju49qkoYe7bXXtPYuZCcuIwlCNEtXrvJGNkhDkfT9QHR2q8pJKfZ1t5m8mNHsBHkvxTZ65XbJUdkbL/wYPFAeJj+BYo9kq8JOFqXqxE9ohlbivuuVrRDdg/Cb9t/Zv8IgRLk2Ql8/Z5LUTpdEznys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114052; c=relaxed/simple; bh=DFgZgIWojfRwew+B4gtaz8Ua4P4wxDuCpqQg8yqbp9w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GwamrCiXY+axWZuRwoCkPPsueYv5X9BTPEYDM06H0eSQLL2IFnBgFcv34Sh2FhFJGmfIvO2CcN8Tyf5EqFBdesuMWjrI1HtPF4IAFO4+p0aEQePeFRKnkmTLSg7DdSOz8UOyAO0h8KuoSxT0dfpHZVH6jigmrObGWuU9mPInbYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=fPZ5Bd2N; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="fPZ5Bd2N" 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=hhFcH9ZTNGEANydu8nWsC7JwiC16KFzrlwifPam1sfA=; b=fPZ5Bd 2N89JEqXBCKfiZjRTShinhLRMOsdndhUz1yn1wvYdYLfNXIHkbE1kfmkzImUQ6Qz kQfMpAI9dJgV1zysr80npZbezBnvioUZPA1qHeFAxL003Rwzdu7gf6GJeHvYVKKk pJidfepYIBAjv/vWAVbSESV1mL14d/i+x9TMEsC0IYzZv6GncWSqfmCNKxX8T2Cv AcRcLyW1W6SpV3bfnRwAEBy9F0OMlaDiazu7YZijjGoPdF1CWc5Bs5ZLOkPJzteB 3PEPXayPI7enYB1eyNctlXWmp6bGe/F1GWY0iHiyZtqc0l04ANLLTvEXHIJvPWiv eR2Wweob/8BZwsHw== Received: (qmail 3872130 invoked from network); 22 Mar 2024 14:27:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:09 +0100 X-UD-Smtp-Session: l3s3148p1@oEfexz8UWJRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Till Harbaum , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 58/64] i2c: tiny-usb: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:51 +0100 Message-ID: <20240322132619.6389-59-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-tiny-usb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c index 1bffe36c40ad..da06d1be0a2b 100644 --- a/drivers/i2c/busses/i2c-tiny-usb.c +++ b/drivers/i2c/busses/i2c-tiny-usb.c @@ -54,8 +54,6 @@ static int usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num) struct i2c_msg *pmsg; int i, ret; - dev_dbg(&adapter->dev, "master xfer %d messages:\n", num); - pstatus = kmalloc(sizeof(*pstatus), GFP_KERNEL); if (!pstatus) return -ENOMEM; @@ -142,7 +140,7 @@ static u32 usb_func(struct i2c_adapter *adapter) /* This is the actual algorithm we define */ static const struct i2c_algorithm usb_algorithm = { - .master_xfer = usb_xfer, + .xfer = usb_xfer, .functionality = usb_func, }; From patchwork Fri Mar 22 13:25:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783346 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E3E166B55 for ; Fri, 22 Mar 2024 13:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114053; cv=none; b=AFCq8xLJsDhM6g6y8el2vMaDu/dvcIqZzfgQOGlGJ8oxiC8sstYeCme1+2ng5aAPKa9jEAVvDk20LccStATkYL+3Kpap0832r9Gs3yP+YVxJkgNikn/zyKyWsiSf+4+N4BFGp8wv7oz9IFlTa4/frt9IVAWs30IMlkBVN8hxJxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114053; c=relaxed/simple; bh=jhLyTeGZk3WHRGR+u+Pnghl/gFGCXwj7rHn2zZb+SRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SQPtSo2/LyRcK1E4huvupfNKkNeoICDf2jgy8IB8q6YYf/9TvDS29uxEM/dxHzGr3zCSV/R5Y/hoW4vFzdRm61oFfDDfwIknM5hjRVuNtFP3SDsoEuU5zIxCEiIOuuQthbPlu6YjiT0ticmj6Jo0UKoIaYuc6zYHLul0xVuULUc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=GBR34C5f; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="GBR34C5f" 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=ojlShxYbza+SZYG05qx4dWS+cyKPvErSpiJUhDaAhvw=; b=GBR34C 5fRnZMFT00dyS/5pEocuK9pcD9YxRL7bfWCtpP9I8e5pKmx+AZcBca28bCKKCRSt L+54jpaVEYtYE1y/yWzxZ02ftHaUzQvcTOQlN/cc9dMj/umLYUKgfMfGBn3L6QlK 8JmZY8i4uoy+FPbzk0MLBnBadkGRSytRjE70t14zCDhypDqcvUaGSSG2NkR/ObNd WPbdS+G9W1KcsAIURiKpMcTPVU7+BPcfncvj3JoyTEWJDmQmdEKVStqoyqF0Jtbf Ck7Kk+MWmmNTFxIpFCLmjeg2qSlRhcuVMNOsAeFQJS3T59f/tlaaj8b8/j7HOrzF DOA7a0sRCLH18MWg== Received: (qmail 3872176 invoked from network); 22 Mar 2024 14:27:10 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:10 +0100 X-UD-Smtp-Session: l3s3148p1@Bzrrxz8UgoVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Kunihiko Hayashi , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 59/64] i2c: uniphier-f: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:52 +0100 Message-ID: <20240322132619.6389-60-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-uniphier-f.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c index dbc91c7c3788..f075c83a81b9 100644 --- a/drivers/i2c/busses/i2c-uniphier-f.c +++ b/drivers/i2c/busses/i2c-uniphier-f.c @@ -12,15 +12,15 @@ #include #define UNIPHIER_FI2C_CR 0x00 /* control register */ -#define UNIPHIER_FI2C_CR_MST BIT(3) /* master mode */ +#define UNIPHIER_FI2C_CR_MST BIT(3) /* host mode */ #define UNIPHIER_FI2C_CR_STA BIT(2) /* start condition */ #define UNIPHIER_FI2C_CR_STO BIT(1) /* stop condition */ #define UNIPHIER_FI2C_CR_NACK BIT(0) /* do not return ACK */ #define UNIPHIER_FI2C_DTTX 0x04 /* TX FIFO */ -#define UNIPHIER_FI2C_DTTX_CMD BIT(8) /* send command (slave addr) */ +#define UNIPHIER_FI2C_DTTX_CMD BIT(8) /* send command (client addr) */ #define UNIPHIER_FI2C_DTTX_RD BIT(0) /* read transaction */ #define UNIPHIER_FI2C_DTRX 0x04 /* RX FIFO */ -#define UNIPHIER_FI2C_SLAD 0x0c /* slave address */ +#define UNIPHIER_FI2C_SLAD 0x0c /* client address */ #define UNIPHIER_FI2C_CYC 0x10 /* clock cycle control */ #define UNIPHIER_FI2C_LCTL 0x14 /* clock low period control */ #define UNIPHIER_FI2C_SSUT 0x18 /* restart/stop setup time control */ @@ -96,7 +96,7 @@ static void uniphier_fi2c_fill_txfifo(struct uniphier_fi2c_priv *priv, int fifo_space = UNIPHIER_FI2C_FIFO_SIZE; /* - * TX-FIFO stores slave address in it for the first access. + * TX-FIFO stores client address in it for the first access. * Decrement the counter. */ if (first) @@ -252,7 +252,7 @@ static void uniphier_fi2c_tx_init(struct uniphier_fi2c_priv *priv, u16 addr, /* do not use TX byte counter */ writel(0, priv->membase + UNIPHIER_FI2C_TBC); - /* set slave address */ + /* set client address */ writel(UNIPHIER_FI2C_DTTX_CMD | addr << 1, priv->membase + UNIPHIER_FI2C_DTTX); /* @@ -288,7 +288,7 @@ static void uniphier_fi2c_rx_init(struct uniphier_fi2c_priv *priv, u16 addr) uniphier_fi2c_set_irqs(priv); - /* set slave address with RD bit */ + /* set client address with RD bit */ writel(UNIPHIER_FI2C_DTTX_CMD | UNIPHIER_FI2C_DTTX_RD | addr << 1, priv->membase + UNIPHIER_FI2C_DTTX); } @@ -310,7 +310,7 @@ static void uniphier_fi2c_recover(struct uniphier_fi2c_priv *priv) i2c_recover_bus(&priv->adap); } -static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap, +static int uniphier_fi2c_xfer_one(struct i2c_adapter *adap, struct i2c_msg *msg, bool repeat, bool stop) { @@ -340,7 +340,7 @@ static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap, uniphier_fi2c_tx_init(priv, msg->addr, repeat); /* - * For a repeated START condition, writing a slave address to the FIFO + * For a repeated START condition, writing a client address to the FIFO * kicks the controller. So, the UNIPHIER_FI2C_CR register should be * written only for a non-repeated START condition. */ @@ -404,7 +404,7 @@ static int uniphier_fi2c_check_bus_busy(struct i2c_adapter *adap) return 0; } -static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, +static int uniphier_fi2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct i2c_msg *msg, *emsg = msgs + num; @@ -419,7 +419,7 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, /* Emit STOP if it is the last message or I2C_M_STOP is set. */ bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP); - ret = uniphier_fi2c_master_xfer_one(adap, msg, repeat, stop); + ret = uniphier_fi2c_xfer_one(adap, msg, repeat, stop); if (ret) return ret; @@ -435,7 +435,7 @@ static u32 uniphier_fi2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm uniphier_fi2c_algo = { - .master_xfer = uniphier_fi2c_master_xfer, + .xfer = uniphier_fi2c_xfer, .functionality = uniphier_fi2c_functionality, }; From patchwork Fri Mar 22 13:25:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781928 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8238267735 for ; Fri, 22 Mar 2024 13:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114054; cv=none; b=n6AyJgt4BIjDXxUHpuM3UCzZtcLg91KW3XS2B105oubnEvSWTT32RamuSePjJs7oIKuisnyjtH4scQzoY+bJLp9SPdfibF/xwT2eTF8XTSUHHs4iEIIsK3gj/O8aKPGIIrd3QFWX0sgKIt+bnmoKSnzht8ZaXXzGRth6mXOv94A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114054; c=relaxed/simple; bh=71qy+/Hhrai+g8rz7D7PGltz104vOwWAlJxoPRdeEPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qRNPuH8ppvJzIKmAYSv9OVkhxVjoQCU2m/HqWIpqzmmpkKeGwrzyQUQJPlwsnVjgSmrL8Y4mNrfencM6RScRTyN3KnpEAcu0dslj1wXzFic5TaVIC5Tgr6ZttS8/ilyzYJ9S2LSjbk+c+u5naLpq9D+bnDENZkptV3ks6HCj/AY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=eoToXGTC; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="eoToXGTC" 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=pNDXCQJWEJcm+0I8ITtre6MA5ngwubwyMT7G66YGQs8=; b=eoToXG TCFgYji2g71PGFtc8kW6niXi3BT91uP+mrg4nlIDALWADXsH0tweq8adp+cRKyOd NEo5E3JvPGaRbQ171hjJKDzrlMDycM3M0C2SfN5x9aTTbxbY23FTDTDR+xTbiBZf 3of3Pewm309EgmqBkToOUE4AE6HI30lhQwVyvQnUWG3mA9fJnESFF9enRLkpiykY CanLLS2cTxc7DUBuP7ZNvRPr1EQ2vNvn4jRVwyZO44AgWsvvgBtqfypEcaaKrrVU 0MMESwya4AEq0ndk+5TGtEh9dq8jcJ7sGXChvb6pdWc2JTAr8y1IRNQV5VI6eIQO 94MxS3uV5joGXmBw== Received: (qmail 3872213 invoked from network); 22 Mar 2024 14:27:10 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:10 +0100 X-UD-Smtp-Session: l3s3148p1@rsz3xz8UhoVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Kunihiko Hayashi , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 60/64] i2c: uniphier: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:53 +0100 Message-ID: <20240322132619.6389-61-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-uniphier.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c index 854ac25b5862..24fa15c92845 100644 --- a/drivers/i2c/busses/i2c-uniphier.c +++ b/drivers/i2c/busses/i2c-uniphier.c @@ -17,13 +17,13 @@ #define UNIPHIER_I2C_DTRM_NACK BIT(8) /* do not return ACK */ #define UNIPHIER_I2C_DTRM_RD BIT(0) /* read transaction */ #define UNIPHIER_I2C_DREC 0x04 /* RX register */ -#define UNIPHIER_I2C_DREC_MST BIT(14) /* 1 = master, 0 = slave */ +#define UNIPHIER_I2C_DREC_MST BIT(14) /* 1 = host, 0 = target */ #define UNIPHIER_I2C_DREC_TX BIT(13) /* 1 = transmit, 0 = receive */ #define UNIPHIER_I2C_DREC_STS BIT(12) /* stop condition detected */ #define UNIPHIER_I2C_DREC_LRB BIT(11) /* no ACK */ #define UNIPHIER_I2C_DREC_LAB BIT(9) /* arbitration lost */ #define UNIPHIER_I2C_DREC_BBN BIT(8) /* bus not busy */ -#define UNIPHIER_I2C_MYAD 0x08 /* slave address */ +#define UNIPHIER_I2C_MYAD 0x08 /* target address */ #define UNIPHIER_I2C_CLK 0x0c /* clock frequency control */ #define UNIPHIER_I2C_BRST 0x10 /* bus reset */ #define UNIPHIER_I2C_BRST_FOEN BIT(1) /* normal operation */ @@ -154,7 +154,7 @@ static int uniphier_i2c_stop(struct i2c_adapter *adap) UNIPHIER_I2C_DTRM_NACK); } -static int uniphier_i2c_master_xfer_one(struct i2c_adapter *adap, +static int uniphier_i2c_xfer_one(struct i2c_adapter *adap, struct i2c_msg *msg, bool stop) { bool is_read = msg->flags & I2C_M_RD; @@ -213,7 +213,7 @@ static int uniphier_i2c_check_bus_busy(struct i2c_adapter *adap) return 0; } -static int uniphier_i2c_master_xfer(struct i2c_adapter *adap, +static int uniphier_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct i2c_msg *msg, *emsg = msgs + num; @@ -227,7 +227,7 @@ static int uniphier_i2c_master_xfer(struct i2c_adapter *adap, /* Emit STOP if it is the last message or I2C_M_STOP is set. */ bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP); - ret = uniphier_i2c_master_xfer_one(adap, msg, stop); + ret = uniphier_i2c_xfer_one(adap, msg, stop); if (ret) return ret; } @@ -241,7 +241,7 @@ static u32 uniphier_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm uniphier_i2c_algo = { - .master_xfer = uniphier_i2c_master_xfer, + .xfer = uniphier_i2c_xfer, .functionality = uniphier_i2c_functionality, }; From patchwork Fri Mar 22 13:25:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783345 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 290F067A01 for ; Fri, 22 Mar 2024 13:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114055; cv=none; b=IaXxEQQde1GDk9TqJ7zJOvvOqECDbhQMcCl029+xN0BFMnxlazsTZK/gGtxVsPf20z3/6eE79epFsQQUEN2ylZLbyDRM4wXvEuIyuG2/5x80mqkpUa/JDR+dRDoz+fPo97GmHHh3iO5mjQ52SQ3XSgPFWb6RRHhHhtJqJeiXgDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114055; c=relaxed/simple; bh=LCHmmTcTk+2vjiSobJRMbTT798hMptAxCnXzrq2f7Cc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iSvdWFR33uUTysE0SJqhXtoZzNfhfRXBkqxPVt2OydeksAMvgo8sQxV/VfF4Og6oy0qIln9fVoe7xDPxQJAqPcU2CeZdztUO1MJCi2XPSi6EBPU022ke7CVecVbj8f7QsQYZnVyKC0YCUN3qOwpXv//uUIZoQkbOsVN2+8BwXeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=HrbMRJPe; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="HrbMRJPe" 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=wxqg7Z+kFkA+aeNqnWAOKnhOCtUPYChybJW2GTLiINU=; b=HrbMRJ PexTlwFW20IcjqbefYKUVB2puOBaT1IT+sYNMqukbLvde7B5zCVp5wwO2DkBs78/ uj3qyO5QJ6P4fkdF2k2r9UK+dtHe/2zbCJs2SgcHfId+DwR9KJbITD3kZeLBUtBx ppX8mMyCf/7EA+u4PIa6fID7M+2RFhePz6DLJZH4myqPdqYksCxOgMIQ6fCFnP62 SXtC4NugdZ1kQRuf1XRP+txGUtdBnGUcvylRxOxI5Vztft4mLtJEPjCri+jtx2RP EZOQS85Ppnza1TJPtUT0Npgc21mr1foVOjYFlFvllh6ks+SjYe8qUf4rvKxuC8uo yPcxFhn4WsBsog8A== Received: (qmail 3872246 invoked from network); 22 Mar 2024 14:27:11 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:11 +0100 X-UD-Smtp-Session: l3s3148p1@qgoFyD8UjoVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 61/64] i2c: viperboard: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:54 +0100 Message-ID: <20240322132619.6389-62-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-viperboard.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c index 9e153b5b0e8e..810424bc7a04 100644 --- a/drivers/i2c/busses/i2c-viperboard.c +++ b/drivers/i2c/busses/i2c-viperboard.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Nano River Technologies viperboard i2c master driver + * Nano River Technologies viperboard i2c controller driver * * (C) 2012 by Lemonage GmbH * Author: Lars Poeschel @@ -273,8 +273,6 @@ static int vprbrd_i2c_xfer(struct i2c_adapter *i2c, struct i2c_msg *msgs, (struct vprbrd_i2c_addr_msg *)vb->buf; struct vprbrd_i2c_status *smsg = (struct vprbrd_i2c_status *)vb->buf; - dev_dbg(&i2c->dev, "master xfer %d messages:\n", num); - for (i = 0 ; i < num ; i++) { pmsg = &msgs[i]; @@ -345,7 +343,7 @@ static u32 vprbrd_i2c_func(struct i2c_adapter *i2c) /* This is the actual algorithm we define */ static const struct i2c_algorithm vprbrd_algorithm = { - .master_xfer = vprbrd_i2c_xfer, + .xfer = vprbrd_i2c_xfer, .functionality = vprbrd_i2c_func, }; @@ -461,6 +459,6 @@ static void __exit vprbrd_i2c_exit(void) module_exit(vprbrd_i2c_exit); MODULE_AUTHOR("Lars Poeschel "); -MODULE_DESCRIPTION("I2C master driver for Nano River Techs Viperboard"); +MODULE_DESCRIPTION("I2C controller driver for Nano River Techs Viperboard"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:viperboard-i2c"); From patchwork Fri Mar 22 13:25:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781927 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C98A67C52 for ; Fri, 22 Mar 2024 13:27:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114056; cv=none; b=cjmqAHGRrZbknrPD5ogQ3fXsOUn4QMNUScMf3sagkURQBaISUGSPfiUdzac7/xahprdJ2R7n/Sx4O8hjYxdXFNzqRw6Aak4IrPn3AArJQOrXbxth0DMq3eeeRNynHX30Ed9cI67E/rl4Cq4cfPcBEvPdhN21zExOhWMBtzqEqaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114056; c=relaxed/simple; bh=Ko5/Z2nRc5pMm4ibUjoyOnYGFwAgUhQpC5SCZht4oZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fxfvpHRwQ44Xa4jW2g6ISctWfs+Ewc8U1sxMO0PwpARGj1B7NYziwexH54DMPZ21zN35ukljlwSyUIM7wk2QbIiQ8opiwex0XVQKkyeCAU5J5N9K3TD66yu4FsjkImZL4J492IMEeq9Dk9/lxVy+G6FGcrJ68Fq3ZsSjK3M6vzU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=aFMrpUaq; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="aFMrpUaq" 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=zPO/AyVegLzL+94blha3Sj3ZjxaXY7bBsokNTRDxIaY=; b=aFMrpU aqyfQC2+TlCAp0lKshmBAIQXLRphVEA8CbmzbF3bJDEb+bIHnZDe1pFZApxWOndX MhiTY7zJpHrIdMnNHpnUrjAc+gJfikij8bCYBTem2OchZ3mAnQThvUqStZOGXP2j dMM5X8LjcbpkhNeAhisxrWb3WsAMeAn79epDqevzwVRRJUuuVjDN6+gFA9fgjPwe ElEbASERUG6Fvnkb1n67OPIiekm+y9od3LFhgjfHBAqrlzjbHAteqRdy+h3TkzRo Jsyg0i+kLFKAnISxYVGbvSILqfBv7dapEE/b2fTcDhr/AOabyX35iI01BjO8jYTg +DSuCucWLh5vAMkw== Received: (qmail 3872279 invoked from network); 22 Mar 2024 14:27:12 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:12 +0100 X-UD-Smtp-Session: l3s3148p1@+ngRyD8UloVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , George Cherian , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 62/64] i2c: xlp9xx: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:55 +0100 Message-ID: <20240322132619.6389-63-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: George Cherian --- drivers/i2c/busses/i2c-xlp9xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c index 08a59a920929..9a0a1c5f5c6f 100644 --- a/drivers/i2c/busses/i2c-xlp9xx.c +++ b/drivers/i2c/busses/i2c-xlp9xx.c @@ -336,7 +336,7 @@ static int xlp9xx_i2c_xfer_msg(struct xlp9xx_i2c_dev *priv, struct i2c_msg *msg, xlp9xx_write_i2c_reg(priv, XLP9XX_I2C_MFIFOCTRL, XLP9XX_I2C_MFIFOCTRL_RST); - /* set slave addr */ + /* set client addr */ xlp9xx_write_i2c_reg(priv, XLP9XX_I2C_SLAVEADDR, (msg->addr << XLP9XX_I2C_SLAVEADDR_ADDR_SHIFT) | (priv->msg_read ? XLP9XX_I2C_SLAVEADDR_RW : 0)); @@ -452,7 +452,7 @@ static u32 xlp9xx_i2c_functionality(struct i2c_adapter *adapter) } static const struct i2c_algorithm xlp9xx_i2c_algo = { - .master_xfer = xlp9xx_i2c_xfer, + .xfer = xlp9xx_i2c_xfer, .functionality = xlp9xx_i2c_functionality, }; From patchwork Fri Mar 22 13:25:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 783344 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 765D667C5C for ; Fri, 22 Mar 2024 13:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114056; cv=none; b=RFyHADg9iUlIIJFlDM2jrnKJLGVEPFcxh9AkmtdNW0TQ2lG6ATZBnETOKHWQL2vF0reQwGvK9HlkA5dZQ5lKxCeCWM1ABnttR5ws6NiJ3cXn0QEL6ZR80PQDulZ8O4238iwBM1wVzRLBCcYfVgTnxzMDEPNk92Ia5QPNJPDNGkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114056; c=relaxed/simple; bh=3SYrWo907vsAxN9nNRVA1UFj//np9nL10OQCf9WRfD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y8Ig3j3lgHkYAwhHJ/35di+Bd0yPG7Yi1lL3bCnFkocA+S2O+J6EGM/Hv9WudlHjZrEp+ynriU0X+zOXqEi2KCu1dL6FFbsZ53BSme72plhErqLJCNS78lZWEPQv42gABIjMYjxHv3B5m5ElAdHStu3pnLQskpMuXluRV2pTwfQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=VT6kn430; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="VT6kn430" 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=Mc+kkfqmbWeBgun419lGDhT1G5v018HjE/DNf0WDLT4=; b=VT6kn4 30eDKn9BBGnx/dKE4FI8SNsCOADo0k0+EWC0q1O+6IorhRyNVmvj+bnsHP9srqtd 5pxcsYrm0XHcOsPX//JFQlehqHfsuY737It4lxyZhp+zqJuNCZwGwk41Rt01m1nh hEi6sOKKs8TZLVAOg5/k1GwO0561m0Zs2By/tpMOMqqDXIbaVvNS7V97dwib4uLP QjrouLjQsM3UT4BzHHii7DveB1wO78YtDw3y9k0QtpvDLhK5ZYAF/epXHw6lyojz K5XrhZv+dgEHTIXELsUc3Ur52VXqhk518n53mYiFsmrH6/k3ACEGs8ZD3VhvnSwm kfup9LQTjU7EAqwA== Received: (qmail 3872340 invoked from network); 22 Mar 2024 14:27:13 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:13 +0100 X-UD-Smtp-Session: l3s3148p1@z3QeyD8UmoVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jim Cromie , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH 63/64] i2c: scx200_acb: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:56 +0100 Message-ID: <20240322132619.6389-64-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/scx200_acb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 3648382b885a..0d773210f9be 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c @@ -110,7 +110,7 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status) goto error; } if (!(status & ACBST_MASTER)) { - errmsg = "not master"; + errmsg = "not host"; goto error; } if (status & ACBST_NEGACK) { @@ -251,7 +251,7 @@ static void scx200_acb_reset(struct scx200_acb_iface *iface) outb(0x70, ACBCTL2); /* Polling mode */ outb(0, ACBCTL1); - /* Disable slave address */ + /* Disable target address */ outb(0, ACBADDR); /* Enable the ACCESS.bus device */ outb(inb(ACBCTL2) | ACBCTL2_ENABLE, ACBCTL2); From patchwork Fri Mar 22 13:25:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 781926 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFFC469317 for ; Fri, 22 Mar 2024 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114059; cv=none; b=THkdy0A/gpe3Eyto61eqxJAYeuDAlV61+9Xir0WJFJ6YSU7Ttm2XnNJi5TGZmKhlX0ZtSCIkYqQj1KsxejD971K7IOr5fjA62UI7vpZRaRBxQgT1Ikib2P7ssGUJ+X9toP5/ajWNuqUOzaLAjKIanDHvTiPn4Fh35F5ZhP7W0aA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711114059; c=relaxed/simple; bh=yNIpLOfDxIiTSAsTFqiaOJw6yB4FTUpIKCf3oT9NZzg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O0FetuhhPt8aIYlTXvHlomjPiR+qoyInYq+lbEfa2bo6oXQ+dyZV0prBJ9LL6gDKqPtB+jqiWMd+7CgekbtNP/Cqs4bMDqzbzNzhns1bosW6Ke4m1nFlBIQ0SXxmOkmq271dBy5l0/2PqnEPx7k0a7QOlcAM/owmYsMOxCctqDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=j27V4HKx; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="j27V4HKx" 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=Ti6AdHy5R1zA41nNzipr+t9xh3GImQtOLYTApON+Q2c=; b=j27V4H KxIoXYdsu5hRFQ4CqcnKrQH0oudUDD0KO6oj2ax6Fk6Mdln7q4GGIOGEVy+0fNul V7rUEJYdj2aDzQNHA+B27rMrPaL19zMM2k1V0R/HbgIo0bHgTob2eHTotl4fBH3n FOtOOb6hxiD04M3EvhmSamdiB9+dYyEnsaMDNrQ0lXyUXkXwcGOjSxGQCFOZU/Ww 831ovjvSsYRlU2yOrZHH1o215xV2KHVqPCZlV10FNqdRaEgMiD/ZwK8+2C+ne4Ki /2FqUSe6u14wfMFgLP+HcLNCi2JRo+Vy2VHbhWY7DQDuhKffqssIHjDj/hvkC/di Sd4dQqC44KzIdiYA== Received: (qmail 3872506 invoked from network); 22 Mar 2024 14:27:18 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:27:18 +0100 X-UD-Smtp-Session: l3s3148p1@wmtsyD8UpIVehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Elie Morisse , Shyam Sundar S K , Andi Shyti , Codrin Ciubotariu , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Krzysztof Adamski , Benson Leung , Guenter Roeck , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jan Dabros , Krzysztof Kozlowski , Alim Akhtar , Jean-Marie Verdun , Nick Hawkins , Yicong Yang , Oleksij Rempel , Pengutronix Kernel Team , Shawn Guo , Sascha Hauer , Fabio Estevam , Paul Cercueil , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Khalil Blaiech , Asmaa Mnebhi , Qii Wang , Matthias Brugger , AngeloGioacchino Del Regno , Linus Walleij , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Ajay Gupta , Peter Korsgaard , Andrew Lunn , Robert Richter , Aaro Koskinen , Janusz Krzysztofik , Tony Lindgren , Vignesh R , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Hector Martin , Sven Peter , Alyssa Rosenzweig , Vladimir Zapolskiy , Loic Poulain , Robert Foss , Bjorn Andersson , Konrad Dybcio , Fabrizio Castro , Pierre-Yves MORDRET , Alain Volmat , Maxime Coquelin , Alexandre Torgue , Thierry Reding , Jonathan Hunter , Laxman Dewangan , Dmitry Osipenko , Conghui Chen , Viresh Kumar , Michal Simek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, chrome-platform@lists.linux.dev, linux-samsung-soc@vger.kernel.org, imx@lists.linux.dev, linux-mips@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-omap@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-tegra@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 64/64] i2c: reword i2c_algorithm in drivers according to newest specification Date: Fri, 22 Mar 2024 14:25:57 +0100 Message-ID: <20240322132619.6389-65-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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Match the wording in i2c_algorithm in I2C drivers wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. For some drivers, this means no more conversions are needed. For the others more work needs to be done but this will be performed incrementally along with API changes/improvements. All these changes here are simple search/replace results. Signed-off-by: Wolfram Sang Reviewed-by: Bjorn Andersson Acked-by: Nicolas Ferre # for at91 Acked-by: Oleksij Rempel # for i2c-imx.c Acked-by: Jarkko Nikula Acked-by: Linus Walleij --- drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- drivers/i2c/busses/i2c-at91-master.c | 2 +- drivers/i2c/busses/i2c-at91-slave.c | 8 ++++---- drivers/i2c/busses/i2c-axxia.c | 10 +++++----- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-designware-master.c | 2 +- drivers/i2c/busses/i2c-designware-slave.c | 8 ++++---- drivers/i2c/busses/i2c-diolan-u2c.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 4 ++-- drivers/i2c/busses/i2c-gxp.c | 12 ++++++------ drivers/i2c/busses/i2c-hisi.c | 4 ++-- drivers/i2c/busses/i2c-img-scb.c | 2 +- drivers/i2c/busses/i2c-imx.c | 12 ++++++------ drivers/i2c/busses/i2c-jz4780.c | 2 +- drivers/i2c/busses/i2c-kempld.c | 2 +- drivers/i2c/busses/i2c-meson.c | 4 ++-- drivers/i2c/busses/i2c-mlxbf.c | 8 ++++---- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-nomadik.c | 2 +- drivers/i2c/busses/i2c-npcm7xx.c | 12 ++++++------ drivers/i2c/busses/i2c-nvidia-gpu.c | 4 ++-- drivers/i2c/busses/i2c-ocores.c | 8 ++++---- drivers/i2c/busses/i2c-octeon-platdrv.c | 2 +- drivers/i2c/busses/i2c-omap.c | 4 ++-- drivers/i2c/busses/i2c-opal.c | 4 ++-- drivers/i2c/busses/i2c-pasemi-core.c | 2 +- drivers/i2c/busses/i2c-pnx.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 12 ++++++------ drivers/i2c/busses/i2c-qcom-cci.c | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 2 +- drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +- drivers/i2c/busses/i2c-rzv2m.c | 8 ++++---- drivers/i2c/busses/i2c-s3c2410.c | 4 ++-- drivers/i2c/busses/i2c-stm32f7.c | 14 +++++++------- drivers/i2c/busses/i2c-tegra-bpmp.c | 4 ++-- drivers/i2c/busses/i2c-tegra.c | 4 ++-- drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +- drivers/i2c/busses/i2c-virtio.c | 2 +- drivers/i2c/busses/i2c-wmt.c | 2 +- drivers/i2c/busses/i2c-xiic.c | 2 +- 41 files changed, 95 insertions(+), 95 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c-amd-mp2-plat.c index 112fe2bc5662..eb47de29ec90 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-plat.c +++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c @@ -179,7 +179,7 @@ static u32 i2c_amd_func(struct i2c_adapter *a) } static const struct i2c_algorithm i2c_amd_algorithm = { - .master_xfer = i2c_amd_xfer, + .xfer = i2c_amd_xfer, .functionality = i2c_amd_func, }; diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c index d311981d3e60..56223eee7755 100644 --- a/drivers/i2c/busses/i2c-at91-master.c +++ b/drivers/i2c/busses/i2c-at91-master.c @@ -739,7 +739,7 @@ static u32 at91_twi_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm at91_twi_algorithm = { - .master_xfer = at91_twi_xfer, + .xfer = at91_twi_xfer, .functionality = at91_twi_func, }; diff --git a/drivers/i2c/busses/i2c-at91-slave.c b/drivers/i2c/busses/i2c-at91-slave.c index d6eeea5166c0..00234bf776ab 100644 --- a/drivers/i2c/busses/i2c-at91-slave.c +++ b/drivers/i2c/busses/i2c-at91-slave.c @@ -62,7 +62,7 @@ static irqreturn_t atmel_twi_interrupt_slave(int irq, void *dev_id) return IRQ_HANDLED; } -static int at91_reg_slave(struct i2c_client *slave) +static int at91_reg_target(struct i2c_client *slave) { struct at91_twi_dev *dev = i2c_get_adapdata(slave->adapter); @@ -86,7 +86,7 @@ static int at91_reg_slave(struct i2c_client *slave) return 0; } -static int at91_unreg_slave(struct i2c_client *slave) +static int at91_unreg_target(struct i2c_client *slave) { struct at91_twi_dev *dev = i2c_get_adapdata(slave->adapter); @@ -111,8 +111,8 @@ static u32 at91_twi_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm at91_twi_algorithm_slave = { - .reg_slave = at91_reg_slave, - .unreg_slave = at91_unreg_slave, + .reg_target = at91_reg_target, + .unreg_target = at91_unreg_target, .functionality = at91_twi_func, }; diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c index a66f7f67b3b8..19545a44dbc9 100644 --- a/drivers/i2c/busses/i2c-axxia.c +++ b/drivers/i2c/busses/i2c-axxia.c @@ -673,7 +673,7 @@ static u32 axxia_i2c_func(struct i2c_adapter *adap) return caps; } -static int axxia_i2c_reg_slave(struct i2c_client *slave) +static int axxia_i2c_reg_target(struct i2c_client *slave) { struct axxia_i2c_dev *idev = i2c_get_adapdata(slave->adapter); u32 slv_int_mask = SLV_STATUS_RFH; @@ -705,7 +705,7 @@ static int axxia_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int axxia_i2c_unreg_slave(struct i2c_client *slave) +static int axxia_i2c_unreg_target(struct i2c_client *slave) { struct axxia_i2c_dev *idev = i2c_get_adapdata(slave->adapter); @@ -721,10 +721,10 @@ static int axxia_i2c_unreg_slave(struct i2c_client *slave) } static const struct i2c_algorithm axxia_i2c_algo = { - .master_xfer = axxia_i2c_xfer, + .xfer = axxia_i2c_xfer, .functionality = axxia_i2c_func, - .reg_slave = axxia_i2c_reg_slave, - .unreg_slave = axxia_i2c_unreg_slave, + .reg_target = axxia_i2c_reg_target, + .unreg_target = axxia_i2c_unreg_target, }; static const struct i2c_adapter_quirks axxia_i2c_quirks = { diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 2737fd8abd32..4cd6a364aa3b 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -235,7 +235,7 @@ static u32 ec_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm ec_i2c_algorithm = { - .master_xfer = ec_i2c_xfer, + .xfer = ec_i2c_xfer, .functionality = ec_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index c7e56002809a..14c61b31f877 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -832,7 +832,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) } static const struct i2c_algorithm i2c_dw_algo = { - .master_xfer = i2c_dw_xfer, + .xfer = i2c_dw_xfer, .functionality = i2c_dw_func, }; diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c index 2e079cf20bb5..b47ad6b16814 100644 --- a/drivers/i2c/busses/i2c-designware-slave.c +++ b/drivers/i2c/busses/i2c-designware-slave.c @@ -58,7 +58,7 @@ static int i2c_dw_init_slave(struct dw_i2c_dev *dev) return 0; } -static int i2c_dw_reg_slave(struct i2c_client *slave) +static int i2c_dw_reg_target(struct i2c_client *slave) { struct dw_i2c_dev *dev = i2c_get_adapdata(slave->adapter); @@ -83,7 +83,7 @@ static int i2c_dw_reg_slave(struct i2c_client *slave) return 0; } -static int i2c_dw_unreg_slave(struct i2c_client *slave) +static int i2c_dw_unreg_target(struct i2c_client *slave) { struct dw_i2c_dev *dev = i2c_get_adapdata(slave->adapter); @@ -214,8 +214,8 @@ static irqreturn_t i2c_dw_isr_slave(int this_irq, void *dev_id) static const struct i2c_algorithm i2c_dw_algo = { .functionality = i2c_dw_func, - .reg_slave = i2c_dw_reg_slave, - .unreg_slave = i2c_dw_unreg_slave, + .reg_target = i2c_dw_reg_target, + .unreg_target = i2c_dw_unreg_target, }; void i2c_dw_configure_slave(struct dw_i2c_dev *dev) diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c index b48b7888936f..c02459405b26 100644 --- a/drivers/i2c/busses/i2c-diolan-u2c.c +++ b/drivers/i2c/busses/i2c-diolan-u2c.c @@ -414,7 +414,7 @@ static u32 diolan_usb_func(struct i2c_adapter *a) } static const struct i2c_algorithm diolan_usb_algorithm = { - .master_xfer = diolan_usb_xfer, + .xfer = diolan_usb_xfer, .functionality = diolan_usb_func, }; diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 385ef9d9e4d4..eda5f06b158d 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -852,8 +852,8 @@ static u32 exynos5_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm exynos5_i2c_algorithm = { - .master_xfer = exynos5_i2c_xfer, - .master_xfer_atomic = exynos5_i2c_xfer_atomic, + .xfer = exynos5_i2c_xfer, + .xfer_atomic = exynos5_i2c_xfer_atomic, .functionality = exynos5_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-gxp.c b/drivers/i2c/busses/i2c-gxp.c index efafc0528c44..9cd29c096fe4 100644 --- a/drivers/i2c/busses/i2c-gxp.c +++ b/drivers/i2c/busses/i2c-gxp.c @@ -110,7 +110,7 @@ static void gxp_i2c_start(struct gxp_i2c_drvdata *drvdata) writew(value, drvdata->base + GXP_I2CMCMD); } -static int gxp_i2c_master_xfer(struct i2c_adapter *adapter, +static int gxp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num) { int ret; @@ -148,7 +148,7 @@ static u32 gxp_i2c_func(struct i2c_adapter *adap) } #if IS_ENABLED(CONFIG_I2C_SLAVE) -static int gxp_i2c_reg_slave(struct i2c_client *slave) +static int gxp_i2c_reg_target(struct i2c_client *slave) { struct gxp_i2c_drvdata *drvdata = i2c_get_adapdata(slave->adapter); @@ -167,7 +167,7 @@ static int gxp_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int gxp_i2c_unreg_slave(struct i2c_client *slave) +static int gxp_i2c_unreg_target(struct i2c_client *slave) { struct gxp_i2c_drvdata *drvdata = i2c_get_adapdata(slave->adapter); @@ -184,11 +184,11 @@ static int gxp_i2c_unreg_slave(struct i2c_client *slave) #endif static const struct i2c_algorithm gxp_i2c_algo = { - .master_xfer = gxp_i2c_master_xfer, + .xfer = gxp_i2c_xfer, .functionality = gxp_i2c_func, #if IS_ENABLED(CONFIG_I2C_SLAVE) - .reg_slave = gxp_i2c_reg_slave, - .unreg_slave = gxp_i2c_unreg_slave, + .reg_target = gxp_i2c_reg_target, + .unreg_target = gxp_i2c_unreg_target, #endif }; diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index 975c0b1c44de..26072cef8e6e 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -197,7 +197,7 @@ static void hisi_i2c_reset_xfer(struct hisi_i2c_controller *ctlr) * wait for the transfer done. The major transfer process is performed * in the IRQ handler. */ -static int hisi_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +static int hisi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct hisi_i2c_controller *ctlr = i2c_get_adapdata(adap); @@ -236,7 +236,7 @@ static u32 hisi_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm hisi_i2c_algo = { - .master_xfer = hisi_i2c_master_xfer, + .xfer = hisi_i2c_xfer, .functionality = hisi_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c index f9d4bfef511c..89833330ec25 100644 --- a/drivers/i2c/busses/i2c-img-scb.c +++ b/drivers/i2c/busses/i2c-img-scb.c @@ -1146,7 +1146,7 @@ static u32 img_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm img_i2c_algo = { - .master_xfer = img_i2c_xfer, + .xfer = img_i2c_xfer, .functionality = img_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 3842e527116b..3609d9889304 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -857,7 +857,7 @@ static void i2c_imx_slave_init(struct imx_i2c_struct *i2c_imx) i2c_imx_enable_bus_idle(i2c_imx); } -static int i2c_imx_reg_slave(struct i2c_client *client) +static int i2c_imx_reg_target(struct i2c_client *client) { struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(client->adapter); int ret; @@ -880,7 +880,7 @@ static int i2c_imx_reg_slave(struct i2c_client *client) return 0; } -static int i2c_imx_unreg_slave(struct i2c_client *client) +static int i2c_imx_unreg_target(struct i2c_client *client) { struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(client->adapter); int ret; @@ -1386,11 +1386,11 @@ static u32 i2c_imx_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm i2c_imx_algo = { - .master_xfer = i2c_imx_xfer, - .master_xfer_atomic = i2c_imx_xfer_atomic, + .xfer = i2c_imx_xfer, + .xfer_atomic = i2c_imx_xfer_atomic, .functionality = i2c_imx_func, - .reg_slave = i2c_imx_reg_slave, - .unreg_slave = i2c_imx_unreg_slave, + .reg_target = i2c_imx_reg_target, + .unreg_target = i2c_imx_unreg_target, }; static int i2c_imx_probe(struct platform_device *pdev) diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c index 55035cca0ae5..6d2c54982bca 100644 --- a/drivers/i2c/busses/i2c-jz4780.c +++ b/drivers/i2c/busses/i2c-jz4780.c @@ -730,7 +730,7 @@ static u32 jz4780_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm jz4780_i2c_algorithm = { - .master_xfer = jz4780_i2c_xfer, + .xfer = jz4780_i2c_xfer, .functionality = jz4780_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index c3a529a73b5b..4fd799740242 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -276,7 +276,7 @@ static u32 kempld_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm kempld_i2c_algorithm = { - .master_xfer = kempld_i2c_xfer, + .xfer = kempld_i2c_xfer, .functionality = kempld_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index c7b203cc4434..f5505904aa23 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -448,8 +448,8 @@ static u32 meson_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm meson_i2c_algorithm = { - .master_xfer = meson_i2c_xfer, - .master_xfer_atomic = meson_i2c_xfer_atomic, + .xfer = meson_i2c_xfer, + .xfer_atomic = meson_i2c_xfer_atomic, .functionality = meson_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c index b3a73921ab69..cbf5e87ce6e8 100644 --- a/drivers/i2c/busses/i2c-mlxbf.c +++ b/drivers/i2c/busses/i2c-mlxbf.c @@ -2152,7 +2152,7 @@ static s32 mlxbf_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, return mlxbf_i2c_smbus_start_transaction(priv, &request); } -static int mlxbf_i2c_reg_slave(struct i2c_client *slave) +static int mlxbf_i2c_reg_target(struct i2c_client *slave) { struct mlxbf_i2c_priv *priv = i2c_get_adapdata(slave->adapter); struct device *dev = &slave->dev; @@ -2174,7 +2174,7 @@ static int mlxbf_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int mlxbf_i2c_unreg_slave(struct i2c_client *slave) +static int mlxbf_i2c_unreg_target(struct i2c_client *slave) { struct mlxbf_i2c_priv *priv = i2c_get_adapdata(slave->adapter); struct device *dev = &slave->dev; @@ -2232,8 +2232,8 @@ static struct mlxbf_i2c_chip_info mlxbf_i2c_chip[] = { static const struct i2c_algorithm mlxbf_i2c_algo = { .smbus_xfer = mlxbf_i2c_smbus_xfer, .functionality = mlxbf_i2c_functionality, - .reg_slave = mlxbf_i2c_reg_slave, - .unreg_slave = mlxbf_i2c_unreg_slave, + .reg_target = mlxbf_i2c_reg_target, + .unreg_target = mlxbf_i2c_unreg_target, }; static struct i2c_adapter_quirks mlxbf_i2c_quirks = { diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index a8b5719c3372..4c67f5f94f11 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -1345,7 +1345,7 @@ static u32 mtk_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm mtk_i2c_algorithm = { - .master_xfer = mtk_i2c_transfer, + .xfer = mtk_i2c_transfer, .functionality = mtk_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 36def0a9c95c..955d275676d1 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -687,7 +687,7 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id) } static const struct i2c_algorithm mxs_i2c_algo = { - .master_xfer = mxs_i2c_xfer, + .xfer = mxs_i2c_xfer, .functionality = mxs_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index b10574d42b7a..41cded3b017e 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -934,7 +934,7 @@ static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm nmk_i2c_algo = { - .master_xfer = nmk_i2c_xfer, + .xfer = nmk_i2c_xfer, .functionality = nmk_i2c_functionality }; diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 2fe68615942e..6259cd70939e 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -1257,7 +1257,7 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) return IRQ_HANDLED; } -static int npcm_i2c_reg_slave(struct i2c_client *client) +static int npcm_i2c_reg_target(struct i2c_client *client) { unsigned long lock_flags; struct npcm_i2c *bus = i2c_get_adapdata(client->adapter); @@ -1290,7 +1290,7 @@ static int npcm_i2c_reg_slave(struct i2c_client *client) return 0; } -static int npcm_i2c_unreg_slave(struct i2c_client *client) +static int npcm_i2c_unreg_target(struct i2c_client *client) { struct npcm_i2c *bus = client->adapter->algo_data; unsigned long lock_flags; @@ -2075,7 +2075,7 @@ static bool npcm_i2c_master_start_xmit(struct npcm_i2c *bus, return true; } -static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +static int npcm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct npcm_i2c *bus = container_of(adap, struct npcm_i2c, adap); @@ -2238,11 +2238,11 @@ static const struct i2c_adapter_quirks npcm_i2c_quirks = { }; static const struct i2c_algorithm npcm_i2c_algo = { - .master_xfer = npcm_i2c_master_xfer, + .xfer = npcm_i2c_xfer, .functionality = npcm_i2c_functionality, #if IS_ENABLED(CONFIG_I2C_SLAVE) - .reg_slave = npcm_i2c_reg_slave, - .unreg_slave = npcm_i2c_unreg_slave, + .reg_target = npcm_i2c_reg_target, + .unreg_target = npcm_i2c_unreg_target, #endif }; diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 26622d24bb1b..6d5329d6ddd8 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -163,7 +163,7 @@ static int gpu_i2c_write(struct gpu_i2c_dev *i2cd, u8 data) return gpu_i2c_check_status(i2cd); } -static int gpu_i2c_master_xfer(struct i2c_adapter *adap, +static int gpu_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct gpu_i2c_dev *i2cd = i2c_get_adapdata(adap); @@ -234,7 +234,7 @@ static u32 gpu_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm gpu_i2c_algorithm = { - .master_xfer = gpu_i2c_master_xfer, + .xfer = gpu_i2c_xfer, .functionality = gpu_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index e106af83cef4..17551d33d5b0 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -455,8 +455,8 @@ static u32 ocores_func(struct i2c_adapter *adap) } static struct i2c_algorithm ocores_algorithm = { - .master_xfer = ocores_xfer, - .master_xfer_atomic = ocores_xfer_polling, + .xfer = ocores_xfer, + .xfer_atomic = ocores_xfer_polling, .functionality = ocores_func, }; @@ -689,13 +689,13 @@ static int ocores_i2c_probe(struct platform_device *pdev) } if (irq == -ENXIO) { - ocores_algorithm.master_xfer = ocores_xfer_polling; + ocores_algorithm.xfer = ocores_xfer_polling; } else { if (irq < 0) return irq; } - if (ocores_algorithm.master_xfer != ocores_xfer_polling) { + if (ocores_algorithm.xfer != ocores_xfer_polling) { ret = devm_request_any_context_irq(&pdev->dev, irq, ocores_isr, 0, pdev->name, i2c); diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c index 7d54b3203f71..dc6dff95c68c 100644 --- a/drivers/i2c/busses/i2c-octeon-platdrv.c +++ b/drivers/i2c/busses/i2c-octeon-platdrv.c @@ -122,7 +122,7 @@ static u32 octeon_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm octeon_i2c_algo = { - .master_xfer = octeon_i2c_xfer, + .xfer = octeon_i2c_xfer, .functionality = octeon_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 42165ef57946..3b9ae8e522e2 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1212,8 +1212,8 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) } static const struct i2c_algorithm omap_i2c_algo = { - .master_xfer = omap_i2c_xfer_irq, - .master_xfer_atomic = omap_i2c_xfer_polling, + .xfer = omap_i2c_xfer_irq, + .xfer_atomic = omap_i2c_xfer_polling, .functionality = omap_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-opal.c b/drivers/i2c/busses/i2c-opal.c index 17ef87d50f7c..b6640d8e77af 100644 --- a/drivers/i2c/busses/i2c-opal.c +++ b/drivers/i2c/busses/i2c-opal.c @@ -70,7 +70,7 @@ static int i2c_opal_send_request(u32 bus_id, struct opal_i2c_request *req) return rc; } -static int i2c_opal_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +static int i2c_opal_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { unsigned long opal_id = (unsigned long)adap->algo_data; @@ -179,7 +179,7 @@ static u32 i2c_opal_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm i2c_opal_algo = { - .master_xfer = i2c_opal_master_xfer, + .xfer = i2c_opal_xfer, .smbus_xfer = i2c_opal_smbus_xfer, .functionality = i2c_opal_func, }; diff --git a/drivers/i2c/busses/i2c-pasemi-core.c b/drivers/i2c/busses/i2c-pasemi-core.c index bd8becbdeeb2..b07bf8286a47 100644 --- a/drivers/i2c/busses/i2c-pasemi-core.c +++ b/drivers/i2c/busses/i2c-pasemi-core.c @@ -336,7 +336,7 @@ static u32 pasemi_smb_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm smbus_algorithm = { - .master_xfer = pasemi_i2c_xfer, + .xfer = pasemi_i2c_xfer, .smbus_xfer = pasemi_smb_xfer, .functionality = pasemi_smb_func, }; diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index a12525b3186b..e31ac2dbbd7b 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -609,7 +609,7 @@ static u32 i2c_pnx_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm pnx_algorithm = { - .master_xfer = i2c_pnx_xfer, + .xfer = i2c_pnx_xfer, .functionality = i2c_pnx_func, }; diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 76f79b68cef8..474abc4f5784 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1154,11 +1154,11 @@ static u32 i2c_pxa_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm i2c_pxa_algorithm = { - .master_xfer = i2c_pxa_xfer, + .xfer = i2c_pxa_xfer, .functionality = i2c_pxa_functionality, #ifdef CONFIG_I2C_PXA_SLAVE - .reg_slave = i2c_pxa_slave_reg, - .unreg_slave = i2c_pxa_slave_unreg, + .reg_target = i2c_pxa_slave_reg, + .unreg_target = i2c_pxa_slave_unreg, #endif }; @@ -1244,11 +1244,11 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap, } static const struct i2c_algorithm i2c_pxa_pio_algorithm = { - .master_xfer = i2c_pxa_pio_xfer, + .xfer = i2c_pxa_pio_xfer, .functionality = i2c_pxa_functionality, #ifdef CONFIG_I2C_PXA_SLAVE - .reg_slave = i2c_pxa_slave_reg, - .unreg_slave = i2c_pxa_slave_unreg, + .reg_target = i2c_pxa_slave_reg, + .unreg_target = i2c_pxa_slave_unreg, #endif }; diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c index 414882c57d7f..d8d6d99dd4e7 100644 --- a/drivers/i2c/busses/i2c-qcom-cci.c +++ b/drivers/i2c/busses/i2c-qcom-cci.c @@ -463,7 +463,7 @@ static u32 cci_func(struct i2c_adapter *adap) } static const struct i2c_algorithm cci_algo = { - .master_xfer = cci_xfer, + .xfer = cci_xfer, .functionality = cci_func, }; diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index da94df466e83..337a80089f43 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -715,7 +715,7 @@ static u32 geni_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm geni_i2c_algo = { - .master_xfer = geni_i2c_xfer, + .xfer = geni_i2c_xfer, .functionality = geni_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-robotfuzz-osif.c b/drivers/i2c/busses/i2c-robotfuzz-osif.c index 66dfa211e736..40985a38bec0 100644 --- a/drivers/i2c/busses/i2c-robotfuzz-osif.c +++ b/drivers/i2c/busses/i2c-robotfuzz-osif.c @@ -112,7 +112,7 @@ static u32 osif_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm osif_algorithm = { - .master_xfer = osif_xfer, + .xfer = osif_xfer, .functionality = osif_func, }; diff --git a/drivers/i2c/busses/i2c-rzv2m.c b/drivers/i2c/busses/i2c-rzv2m.c index b0bfc96b9ede..60aa0a4e4247 100644 --- a/drivers/i2c/busses/i2c-rzv2m.c +++ b/drivers/i2c/busses/i2c-rzv2m.c @@ -321,7 +321,7 @@ static int rzv2m_i2c_stop_condition(struct rzv2m_i2c_priv *priv) 100, jiffies_to_usecs(priv->adap.timeout)); } -static int rzv2m_i2c_master_xfer_msg(struct rzv2m_i2c_priv *priv, +static int rzv2m_i2c_xfer_msg(struct rzv2m_i2c_priv *priv, struct i2c_msg *msg, int stop) { unsigned int count = 0; @@ -351,7 +351,7 @@ static int rzv2m_i2c_master_xfer_msg(struct rzv2m_i2c_priv *priv, return ret; } -static int rzv2m_i2c_master_xfer(struct i2c_adapter *adap, +static int rzv2m_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct rzv2m_i2c_priv *priv = i2c_get_adapdata(adap); @@ -370,7 +370,7 @@ static int rzv2m_i2c_master_xfer(struct i2c_adapter *adap, /* I2C main transfer */ for (i = 0; i < num; i++) { - ret = rzv2m_i2c_master_xfer_msg(priv, &msgs[i], i == (num - 1)); + ret = rzv2m_i2c_xfer_msg(priv, &msgs[i], i == (num - 1)); if (ret < 0) goto out; } @@ -408,7 +408,7 @@ static const struct i2c_adapter_quirks rzv2m_i2c_quirks = { }; static struct i2c_algorithm rzv2m_i2c_algo = { - .master_xfer = rzv2m_i2c_master_xfer, + .xfer = rzv2m_i2c_xfer, .functionality = rzv2m_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 275f7c42165c..29f5fef39b54 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -800,8 +800,8 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap) /* i2c bus registration info */ static const struct i2c_algorithm s3c24xx_i2c_algorithm = { - .master_xfer = s3c24xx_i2c_xfer, - .master_xfer_atomic = s3c24xx_i2c_xfer_atomic, + .xfer = s3c24xx_i2c_xfer, + .xfer_atomic = s3c24xx_i2c_xfer_atomic, .functionality = s3c24xx_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index 01210452216b..6ecaafc700bc 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -1065,7 +1065,7 @@ static int stm32f7_i2c_smbus_xfer_msg(struct stm32f7_i2c_dev *i2c_dev, f7_msg->read_write = I2C_SMBUS_READ; break; case I2C_SMBUS_I2C_BLOCK_DATA: - /* Rely on emulated i2c transfer (through master_xfer) */ + /* Rely on emulated i2c transfer (through xfer) */ return -EOPNOTSUPP; default: dev_err(dev, "Unsupported smbus protocol %d\n", f7_msg->size); @@ -1888,7 +1888,7 @@ static void stm32f7_i2c_enable_wakeup(struct stm32f7_i2c_dev *i2c_dev, } } -static int stm32f7_i2c_reg_slave(struct i2c_client *slave) +static int stm32f7_i2c_reg_target(struct i2c_client *slave) { struct stm32f7_i2c_dev *i2c_dev = i2c_get_adapdata(slave->adapter); void __iomem *base = i2c_dev->base; @@ -1978,7 +1978,7 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave) return ret; } -static int stm32f7_i2c_unreg_slave(struct i2c_client *slave) +static int stm32f7_i2c_unreg_target(struct i2c_client *slave) { struct stm32f7_i2c_dev *i2c_dev = i2c_get_adapdata(slave->adapter); void __iomem *base = i2c_dev->base; @@ -2151,12 +2151,12 @@ static u32 stm32f7_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm stm32f7_i2c_algo = { - .master_xfer = stm32f7_i2c_xfer, - .master_xfer_atomic = stm32f7_i2c_xfer_atomic, + .xfer = stm32f7_i2c_xfer, + .xfer_atomic = stm32f7_i2c_xfer_atomic, .smbus_xfer = stm32f7_i2c_smbus_xfer, .functionality = stm32f7_i2c_func, - .reg_slave = stm32f7_i2c_reg_slave, - .unreg_slave = stm32f7_i2c_unreg_slave, + .reg_target = stm32f7_i2c_reg_target, + .unreg_target = stm32f7_i2c_unreg_target, }; static int stm32f7_i2c_probe(struct platform_device *pdev) diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c index b0840fa0f53e..dabadbcc6d6a 100644 --- a/drivers/i2c/busses/i2c-tegra-bpmp.c +++ b/drivers/i2c/busses/i2c-tegra-bpmp.c @@ -275,8 +275,8 @@ static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm tegra_bpmp_i2c_algo = { - .master_xfer = tegra_bpmp_i2c_xfer, - .master_xfer_atomic = tegra_bpmp_i2c_xfer_atomic, + .xfer = tegra_bpmp_i2c_xfer, + .xfer_atomic = tegra_bpmp_i2c_xfer_atomic, .functionality = tegra_bpmp_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 920d5a8cbf4c..861b1c9e2627 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1437,8 +1437,8 @@ static u32 tegra_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm tegra_i2c_algo = { - .master_xfer = tegra_i2c_xfer, - .master_xfer_atomic = tegra_i2c_xfer_atomic, + .xfer = tegra_i2c_xfer, + .xfer_atomic = tegra_i2c_xfer_atomic, .functionality = tegra_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index a77cd86fe75e..de325c8e18f3 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -71,7 +71,7 @@ static u32 thunderx_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm thunderx_i2c_algo = { - .master_xfer = octeon_i2c_xfer, + .xfer = octeon_i2c_xfer, .functionality = thunderx_i2c_functionality, }; diff --git a/drivers/i2c/busses/i2c-virtio.c b/drivers/i2c/busses/i2c-virtio.c index c60ae531ba57..52ba1e0845ca 100644 --- a/drivers/i2c/busses/i2c-virtio.c +++ b/drivers/i2c/busses/i2c-virtio.c @@ -183,7 +183,7 @@ static u32 virtio_i2c_func(struct i2c_adapter *adap) } static struct i2c_algorithm virtio_algorithm = { - .master_xfer = virtio_i2c_xfer, + .xfer = virtio_i2c_xfer, .functionality = virtio_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c index 198afee5233c..05ff6228c2dd 100644 --- a/drivers/i2c/busses/i2c-wmt.c +++ b/drivers/i2c/busses/i2c-wmt.c @@ -269,7 +269,7 @@ static u32 wmt_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm wmt_i2c_algo = { - .master_xfer = wmt_i2c_xfer, + .xfer = wmt_i2c_xfer, .functionality = wmt_i2c_func, }; diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 71391b590ada..7ff36df7319e 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -1193,7 +1193,7 @@ static u32 xiic_func(struct i2c_adapter *adap) } static const struct i2c_algorithm xiic_algorithm = { - .master_xfer = xiic_xfer, + .xfer = xiic_xfer, .functionality = xiic_func, };