From patchwork Sat Jul 6 11:20: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: 811309 Received: from mail.zeus03.de (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 F08DA58ABF for ; Sat, 6 Jul 2024 11:21:36 +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=1720264898; cv=none; b=D6Hm0gcvz/LmX6R7Xu33W+N9FuKN6c0DLNNJZ308GxCv2mXI3RWxr84AMIpFlvEsHRsCYjv56vkysO6MzBaU8tVXoHT5AYxWVqMUmxBI15/EHS0U+OEIH5LCgMlSIsEDDRpnDhUUgbUSqWdlySoU1CNLd+2f0dnzVW8CNoNtua8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264898; c=relaxed/simple; bh=sWoU++v9Gc2dEBG7BvUyollpPzX0E36KZU276jD4GrU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UnMYM1pIZpV0TO2DbA3gWcU87VyrzJGP+ye9pasByOyHlwhMwmsLrrETHr63KEPrr7NXtls9sqQ6DiUW7/ZWMyXvy34zusm6/ck58abj7UUOEPDAhNDGoxKkyVhkXMyU0npJPU+LMfmqCN4/PbiqsRXhoYb7Gx6c/4CutPgCpoo= 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=FJixzpFY; 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="FJixzpFY" 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=UjHQHh6n+8mUVCxVPcEkDo35gh9CZBnM7AGM4eQcL7c=; b=FJixzp FYytWbBblVzHg2D/qLGwWYiGO7SGFD7o9ncvJVaR0qb3ammBPtzUJHCB2vgZA15A CKtQ2524iFOUqzff4ZBrLS/Qttw56mQBPyw+DpCBri495lmSV/+SGN0FuMeCc8xh Oa+QxbZ8337kLuMh0Yh6W8M1YPDyVfBUdd6ess6O5DF2YIigwS6F60f3A9HkLvWY Q9PUGHW0AuoeJrA4k9ct0dg+FSJAH2yJg2xdRdubR0tRmZ7wbALVbI3aPIYTNyRy BDo9ewuDf/2xsG7y9dbXQNCBLWRsuldZAvLEAraj6DRhAgm8X1uJFLDQVKRJLCaG pG+R85diz1aq7wDg== Received: (qmail 3809445 invoked from network); 6 Jul 2024 13:21:22 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:22 +0200 X-UD-Smtp-Session: l3s3148p1@tQA9YZIcrNJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 01/60] i2c: reword i2c_algorithm according to newest specification Date: Sat, 6 Jul 2024 13:20:01 +0200 Message-ID: <20240706112116.24543-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 and SMBus 3.2 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 424acb98c7c2..9d45b7b912dd 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 Sat Jul 6 11:20: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: 811012 Received: from mail.zeus03.de (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 B471077101 for ; Sat, 6 Jul 2024 11:21: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=1720264899; cv=none; b=DaCREZ2sbL9lOWJXt543HxCGgUhNtnzpr3kGunBW+xZHFR6ldHM/RtvHyCtEZRjRvuVRT2rsuJaNCLsNOXWZh+eDruvXRIk/hRm4O5lFDGYmDJd/qKru2WLJi7Ll0BYiQTMB2I78SapLyQ0PUbuXYRGupGm/7FNEniM7YmjNST4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264899; c=relaxed/simple; bh=qGjn/9vTh/gZgy0r2AUJ6EZ66gGJ5gA1BuXG36z44Wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMBWBuYQgFDWYQABChTh5lemNmGbnBrmJuduGuUteYrNffxWLYX6gwmu36CpDL3gOQKXLPnPOFxWaGpoG+rnjy38i6THy8E+7m8I4NS6UE0IomeswqzsDFgHX2lG+6NxtbXClEBLoGR/UogXN0VmswngMqXorQ0f/BYZLmtyhNk= 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=jhVTylJy; 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="jhVTylJy" 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=wqXQ54qgkglZuSLbby20q12AVh90trs55zU4JL0dlCY=; b=jhVTyl JySgtkBJt6FxOL3C+iiDL6F00t9rwPXqNz3AZvbYKUlmurWl8GzzpBpXuk+48LcO j0pVldoRxKL9fqDLvVNlbnxIm1y2SqGlcAgCKqmC2ryTucvh4asT2xnmE9mSrUcr 0jm6TVOSrB8w4vW/Jg52ZRD7bCpLy8WS5jge7dyLRUTX+xMGnnichBnnxL2Y5IKF +z/kOSMhAT0WMZw1MN7kcA481jYl0Rsiwq2cJy7Z2vBxRdiXNGl1eJ1/oGnOdZog DA8DsGgSf6eEDjfJnKzkFZXV6O75uSkHJuJd4g+NXpKbhXwUr1KhOaXzwdVr99Zr CjRE1K3LfMVOCzWg== Received: (qmail 3809485 invoked from network); 6 Jul 2024 13:21:23 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:23 +0200 X-UD-Smtp-Session: l3s3148p1@gZFMYZIcttJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Jean Delvare , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/60] i2c: ali15x3: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:02 +0200 Message-ID: <20240706112116.24543-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 956e5020d71e..4761c7208102 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 Sat Jul 6 11:20: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: 811308 Received: from mail.zeus03.de (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 1ACFF7764E for ; Sat, 6 Jul 2024 11:21: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=1720264899; cv=none; b=O4XoHnUMirElNKxWO+jQR6mmAXN3MwJN7ychzgZBkL/ixUKN+alOsy6vdEkWEp8qQW2BTfr+w4QfS3tXqHhC0moR45c9+v74eup8gSoBuH+2qqAsRKSXiSiQTvvOBNuEDEZc8ZHnh9AnCOHO5bwnvcsy3skW8/0jgwQroeBnH7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264899; c=relaxed/simple; bh=OX9CjYRsfJ22YYXwzBRTLJyGxtenvozbtleXFhMnIP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A9mVxNVCATgJZTaZQyWzbxQJtkCTVezvdnk7sbTI8r2JX+58kz1JY+L3DJz0zN3WSjfwpniDTS4tjdwZr74FiV6I1rUOOdUCCXmAECMi8KWdHV2C+cZ1dy2yyLfpN3g4j543N+J4zUCWZLCapDD2RrQuTlL2EyWjrwyeksp+LKY= 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=ijjZ2CCp; 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="ijjZ2CCp" 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=+cVn6HCJi9F61+sEb1wYIiiZCk6zR3MKCVcbdGfMsoA=; b=ijjZ2C CpVFTNHD/mz72bK98pUY287VltQbhGcOEdB3mobuPV3XiWokp+6k59EWniRbAihG 102sHRy1IJsvu8ErQ+sfBUlbErtTIetQcTNqim3AC77qJ7CKxEPPqv+9Z92Q0Fac Fjo3w1yrTs65Zs0zjB+75yc667NA0cxGCL23UUmb6LxFeeFLrocWMbtNnixptLb/ TG7KOfbLpymsAYfuNaKrytxqPD1yC8vZ/8dRs25BV+W/Ez+76pFN2c15h0oSDJ58 4+cMhifuvoZBoBwpaCly8akz5E0itiDY+zUWE2F7GSmB9ye82MUtsHvI6UrnrnSq WoAaPZ3alBW92F8Q== Received: (qmail 3809506 invoked from network); 6 Jul 2024 13:21:24 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:24 +0200 X-UD-Smtp-Session: l3s3148p1@18NXYZIcxNJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Thor Thayer , linux-kernel@vger.kernel.org Subject: [PATCH v2 03/60] i2c: altera: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:03 +0200 Message-ID: <20240706112116.24543-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 Sat Jul 6 11:20: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: 811011 Received: from mail.zeus03.de (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 7D3F57D3E2 for ; Sat, 6 Jul 2024 11:21:39 +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=1720264901; cv=none; b=nYU9Rd4fqBIqUeOX6+vmfUUPJyoLf0SHAoQRh2lRbr1Ud3gQKom+ySm08ggG4g7aCKykBQ5H0Qvmm0H1JMyy1We5GQbYule2mTRU7KBqBHEO6ov6ahpEsGrkkJzkQfHVBGG29rDyVdJwq1RPrNMdZo/NXkfj58y1Oj2kk/3HB0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264901; c=relaxed/simple; bh=SsZkd7/wUKCNjap4XGTF3u+PewuEnckoqoHnf1CfVGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZsIBwNOE5UXMGZJ0GDCVs79OLbTTT2kjPnTk5pD/Ym51p7xBj3BxIzz7AXprFyodT+Vr90TcPP1Esjf/4kz1Rhz6nL8AGqiIqPu63OgrjAfmFUlIrN4N4vg0SP7aEUKKnWwMDxZn7jcv+yNddXi11gkaeIDplIXcLjgSrjvsXkE= 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=IAdTkFFw; 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="IAdTkFFw" 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=Z/gR8NXtX5QcB96VIv6XVRelpEFREJaI1Em8IfJabs0=; b=IAdTkF Fw2pTebfAREEvpWowgJyf6To7rPDxoGi281TDKYnp0fwsnzREfuzpRof0rbhD6n/ CT7JKqclZsP4GxHvHN+V23scqHfER6Wsvo5appkt7rldve74re+gZz7AgOwamok+ GAi9qvAjZ8397KviBPm9jzPtqGPI+0notEPEkiSaowom58+7v/vMIAWGwKNqdn4D Ma0H01ZrHPmf8/Wes4OzbPshS/IQNB5/vxrwo0SDLsk4CioAMtypHI9f6hmCi6Ic nc7n9o+vqyNoktip+DvO3PcRc9epCxh/kpe4kZhZ6F9qiqVc94KMKW0SV5BfVIn9 GBWpsCrpO+e8O7Qw== Received: (qmail 3809530 invoked from network); 6 Jul 2024 13:21:25 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:25 +0200 X-UD-Smtp-Session: l3s3148p1@xQRjYZIcxtJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 04/60] i2c: au1550: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:04 +0200 Message-ID: <20240706112116.24543-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-au1550.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 8e43f25c117e..902e420e761e 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -81,11 +81,10 @@ static int wait_ack(struct i2c_au1550_data *adap) return 0; } -static int wait_master_done(struct i2c_au1550_data *adap) +static int wait_controller_done(struct i2c_au1550_data *adap) { int i; - /* Wait for Master Done. */ for (i = 0; i < 2 * adap->xfer_timeout; i++) { if ((RD(adap, PSC_SMBEVNT) & PSC_SMBEVNT_MD) != 0) return 0; @@ -120,12 +119,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 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_controller_done(adap) : 0; } static int wait_for_rx_byte(struct i2c_au1550_data *adap, unsigned char *out) @@ -175,7 +174,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_controller_done(adap)) return -EIO; buf[i] = (unsigned char)(RD(adap, PSC_SMBTXRX) & 0xff); @@ -204,7 +203,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_controller_done(adap)) return -EIO; return 0; } @@ -246,8 +245,8 @@ static u32 au1550_func(struct i2c_adapter *adap) } static const struct i2c_algorithm au1550_algo = { - .master_xfer = au1550_xfer, - .functionality = au1550_func, + .xfer = au1550_xfer, + .functionality = au1550_func, }; static void i2c_au1550_setup(struct i2c_au1550_data *priv) From patchwork Sat Jul 6 11:20: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: 811307 Received: from mail.zeus03.de (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 BFB95127E0D for ; Sat, 6 Jul 2024 11:21:40 +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=1720264902; cv=none; b=GdC00LVb76fhCPX7LdEyUtAE2xCRhnoCFtJLfNEaCvdfcUnOCTqcFIQNA80R9cpQ5H9sU7VWie8Tm/y1I68tQPOwPU5pEuBqXhBUfn4jUi9YtVSlbH+atLq/HWV+PWzp7clgaOoP7Wv/Ertq6IyJ5LX/UQt0irMU5halqlmiQv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264902; c=relaxed/simple; bh=R3ERekSmwO8UxRD5OZgnmyUxVuR60ld5jYHEFvD7Ols=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l874sB0V7bbAC6DJ/6J0BOlNir0ZZfWzdciebece5IDSdmlcARnw5k12MqWuHXcDaAcBLa0DJIusBxASUpTkTek4Qg2wzg8lziG2M6lHqT5YWhc8L4Pt3ZsqR+w0clfyFqJCclevCztenlNT2v8v0/RCYKIM9rbcQH9semD39wI= 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=hC7cMulZ; 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="hC7cMulZ" 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=wHzq1UCnJh9pa5kOBbvthE0Pf+Oc7V69Wus2sqqvdAQ=; b=hC7cMu lZ8TDaLtArdgwe7QQvB2qC0p0WdQ3dAtLtuM3r7qBuN7HMyVTfGkNn4NVfigVu8b QG49tPsmiCRgc+h7XWkBzwAAc3IRzJVvq7Exx7A2Co1ZIAdieP1Evok6yr2l8plO HDyqqynbfm23frTfCmRRcqpDIrwoBGj2s+t+V7ZEqiMo3Ju/JdV9mM2i6QG5a4iJ bW0XtmbA9BXNqp9STPp3AyNmcjniaoIrJ6329Eji8W/TMHtXgYpLG6xh98FdizNA cyeVXeSn9hwpoJ4MzUaUB49QRlhIMIiLxYlYzCoLXHfbP4UO242w98ii8x8ZVSUq HJRj7by6qLe4lAvA== Received: (qmail 3809563 invoked from network); 6 Jul 2024 13:21:25 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:25 +0200 X-UD-Smtp-Session: l3s3148p1@7V1tYZIcSpBQT+F6 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 v2 05/60] i2c: bcm-kona: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:05 +0200 Message-ID: <20240706112116.24543-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Reviewed-by: Florian Fainelli --- drivers/i2c/busses/i2c-bcm-kona.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c index a57088ec2b06..eb5c46a8f824 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,6 @@ static int bcm_kona_i2c_switch_to_std(struct bcm_kona_i2c_dev *dev) return rc; } -/* Master transfer function */ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg msgs[], int num) { @@ -637,7 +636,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, } } - /* Send slave address */ + /* Send target address */ if (!(pmsg->flags & I2C_M_NOSTART)) { rc = bcm_kona_i2c_do_addr(dev, pmsg); if (rc < 0) { @@ -697,7 +696,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 +721,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 Sat Jul 6 11:20: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: 811010 Received: from mail.zeus03.de (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 ADB5B13174B for ; Sat, 6 Jul 2024 11:21: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=1720264903; cv=none; b=CGQyLVvYeVsJu8j/sOfwyuCNyWpOL7sXgv7swovo9YPku149n+64ib/JjBd+PTZ4wgu73kMUWFdpmR/8CTYhcUnoLfMQUJnLZaKkDqpKGWDG3Gq31e3UKG97BXlhiTwhBEFkWn5vMsVaZbsYqvzucN1gqfvyB2Iap48XWx1W3tM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264903; c=relaxed/simple; bh=Zc+wW02bH3J2UC1dwJRqoeiRcawvKwtWN3nEDGpFDPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NoO+GwIlo1lrBvHafUgqBpz+GxsKezLARmXA0Cx3JqFwH8mz3aktiGibh9Rp+Eomn4hOsfWvxSFqgAZ5hO1VetFbOBtraqu0RQDdL3Q4EreTVlsECr8oYcVio99ZXNn6pPoLu5dmskXPaT6wTtHJEYqy3rCWs+fP3PhD0ArmwDE= 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=NkxjEHGM; 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="NkxjEHGM" 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=VAp76v9wqr5uyKGx45JJw5dqdmqu/DJeqReZVoBu2X8=; b=NkxjEH GM5SP4QGNYvFOGC2jpJWrGU0XNHJDAGC9uKbfQIOK9AXmNFm0iHpYUOYZG9/+ivM mTWlR7CnR3mVFk5fmqBysMPTUCPpR9XlunOgGFWZNlu+X2/d/v9ozro08HU3QRjK DCgtekmMcrp3DNvauZQLGOSp84hDhjcYypUqD+VefmJYRhG52ME4A8AKtHFtMmzH 3lz1E5SY5Rw9jh3Y25rQyZNaTv1nEN3r5gwyW8ARePKPX7aBGl5hSXvv7XXCnf6c SU0U8KxZfEwv7H7Gv8H6+6UxbU2UfMgeU0vOngStdf1yqEVJYBtULUZ3aaxutRln bIt3y+wU0mgyiizA== Received: (qmail 3809579 invoked from network); 6 Jul 2024 13:21:26 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:26 +0200 X-UD-Smtp-Session: l3s3148p1@XZ93YZIcTpBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Florian Fainelli , Andi Shyti , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/60] i2c: bcm2835: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:06 +0200 Message-ID: <20240706112116.24543-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Florian Fainelli Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-bcm2835.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index 3045ba82380d..ae42e37052a8 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 I2C controller 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 target 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 target 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 @@ -390,8 +390,8 @@ static u32 bcm2835_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm bcm2835_i2c_algo = { - .master_xfer = bcm2835_i2c_xfer, - .functionality = bcm2835_i2c_func, + .xfer = bcm2835_i2c_xfer, + .functionality = bcm2835_i2c_func, }; /* From patchwork Sat Jul 6 11:20: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: 811306 Received: from mail.zeus03.de (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 68D6F74BED for ; Sat, 6 Jul 2024 11:21:42 +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=1720264904; cv=none; b=pBPMVFkzRbTgdpRAtIy/F9QjxU40Mmo74SQqVvKhzA8gG8ppkNDQVhuEiB30CcI9P45vM6EUKomTDz+y/ZpU+HgdNF5HkLCwGe/zAfv90dgYhA55T9A3k+UBWTfAqyPHWiLjkD3gWzACd1p85y9hNRtTzDvQ8eMA3VgtDwXefDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264904; c=relaxed/simple; bh=7naUJZQki/G2mEWdYCGkSyTcv9ZwC7D/i4bEmhvvpnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e1DV7Gf6MHFW3DFAHes+tHMnMmrHHAafeiZpeWbiIbEIzljRtufcKrTuW9Dl7W5MGJIqQC0kzkeu/L1TwUwGtCzqvIN50w/QeR2flTGrC2EcuuoKSOR/OxkhmR7vddGyRBnPG7Ivl1Cz/XMi6E7Z9uYSFoZRLZqXRW3wje4h0UQ= 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=XFkqYOFc; 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="XFkqYOFc" 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=V1gvYkKbbk1D9KkI/4jZO0TrJg/YPs1bwwmD0YXlqzA=; b=XFkqYO Fc8ztL0yqyjjiiUBKqfWZGDl6UHVcCNY6+TQ4j9p7F41PQQ1mAYJ62a9tSqoRxvp Fxk41ZfWYVAGhSAMRI5bYjVbb4VKs0+7ttAQ5jDpy88st/ZukxUGz4MmQ6riomX1 2Bq11weLKUuoMMDlU52E22AJdpHlFg1uA6UPipZFHIh89ZqL2S3/KW4jlZatXWRG S7EeH6GsWwfeZT96k19Wlx8QHuhavlrqYHpZn5vFs65frMgyxcEnY5A6ZAxPQK3e vBgoqasK1z9g08yv2GT5e/B12tYAAs2sGuRQb1DczX95qv5UG/5lde7E/lkqfT55 c8nWvNdRu0qXnyZg== Received: (qmail 3809604 invoked from network); 6 Jul 2024 13:21:27 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:27 +0200 X-UD-Smtp-Session: l3s3148p1@VPWCYZIcVJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Florian Fainelli , Kamal Dasu , Broadcom internal kernel review list , linux-kernel@vger.kernel.org Subject: [PATCH v2 07/60] i2c: brcmstb: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:07 +0200 Message-ID: <20240706112116.24543-8-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Reviewed-by: Florian Fainelli --- drivers/i2c/busses/i2c-brcmstb.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index 38f276c99193..83b85011e377 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; /* target 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,6 @@ static int brcmstb_i2c_do_addr(struct brcmstb_i2c_dev *dev, return 0; } -/* Master transfer function */ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg msgs[], int num) { @@ -473,7 +472,7 @@ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter, brcmstb_set_i2c_start_stop(dev, cond); - /* Send slave address */ + /* Send target address */ if (!(pmsg->flags & I2C_M_NOSTART)) { rc = brcmstb_i2c_do_addr(dev, pmsg); if (rc < 0) { @@ -545,8 +544,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 Sat Jul 6 11:20: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: 811009 Received: from mail.zeus03.de (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 14735139CF6 for ; Sat, 6 Jul 2024 11:21:42 +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=1720264904; cv=none; b=aiUTfDEiQjLENJ1kuPt2KRT5L/HEzG4Gp81XvAPmp4RAu+Qam7KtmhiB1GXmjYgqWvePA+7E7UwcqHWYTP9XNqTaNfuaGde5N4StIDCI/8Gv4s9lh9jotyZbFnrZ2Ugf8nb5o+xb5bp34/uE9BnumC+e8V+oq+/b+KGkMx+XZvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264904; c=relaxed/simple; bh=cwNpm6cmcedvTmgJYIYI4r4UZQAz03n1V0IomcLiY0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mvGOU1Kz3/KuvSToFn4iFTsKi0tJgh9IR/Fq0bpe6yxWfSnheB9Hjcyj+5hTC4qxV/NLU4HEjhWGlUBquDvRrG2ege8B80yKQmhL36jxXSKyPlgAQqW4ZsJNGH0ciE/MIbG5lKqYEA+TV7rp9bgRodKK2ZazeDv4TeGib8coweo= 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=AxRKST6o; 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="AxRKST6o" 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=TMNlMppsr5FIbxubOxKOX/t6YvbAqQy3FZPHU9s/HeA=; b=AxRKST 6owM2BX3j5eLjdDlGHoMEOhwE5BhUBUadV7GyyxLy7JTrKsANLs3WpOj4ZFfOgWN Iv/y3hC3tKDpigZ4NC1qBPuIGMed4h898yWEHrd6kGqbPLkfwVgHp5Dny6YB637i sOIX9uhchew+25pmsQANwxbIRF7wfT43w6Eo0ya3zj+GwxTKiU738rsNv2M9DCel qkHB63gTaHuNOv48CnO8MoniEPWNimWwr68dsz+jQpUathyHK6ES8lEoKABn8EdZ KrPrDAhCB9lbjaMkXBbmYOHNvsUCx6IQXYqgU4NoW1yELZHpTpj7LwzphIFj4t++ ZiAMow8yXOJLRO9Q== Received: (qmail 3809622 invoked from network); 6 Jul 2024 13:21:27 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:27 +0200 X-UD-Smtp-Session: l3s3148p1@BaGMYZIcZJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Hans de Goede , linux-kernel@vger.kernel.org Subject: [PATCH v2 08/60] i2c: cht-wc: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:08 +0200 Message-ID: <20240706112116.24543-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Reviewed-by: Hans de Goede --- 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 Sat Jul 6 11:20: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: 811305 Received: from mail.zeus03.de (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 8E20E13A268 for ; Sat, 6 Jul 2024 11:21: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=1720264905; cv=none; b=GqWHC2HcjaySdpFJmnt72zxwWSGOHF9+AOnTaW7YF/8dgJ0RGJgcAPtTH1ZwJnwdRld+pwTG1mR6G5TdzrdNFmq57WBpYlFpo8waYa4X/iDUvYU+Oo6PVlI+jTdh6Y/C7vgeewcCIOcHXBpe5qzD6A44L2d0JxWDU0eQdp+mcPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264905; c=relaxed/simple; bh=g8q1Tud1Xuimagm8NaVB4lsNz4s2Nu7CuhX2XQnallY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lwm36EfadkhGIUBOMGHRlHjLynTX69BvYcBs2TZmvRf8HA7WoEZSacKYANafm0zYFT0k8AdGNIEcHDMBe1bzFHcN03EctuBFPoq2FXiJV/GKdGQ/ZLjvePDjBZ8cb+M0I3bdHqsAdGWJKzF2VOP3P+LZoWKHV6moBea8C7oCaaE= 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=ipzTI/Pl; 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="ipzTI/Pl" 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=JrEULlm4gyDDgxEjqP3uJVh7L9gHtGAIiuGV0SotmWc=; b=ipzTI/ PlQidifvbvkmI8Zm2hKzAH30/Ght/t7Kymfa3JKqgw3bLiyWxlrgCOjsRVfOIMRU gSYOTK/OtQCoBYr1v6ck1tb7vKcuRxN9xSGOeoA7LBX7uw2HlNPnra0+T8CSC+ZI gTSnlQ3JjRN7pwNc9sq08jij3LmkXD38mkLJw8LD8FF3m5rl0FFI7roOVBEw1/n1 GjSztyl9WbUjCnRzGtDX+O8NDHtfofMCbZDQYJjAhbX+9JnrmUyMWLITyGJ9jLsP 0fVy+aN/8FPIyIjFFD7UJ73L+39CSXgOUL4+S117T8DT+k2bKw8B0qoh55qAU5Um TUzREtVhze4R0s/Q== Received: (qmail 3809642 invoked from network); 6 Jul 2024 13:21:28 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:28 +0200 X-UD-Smtp-Session: l3s3148p1@+8WXYZIcbJBQT+F6 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 v2 09/60] i2c: cp2615: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:09 +0200 Message-ID: <20240706112116.24543-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-cp2615.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-cp2615.c b/drivers/i2c/busses/i2c-cp2615.c index cf3747d87034..315a37155401 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 target 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,8 +250,8 @@ cp2615_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm cp2615_i2c_algo = { - .master_xfer = cp2615_i2c_master_xfer, - .functionality = cp2615_i2c_func, + .xfer = cp2615_i2c_xfer, + .functionality = cp2615_i2c_func, }; /* From patchwork Sat Jul 6 11:20: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: 811008 Received: from mail.zeus03.de (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 5CD3413A864 for ; Sat, 6 Jul 2024 11:21: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=1720264906; cv=none; b=bAWl3Rb9A1KT+Sxqmw8f9IwV48nVE77uUMLGdJOHfLcUjn2nofIbIa7q3euEcAZXx9bBNWMvItRlcQOT+4bHxtjOpnGHT9+7S/xwqhZTu1mDkhR3XJ16w0VCPwNJKA9ltfncfK2MbFuRAO4a++IqBsaJIodkGzTlg+Ptxnr3Ffc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264906; c=relaxed/simple; bh=9lVLZWRc7NAlCXEos/Ht+9OXDaJDePn7bYvBLBWeZ78=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k33o95YE2lea3QTpjiJBiIXZP9taf78QB5vA8l5dUeeB6f7rn3Vz+hWeVR5zOyFc3/MvMgHEsTGxymDrGMxA2XOWbzjnGqLOhYO+0ZkE9U7SmN46tdOUCYAlqb9I3J7XRv+x+L8BUtTGHAmQlYfjQplw5k07cDj/1ul3KK32fFQ= 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=KogWU+Jz; 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="KogWU+Jz" 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=D1BuoUJ5rXFWGybNFHM62IQOacbAYA+TSmxYZ9HLfeM=; b=KogWU+ JzPp3w0jQi5IbflPz3B/JK/4yhnX6vdtEhOU9hNgBMdOeGMm2t9aC+3LK0RTVdNs SoNr+F+M93O1jUTVgL31cAcYmpqV4dzJFtIVJJq2BKlwobytQBnrxTDFkObdWJlx m77Q8pLKU5rnh6X5nfN23pFbsFTDHpVK7ml2MZGaJZxWWeGypY8RZMPkOOv62U4j r+l9H6pKHWWexRwOrYwCJwhSNt2FqJB7xaDkuplHionbf0KStZOB5IkVnT1TBwBW opBlcYvyM9IG9sYDcGgAOII91xICWaUsnEBxxKQoAXztrwUa3bfAu7rRwjIKYf2u Qrju2kzpOxFAAQcw== Received: (qmail 3809660 invoked from network); 6 Jul 2024 13:21:29 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:29 +0200 X-UD-Smtp-Session: l3s3148p1@SDCiYZIccpBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Benson Leung , Guenter Roeck , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 10/60] i2c: cros-ec-tunnel: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:10 +0200 Message-ID: <20240706112116.24543-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 2737fd8abd32..ab2688bd4d33 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -235,8 +235,8 @@ static u32 ec_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm ec_i2c_algorithm = { - .master_xfer = ec_i2c_xfer, - .functionality = ec_i2c_functionality, + .xfer = ec_i2c_xfer, + .functionality = ec_i2c_functionality, }; static int ec_i2c_probe(struct platform_device *pdev) From patchwork Sat Jul 6 11:20: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: 811304 Received: from mail.zeus03.de (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 6316713AD1C for ; Sat, 6 Jul 2024 11:21: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=1720264907; cv=none; b=T1DYdulDYg6oXS289zQroJDc8rQsAwwsl2oT3q7/eV7FlDW+WQQlJzJusPq+gEa45JHzrykffShCGGCjuQRmupH/AWjeiqfrsubCj8EYk7i2hhPAoNHrOnoL8bxIseBXrSj4yV9wVvUSgBLz16114HiFNMz3A0He+UDEg51t9Y8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264907; c=relaxed/simple; bh=WXFufwTgiKGZ3wQTvX5QSIoPVyXoxhTxDW+DHQ8mI1E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K14/kHIgss5Gzbr97AmW+xhMpnoInmfqJO+zjp8nr2gWsZN8bOJqHJqt7FEw3+MyedWue091bpSgvUZOJwf8thzm+NoaKpGfYeBAeAZsaYNyvkdtUvyJUEkFgAB2x6JYf1fTqfdcRm47kr4M18HQJBJ9JV5Pd8w07nEbTmSqxPY= 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=EzPI1NPE; 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="EzPI1NPE" 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=yucbiOR5K/HLeLxrTAh5H0/2HYPSbOao0ZNDnyc3lAQ=; b=EzPI1N PEKD/56rXHsmWq+hT3mJWaMbCa3M0gqfgzIBR0QAMr9G//BwiYPW/GPPUnL/ffrZ 83C1mOG1ulYAiKknth3p6HDQfbIjWSxiuatQtlPqkwuQ1YI0xAYhfFzEbaRZCa8F ZnMLWrrHqRxGxt41rCSgNxB2FacMHVNI2P1KVv3I+Ir3euVVAeGBZxZmaG6C5qu4 HsjfmOkD9UE9S8BdU5tEwgcprogBY/Z6NSK9srrDQryFGopaxIrlTW8kY4/PDfN4 T7XEWU1aPWE89fs+0dbdpBQ2DVcGlpPwxFNQ/kZ98GFQduVMrHRqDbOiIO1aVvWT aTZPzHTCNx6f04lg== Received: (qmail 3809685 invoked from network); 6 Jul 2024 13:21:30 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:30 +0200 X-UD-Smtp-Session: l3s3148p1@9n+uYZIcgJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Bartosz Golaszewski , Bartosz Golaszewski , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 11/60] i2c: davinci: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:11 +0200 Message-ID: <20240706112116.24543-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove and reword comments while here. Signed-off-by: Wolfram Sang Acked-by: Bartosz Golaszewski Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-davinci.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 7ae611120cfa..c4fb5e9ab506 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" target 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,8 +407,8 @@ static int i2c_davinci_wait_bus_not_busy(struct davinci_i2c_dev *dev) } /* - * Low level master read/write transaction. This function is called - * from i2c_davinci_xfer. + * Low level read/write transaction. This function is called from + * i2c_davinci_xfer. */ static int i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) @@ -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 target 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 controller */ 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)) @@ -687,7 +686,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 target interrupt\n"); break; default: @@ -744,8 +743,8 @@ 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, - .functionality = i2c_davinci_func, + .xfer = i2c_davinci_xfer, + .functionality = i2c_davinci_func, }; static const struct of_device_id davinci_i2c_of_match[] = { From patchwork Sat Jul 6 11:20: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: 811007 Received: from mail.zeus03.de (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 F267313A268 for ; Sat, 6 Jul 2024 11:21: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=1720264908; cv=none; b=WDnhR3LgJfUpTYHrkp/bAfUAck9w/uPvl7do7E27qsuX+Ucl/UsIJbflXOshwPDmCi6v30qTOwKO9nduGHkXBVzgZdL2XbCkJgWNIJfFRcGG4WmoB1yErp91B1TNK5+hho9UXR7jOmqko3YFZrGpgaFwc5AYqDUOs96pzu4X8qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264908; c=relaxed/simple; bh=7oO8BCLJcy+iMfb7nWbA9HN4VXkyrI7WBsPWI7Ns588=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iKf6N32gHQGVsK8pmK9DNC2JwgIdUkXo5nnV+cgqQHgcMx+RuhnIkpJ7xaNwMCZyYLFvBwGDtJNhumVpdonAcgw4pOBulMmn/ba+oMLEfKZVWMaaky5PumbcQ6vfFNcdMlnRn4GdQS1UiE8InPv5xPUEZELzonJpJeXBMMiHXBc= 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=GKgM0udf; 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="GKgM0udf" 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=Q8fwtYWq5NjvfAYaeNUI0UE8b4oJ3/6m8r1pPrhS05I=; b=GKgM0u dfdiDntucXOClb1Mq1ZBd7KtOuRWYIfMZHCdP5HTFXm5pX/NefIYmFBTxKggv2cG L0T9dbaDdIZxsGgcngEvuFqGze4HHQHgL/qXyG5i7MWllXnhUdTJGUhgTqkjxKWF fVkupa3e2sL8+h7l+OiSj4P1qFAUhjdrdqdL0P5MV6l3KD3/quKVPXse5/Lfvaqj 7r9zDHbTfbkqouI3MuZjJSM2aqxGdscTKsPpby579N041Go1j8R3QPh1PuxSnYcT cNGSuhfxLtZO36LS+0TOgZyQt38FWww75URODTZV6t3j11cpM8Z4EWG9dcUXWOo2 KL2jvQ9aBllHDymw== Received: (qmail 3809721 invoked from network); 6 Jul 2024 13:21:30 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:30 +0200 X-UD-Smtp-Session: l3s3148p1@z9K5YZIcjpBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Baruch Siach , linux-kernel@vger.kernel.org Subject: [PATCH v2 12/60] i2c: digicolor: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:12 +0200 Message-ID: <20240706112116.24543-13-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-digicolor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c index 737604ae11fc..3e6b80e59b90 100644 --- a/drivers/i2c/busses/i2c-digicolor.c +++ b/drivers/i2c/busses/i2c-digicolor.c @@ -281,8 +281,8 @@ static u32 dc_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm dc_i2c_algorithm = { - .master_xfer = dc_i2c_xfer, - .functionality = dc_i2c_func, + .xfer = dc_i2c_xfer, + .functionality = dc_i2c_func, }; static int dc_i2c_probe(struct platform_device *pdev) @@ -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 Sat Jul 6 11:20: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: 811303 Received: from mail.zeus03.de (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 3EF8813B798 for ; Sat, 6 Jul 2024 11:21: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=1720264908; cv=none; b=ifG8PAZye4inbDMlRmvsHJ4AlSWq4E+/JyJqo0V6ul7DB5/C3ur72/9lrU70GyKtt+FeSFl4OCqXLsXySUz5KUS+DfiW9FfFWFjN8zIWxov4nR4LfrhTcbIWeRfylLGg+X5C+Q/gQXoAex5qjudgNusM6v3i//HNLfZTDWh9gIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264908; c=relaxed/simple; bh=gpWfjQlQgtGBMOL4SKHWzglIH5Q+S3RaWdfS52CQ/hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X7v+gZgj7Q6UGW86GA1M2Dm7MGBNf8dVDFw6CwmnkUMJHppSg7yVWZLe918yORjQnHILS71L3GnbBW/DRTMliJoEV3zftGcjJ4SazjMvf/bgwwQv+nm7K3v7OGKKMxqmmJGpaav6JfKMcIEmVQJbksEveTeRXNtPmip8ZUnRpGM= 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=PbzuCbdu; 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="PbzuCbdu" 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=53fB73WF/zdRPDifklGT52RbsqQ7MAY+iG5T2ic3X58=; b=PbzuCb dubSao2U3CzgAAVtHrnxezaKAnzgGY0z6FBCNhOAxAB57W31xIbAIB3JYohp/dyF uHgjBctZRbUndY4aArhSco0kYUwk+5lZ58f4AZV+bs+eFZH7s4p9Ax2/m3kUpPLm 1oc9bvCr7p2geFoEupB+SzcF+/dmo8PulqG2R40Eyl9evd/We7ehlNCQ6CPA047T vHEhik0ewZ9nRXi0syM7cT7go6fjHEncj05YWLkxcpadcjIm0dQfJrE9QZ3r2l9B b8dyIQl/HJYWt4biMX6T2RXkN+kh+W6SHX3DVp9c17t90ExG69fee+wXbf6UZr5w ROONv3wb/R4lATDQ== Received: (qmail 3809762 invoked from network); 6 Jul 2024 13:21:31 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:31 +0200 X-UD-Smtp-Session: l3s3148p1@ZFHFYZIcnJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Guenter Roeck , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 13/60] i2c: diolan-u2c: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:13 +0200 Message-ID: <20240706112116.24543-14-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-diolan-u2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, }; From patchwork Sat Jul 6 11:20: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: 811006 Received: from mail.zeus03.de (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 4F15A13C697 for ; Sat, 6 Jul 2024 11:21: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=1720264909; cv=none; b=d+xTLEYhk3fhvCiodhFWJ9VVhsbSrR1vyhsRF0K74iDqJF/csAEDs1GyquNUvjDh+OI/kX9SIp558sLDpEgHHDckNonN+16l+y64P3I8KS23motVK4EvK2S/UVeUf6yCfEMZye1Bek7sclZh2mGz/TuNGUWP3WuqfzpPFF5HlbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264909; c=relaxed/simple; bh=v+kC+x8BAXHTESQ4t5HlKIn3i7LFkD8XW+OC7jG6D6Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FeRbukNY0BVdciFjGW4auFqDBQXNWFdfJYtoK01Q7HZCIVMPayePZfNsYF+ztTCzCmeIj0oDxxlReyXe4ib35htVolKqGyTWR1MwwhL8gs4J1S/FjMyYRv/oAAogYCkBTjOxoH9NQVQDQzXlZHJbwbK9Ptcj1r4X/6js/1e2b/c= 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=IyccCOk8; 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="IyccCOk8" 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=omQ86OPhxmbCCLS3LFui1sAFN0oi2l5Hf+KSD1OT1QA=; b=IyccCO k86gXm3ptCruc0SlbrlKklTxnrSUojAVv4PUxSvIRMp2XZBqt26FYCwfccInLHSH kBC7mHiA2jUtrmjNTsTOyM/KcVNMUkrjZ+GZAtFDf7eX+L6jL+Buoyc4tBiy7+1M wmIuR4UAwWNpBPvS0Jkwa45Z+DGnOhknukHeMpk3blj/8DQhoT3SU1lT70NDAR03 0P2ngURXpP6SkCFOATIJubi9wpQXAYvuTd3gSpWGCfuXB693MYx05aFD/MfyJ3Ib wwGzdLeUJYe71CBUt7rEJGM0br0m5fIX+G7ezt22PyKwb0RF5pZMQanRv2qYYHhW CB640D/utDdtQ0OA== Received: (qmail 3809787 invoked from network); 6 Jul 2024 13:21:32 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:32 +0200 X-UD-Smtp-Session: l3s3148p1@IVvPYZIcopBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 14/60] i2c: dln2: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:14 +0200 Message-ID: <20240706112116.24543-15-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 Sat Jul 6 11:20: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: 811302 Received: from mail.zeus03.de (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 6F1CB13D272 for ; Sat, 6 Jul 2024 11:21: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=1720264910; cv=none; b=l6/y/fNOcusAZBuirlDBH/b+zzh5xfMva/DdXlBUoPZwJo2uVw8jyhmh8HFV5K+6feBBpW96yJ9JBJAtgth5UprMbNlgPoZQ75VYLAzivCvL/3wHxQDgFHUKyaCw9/nbULnjLGrot68wjwVtMkmC21i+7dbzTNa4wfbyDsZfM9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264910; c=relaxed/simple; bh=bxJLK/DZfAC2qxewxSmw3TGcGeoQ0tAM4+qHE+O9k7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFZS/cmM2WMHyjv6m4JmRBKf/rEkfLX3juhaiDaZDJP0WVg+EVI0aPScAVSGVfRLVsADw2yee7MBDzOXT3bGZmKDMhmM8bbRAsiCOJEjCtSNO8yw7rgU9YW0furrgOy/xanBh1+zUSEzYmk3Llg6LVKWrhARN+h12q19xOJ5dnk= 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=C2dETlZz; 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="C2dETlZz" 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=bStUOS8iU5VvMWJqkoZjIhVx9CNCjjqHFUdXvxQ/eQo=; b=C2dETl ZzAeaNzd+UUuqIzPvM8BtCuyS2oOnrC0JwLx21TKUhrVUEOfkADrlopZf6PbALNg /4dGTEnBmgDt/uumEDRijJr7G+MfmwgBYsT9z6dT7HBYg7cVQP40qqWQxXVlDFE9 yM/JPUq8O/vqN3BgYbuqeUvsX+nSTwwz6qY7cIGqL+r87RRRGh+wKu+8jLtpKHBI HBfEIGC76ZimPIzlGKqkqdK1a64eBjnc8otLTikAjg0rdfBl6KwJdQYE7hzZ2r/9 F2lP22jDo5/u9Uh8FPD3orr30hznDEcc8Wx67TUC/JWShNFHsleB7ye1vdHeMj7g 4QowA+0xVQITCKjA== Received: (qmail 3809811 invoked from network); 6 Jul 2024 13:21:33 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:33 +0200 X-UD-Smtp-Session: l3s3148p1@ULXbYZIcqJBQT+F6 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 v2 15/60] i2c: fsi: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:15 +0200 Message-ID: <20240706112116.24543-16-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Eddie James Reviewed-by: Andi Shyti --- 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..ae016a9431da 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_ctrl { 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_ctrl *ctrl; 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_ctrl *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->ctrl->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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *i2c = port->ctrl; 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_ctrl *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_ctrl *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_ctrl *i2c = port->ctrl; 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->ctrl->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_ctrl *ctrl = port->ctrl; struct i2c_msg *msg; - mutex_lock(&master->lock); + mutex_lock(&ctrl->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(&ctrl->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_ctrl *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->ctrl = 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_ctrl *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 Sat Jul 6 11:20: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: 811005 Received: from mail.zeus03.de (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 3B4E713D29A for ; Sat, 6 Jul 2024 11:21: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=1720264911; cv=none; b=M342VgrIvRFmPxLNoZLegHdP5VJ9J3EalDUtkZdGwHV50n8px9OcFZduy8ZZv/EFC19DyPKz7pUJ46PmW6VRn7cFh/DsOMdh3Ll/ymuKd2oWqnioQprSAlxfRI1kr5c4o4tk/sE6k3IKYAMRiskmy14elyRs3dynWHm2DNjsHCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264911; c=relaxed/simple; bh=a9cIdRwbYAsMOQaFrms7Ds63b34iXruWtWg9od9s6BQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jLOo1EKEv55AJno4LMgVzjGuqqwY8yDBGNiDJcpQ47RTtd0wRajOlCLCVRcLXgCkYHNu4jWUBJ0EncvkI1ZnOA0OloOfqtHOFXxtcCqumqoMcTcQPpel4FXrLEKlCZIWBoB4Js/UAiaY/sRgPRJtYuuQ5khmuOPSMPgOxIWlDAc= 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=j43F58M7; 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="j43F58M7" 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=kFSHAcT0iazh/LMieZ8QFfwZuJMbJ2j1igrsGAApNvY=; b=j43F58 M7AOoVPFgVCHH6Yc6H+IQVXaPqSesNy0QUPyzBv9hUe+0e5qjvis/8/LOOZnVtdc S3NIBfaGRdp3isjVrOEcEh7zKaUGbgHN6dcC5536NyRGIVi6eSnpJ/RqTzYBk2qO XQryr//TwJ62OIa7NIKVlCX62No5JDhvFkDZnxhLGEYDffwG6E6ISaxLio8yXHxl txGSbdL8Yjiga+qW8S6qKR4EUzq+sg7qdzSbldooqCzCDyLCBRhAtsYyDLkP92yL 4UPLEjrAbR4nd8FMzhIvdvuaDWfkxjK2JZ1HAb2JpqP48h1tntOJ2MC3FJLUnqaN iCdFPqFHarEvu5uw== Received: (qmail 3809831 invoked from network); 6 Jul 2024 13:21:33 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:33 +0200 X-UD-Smtp-Session: l3s3148p1@ZtDmYZIcsJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 16/60] i2c: gpio: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:16 +0200 Message-ID: <20240706112116.24543-17-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. 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 Sat Jul 6 11:20: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: 811004 Received: from mail.zeus03.de (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 274E613E3E7 for ; Sat, 6 Jul 2024 11:21: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=1720264912; cv=none; b=cmaOEnb06UuRCFyq7QoDgoOxIuGR1mFmPv1Gl/7KltRSwkY0/P6DmPmdZn50iO49wpLBSULqYjrfBRiVrHltmtqVQyJfktRius6t6rITwuwa4JzuYzNt82mmxKhXcicjMV5oP2izCHRcuWCwsMd8b1OxOOyzklTm3GmafeRxkZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264912; c=relaxed/simple; bh=4iyZ2tieeSbkKbsXmcNxflXF9XVpqKjimPDraqZRuSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cddr9rssun38/L+w0CaXdyLU1liVytv+4Guz7Wq4UGzP1VVvJz1eW4Eanpc4DVqLdzUV1knKpqb/jkJH2FUNoJQnD1jG01oKz4cQDFOAhC8onNGP3UCuThYAQGO7uThsVIz08MV7XZUidxFZqWxB+WGfCwe3K9zamgPRjcPUy10= 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=AKGIETuz; 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="AKGIETuz" 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=Sl3thxJk6qHTgqFe9vsesmVZL8XNJ7POlGLqw2o7k9Y=; b=AKGIET uzshD0ISFPIUqjWRwaNqu9Th/ZLj1v2tSm4NuJLMph07DPhCgnlteVtdkSQEfHEm IYlp8dV71Id1uRwM88ocHcax4UDO4vQdy1Uz3fBT/em5i5v/4I+v3Q0TOGB5hHDR eYnp9nCxyh1d1IBLRGIiaxhHr3b007bqq9Tt/5LeFz6rA52V+tfaQGehrTHfpFXU Txnu33VQ/ZMMi0WxGnjKSrOU+8YbstMOMh82v2Yr9QNovO665qF/LOvMDAtRVhiG fKKlCw3t1pv9XsKXk1e/0r05ou/X1y0yG0JhTzCuOTmzGXd9WIdKZs/oBvcxcD9K NJO0SN0mkX0VcvjA== Received: (qmail 3809865 invoked from network); 6 Jul 2024 13:21:34 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:34 +0200 X-UD-Smtp-Session: l3s3148p1@Ji/xYZIcvJBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 17/60] i2c: highlander: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:17 +0200 Message-ID: <20240706112116.24543-18-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. 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..ec1ebacb9aa8 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 target address */ iowrite16((addr << 1) | read_write, dev->base + SMSMADR); highlander_i2c_command(dev, command, dev->buf_len); From patchwork Sat Jul 6 11:20: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: 811301 Received: from mail.zeus03.de (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 B5F2E13F432 for ; Sat, 6 Jul 2024 11:21: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=1720264912; cv=none; b=gNqY6Nr1fc6r1AvTFTEFUGVsRpfza1kb6zvVWehpwEIly69GtnERkVZ5Qiu5bP/KmbHUsQpwSn/RhbSEFI+ICHpICY/JNAusLQdqEWNNMBGy+dW4YgUbedcGR3bCsjVdzO5ZwS+qPuMfxFMEBx8LWvoQoduLhYivNeoR3KV6UZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264912; c=relaxed/simple; bh=ODiqnrWGNrS/WPYSBxLCsKs/CMex9UqHgSyoQHgGBjg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RodkDe9hIOC4wL9HC3IE3VtHd6996B0dCmN3yuzcdXOimLQWGYjkZGMIDJPowQHw3Pis2svFsRDed7zSY+erf2oFkD0pI4O1Az647QeATdt4sUIMxCaYcYXvaq7NmJ3NzajjROorlQuwWz57urjsR+8bn/+eC7reVgftdggOGGk= 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=Hy8nlt3u; 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="Hy8nlt3u" 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=g1uUZqFQvKN9BFWBSV/gSDYpnlosIq6AAXNWx77kxo8=; b=Hy8nlt 3ub9Wmt0zowOX91z7rMv7a9EEb5UEF0cFwqQzLXxQ5U1QePT0y30NNvILm6VjJgL wlJJka/ILg8zUBh6RsTLQcXqX+7oXmehS6frvCJYGdV6VGp8rBRcGpTYA/81jlo3 eJ913dwWfz+rO+s/LlCq6tWWqrW2ezjfcEgBowwfhZiHr337n0Xwc/WMUSE2G5Wh rS+4CRQPuG8s3bHaUfyqrYpWNrzCtnAR5e6vgJGMwOxigYNCycmmUFhG2hjEAh+8 PsgdeEd3vG83DQnXLcitWeGEQK3U7TEy5a9fD94NuWDpFmIqsAZeE5P9xuDVBLv0 MSaqisn2QdclWvUQ== Received: (qmail 3809910 invoked from network); 6 Jul 2024 13:21:35 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:35 +0200 X-UD-Smtp-Session: l3s3148p1@bqD7YZIcwpBQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Yicong Yang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 18/60] i2c: hisi: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:18 +0200 Message-ID: <20240706112116.24543-19-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-hisi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index 975c0b1c44de..4b735ad9e193 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -197,8 +197,8 @@ 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, - int num) +static int hisi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num) { struct hisi_i2c_controller *ctlr = i2c_get_adapdata(adap); DECLARE_COMPLETION_ONSTACK(done); @@ -236,8 +236,8 @@ static u32 hisi_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm hisi_i2c_algo = { - .master_xfer = hisi_i2c_master_xfer, - .functionality = hisi_i2c_functionality, + .xfer = hisi_i2c_xfer, + .functionality = hisi_i2c_functionality, }; static int hisi_i2c_read_rx_fifo(struct hisi_i2c_controller *ctlr) From patchwork Sat Jul 6 11:20: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: 811300 Received: from mail.zeus03.de (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 53B92143C47 for ; Sat, 6 Jul 2024 11:21: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=1720264913; cv=none; b=LQe/AiTbXyr2rf8iLeyE80R42BGRDPOUXtyGqHaCupCk491+WA8LR14KxTEsYsZYWFEnAzSZzYTL7UDE2xuF6idWaFjm1M41oJYkT6HO1Zlolq34VXYxR8FffwWyoZXv1qIOp3mFmf2lUrNTk5REkVV+FCq8i0dgETILRunH+2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264913; c=relaxed/simple; bh=clHHUD3oc7AiBgTgg8PgDukw25LL9yUiiPzfbEuUbVI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ocRwqTfsS9gGDp6wWH/vyWB0497H2VElREdSUxRyQvobDeM8D8B8ijK05hLsMdig7ayl1sI51+lQkda5hxAV/VHAaZghA7ySHkqbg7ex9nhvy3qpniYwWdJGJS/XO6ZoPVC2mqP03zvKwnylNWjanPfc/1iRvxz76Ner5IW9oIg= 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=PxgarKUx; 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="PxgarKUx" 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=iLZVl4e6/KmvptbLtSauaumo0amjB//eFIbpOtdLBZ0=; b=PxgarK UxdxYJy7BE/1Hhyo0BrGXFuHKYuK/CBJm3qY3SbWVuqS0o+5xqTkEZ+KGb/XRuqk my5fW0qGz2JKVRFDpKM0twjHEpuMDSywhABStg0Sjs4SPIKm3gfI8rfv6k/+PLZS 9oqnmy3OZMjuzsESumPbPMmu1fLFuuJvcNgF0+nJQr12kHcgiSlU8VAaqjXvDcdF NmBq4AgqPjHOAm6YpZm5wABnae4Zn0G//IeMXFb7kCJ9TqJjsRLtr1nasXlhwx+0 6BaKLa/ksbSHjC++CQlJSMJhj+GHksP1DaUoskPag4fB9vEb9UShkWUNVPlckeTM fom4zkXgVzFaJ89A== Received: (qmail 3809940 invoked from network); 6 Jul 2024 13:21:35 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:35 +0200 X-UD-Smtp-Session: l3s3148p1@ovYFYpIcMoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 19/60] i2c: hix5hd2: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:19 +0200 Message-ID: <20240706112116.24543-20-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-hix5hd2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c index a47b9939fa2c..64cade6ba923 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,8 +384,8 @@ static u32 hix5hd2_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm hix5hd2_i2c_algorithm = { - .master_xfer = hix5hd2_i2c_xfer, - .functionality = hix5hd2_i2c_func, + .xfer = hix5hd2_i2c_xfer, + .functionality = hix5hd2_i2c_func, }; static int hix5hd2_i2c_probe(struct platform_device *pdev) From patchwork Sat Jul 6 11:20: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: 811299 Received: from mail.zeus03.de (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 932B0145B06 for ; Sat, 6 Jul 2024 11:21: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=1720264915; cv=none; b=Bd0vPYHGbjVMDL93KU1wBR9mkNC0VzlGV2ngJy02FhLnRS1yiZmieXLWMdMrn3aM5cZ0ATP/70Mwo5emCfiw4fJ+iA9p+sBzLfwTQ5emh3LSftazpd/Lk4bTAfr5SZ/bh0W0W0JFmDQVW+WW87yxYsVDDa9/gqRdRqE28lZSo8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264915; c=relaxed/simple; bh=dMnyEjp7+uX7hB8OvommDFSS9gTLs56lQaOKFfeWV80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q6L2GMxJZuvF0mI7DjtNrQEnJxQi52UDIrqYUhZQOMG07+X+8JmQnrQgFRXxD32D9taeEeGipNEIDRL5lKE1pEXR4neMmRgWA+x5FSEaC/dCgRF+JvX0rVRA/9lf3yvDfFOp6i4je7LpHGIKfHfHFoDdRzcn1E2yLEs2f4YIab0= 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=OJ88jTM3; 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="OJ88jTM3" 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=WeKdycd1+D6KyJrGKsaIPUssvwvGfHywxfTsuw+6QZA=; b=OJ88jT M3XTQ+jEDbbGJ+iHvaV6rI1gd9OR5nHDY/sC35sFoXvTsi+Du6W7ZBnzGvcNcjqL cGYmmjv8mKx4OCaz7OcV0od1JJqHHTVzm6OMpPdiBAdva7pyxkQq9b859Bo4mjw5 swkDZPZkwHG8D0pwyb3ulsY4c9o875gWvHzsgCd40NPkZRBFPj/sG0g4pUVS+miF X0A8qtxQ0Qsc9LprrJXw63EbNRE0WCYmg9XJfj1eim3OsZEETa/j+9ckvKNCPpRh w/Ysy/EPHf/hv010ES6BeEUjIJqA9uPOVv6NDucLYGZxRj5gnj3oG43JFnbol5Ru As1HX91l6Y6kSPuw== Received: (qmail 3809969 invoked from network); 6 Jul 2024 13:21:36 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:36 +0200 X-UD-Smtp-Session: l3s3148p1@OS4QYpIcOIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 20/60] i2c: i801: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:20 +0200 Message-ID: <20240706112116.24543-21-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 44e3e9bae5f1..328c0dab6b14 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -88,7 +88,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 * @@ -1277,10 +1277,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 targets */ +static void i801_probe_optional_targets(struct i801_priv *priv) { - /* Only register slaves on main SMBus channel */ + /* Only register targets on main SMBus channel */ if (priv->features & FEATURE_IDF) return; @@ -1307,7 +1307,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_targets(struct i801_priv *priv) {} #endif /* CONFIG_X86 && CONFIG_DMI */ #ifdef CONFIG_I2C_I801_MUX @@ -1777,7 +1777,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_targets(priv); pci_set_drvdata(dev, priv); From patchwork Sat Jul 6 11:20: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: 811002 Received: from mail.zeus03.de (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 75B371474A3 for ; Sat, 6 Jul 2024 11:21: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=1720264915; cv=none; b=Gfy1Wnjlb80Rb2EIBlTZhEj9s7AKMoBRg4fb0CExKxZXFNwWMBIoCospIZDSehBFqEjot+20LrG1ATR6tTJ7YIoWCt6UZdnGZCkft9MdJ0Dx0KvxqrhA9b2rFcdT+xuOYTHidMHEioACiWc7EURl5CnlFcQcdv9LTosCmduoDf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264915; c=relaxed/simple; bh=TAMxqjwh0Yu6WLwnBKFhzPOrc+HgpJP7G8F/9/xOk+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aOH5jTWcT8MFH62MSzdXKZ/aZWpzRa4fuOHgu14+Qm9u2tPOHsCmDQi0rAd5OXucNWCWMWmc1bkfdbQabd4wIgP2OlIY2uBzGs8T2QoAajQKGWvcRE6X6Hyidm7K1/X31PDG/VlEC5Vveo0Ucy/UCeKIb9E/EJfRWKZqVDMD4ao= 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=QfvJv2ds; 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="QfvJv2ds" 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=0h37wVaNas3ztHVctYiDS4mlh0QnQBIcJ3hxl1tjriA=; b=QfvJv2 ds4JG/nBsWlRStrEk/PUaZxBlePptH5MSB5j+vLMcLGwmxaNYnhaL49x6Gfab6Zm 9iHCmUy/PBnCPHlUW+RRQ2Z2OkpQr6B43oR4AdgzpsXqAysNbsz3RnkZWCjgxCz5 +2FkKYmZeZfsB4f0KEAxQv+VvIcNvXVhWb6FtVuum78ELRWGqe/K88DBHQyRAN9I 1F2ZQe79tBjqH9V9HUGdL0AD5dC2ZahhvENhrB7rc/zQMxDjLokCTdK6VK98N0Pl Zb3UYGkl26UANA334S4iPMOvWHA6F/fbXwvEdRF7Idvx0bwA63JfXgDsdXXtvAm0 /ZkyqaMkCVystFnw== Received: (qmail 3809991 invoked from network); 6 Jul 2024 13:21:37 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:37 +0200 X-UD-Smtp-Session: l3s3148p1@ChgbYpIcOoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 21/60] i2c: ibm_iic: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:21 +0200 Message-ID: <20240706112116.24543-22-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-ibm_iic.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 7fb87b78923e..82dedb1bb5be 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 remote target address */ out_8(&iic->lmadr, 0); out_8(&iic->hmadr, 0); - /* Clear slave address */ + /* Clear local 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 controller 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 controller 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 controller 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,6 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){ return ret; } -/* - * Low level master transfer routine - */ static int iic_xfer_bytes(struct ibm_iic_private* dev, struct i2c_msg* pm, int combined_xfer) { @@ -511,9 +508,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 remote target address for 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 +541,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 +599,11 @@ static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) } } else { - /* Flush master data buffer (just in case) */ + /* Flush controller data buffer (just in case) */ out_8(&iic->mdcntl, in_8(&iic->mdcntl) | MDCNTL_FMDB); } - /* Load slave address */ + /* Load target address */ iic_address(dev, &msgs[0]); /* Do real transfer */ @@ -624,8 +619,8 @@ static u32 iic_func(struct i2c_adapter *adap) } static const struct i2c_algorithm iic_algo = { - .master_xfer = iic_xfer, - .functionality = iic_func + .xfer = iic_xfer, + .functionality = iic_func }; /* From patchwork Sat Jul 6 11:20: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: 811003 Received: from mail.zeus03.de (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 D7F16146013 for ; Sat, 6 Jul 2024 11:21: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=1720264914; cv=none; b=LUhMYTXD3Ed3HUjxHzwco4Y0aEw5r4LKxGUWg4MKNMNuZ5c69dwON/wRykCqz072FdUoy2gorUl0M+fW7s6K+4hacf8jGBZ/NM6sl7JdD0Yt5y03oR5EK0AwC3JwEqhhFJXtf+AS9yjCRgTEQZHEDneTaQF88/oI1NxtpC3Lyak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264914; c=relaxed/simple; bh=w4p5x6E9AF/XtTtu6q+8032MrinkSKAp8+QYHIUVFlY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DLYjFlO2hO7qODrMAEF3agE5HBub8ofnPPg4b4w6u8z+ahqOutkVeeLznbnNqrumLSoqBmHJA923WV2ZhRGN46gFPPZxkxFaUQPSs9ogY5FHw8OTrsbsegtmS28v+YqbonvXvcu2P9dGYVsQXnwMRQ8+6RsgLwIf6oYtO67onCU= 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=amUatpvt; 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="amUatpvt" 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=CeHb9vjrMt9jgzTKk4gewrP64EVImhpH0TXk2i/YvJg=; b=amUatp vtX+JVTnJKBqKk4AaWb+7jUjoeeq/bj7qlrw53vstcgKXyRWQhxWPAVRQNfdoudf JfOZZpAz3BcAJ/aHuqGc5pGSyOOUtIgMlD+anz170ac9Fxk3GLI33mH8f7TyKGiw +X05oaD1Ax+lNSYGeBLthALrybelTHyNpqaO2lgE+NFRwBxwmadPydhOFnvsoM0V 8y+Ox2r/ADb6fYSEqxNBzxRC8tdwLxFGqpezEC8U2ukT+8LFlMKszUHpi0Az66Zx oz0CqMt0IPctKz45ujwFtgFoMQnT9xNeFXzPNjj3XeGcWC2WCA00tngQ7r70Uyqi pA+FWzskUnTx5HdQ== Received: (qmail 3810015 invoked from network); 6 Jul 2024 13:21:37 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:37 +0200 X-UD-Smtp-Session: l3s3148p1@QCMlYpIcPoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 22/60] i2c: iop3xx: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:22 +0200 Message-ID: <20240706112116.24543-23-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-iop3xx.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 2e5f0165c3d3..859c14e340e7 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 local target 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 local target address (hangs on 80331), * forbidden in Intel developer manual */ if (msg->addr == MYSAR) { @@ -349,12 +349,9 @@ iop3xx_i2c_handle_msg(struct i2c_adapter *i2c_adap, struct i2c_msg *pmsg) } } -/* - * master_xfer() - main read/write entry - */ static int -iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, - int num) +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; int im = 0; @@ -384,8 +381,8 @@ iop3xx_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm iop3xx_i2c_algo = { - .master_xfer = iop3xx_i2c_master_xfer, - .functionality = iop3xx_i2c_func, + .xfer = iop3xx_i2c_xfer, + .functionality = iop3xx_i2c_func, }; static void From patchwork Sat Jul 6 11:20: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: 811298 Received: from mail.zeus03.de (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 F003C77101 for ; Sat, 6 Jul 2024 11:21: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=1720264916; cv=none; b=C6SXc02aWFloGOvN61xee80LsPHuyUaqRQ/ia3q58L2zC2bwYWpohPngFDL64jZWtydXFDOM/0/5MGQlVaSSHZFqoMpazguev+iCOQy6WQ6EY7YLAWG8QwFAJJrI2g+/17awmnXHnZH2hP7quFx7hwgURuTHyxCKkIuUcSd0qLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264916; c=relaxed/simple; bh=5fzlYQ/DlpNv/VmQIMYDW6udKbLmAXPQatdsAI21DhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WW+OcNm1jsW5+xm33vJOO73f+rohYBKs9YzN/PuR0BMy62Rn+DypMaBnwwK7g94IB0UiEQXJbyCZNSpZcZbee887y2t07SCgQzcSnZZe/SLRDIsnKd5oGTqzlh0nb2tIo0CPr1DRG+XI4ihR7rv+1+9YA096DMKFATcIkP0N3CE= 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=QY0HDJZ6; 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="QY0HDJZ6" 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=EKoXsPcibdMNAxqf9IYcKHn5yG7I+fJ1HIfIgGqP4MQ=; b=QY0HDJ Z6b//NdX9nnwvd6X6txx6en4z3+qRo0ZqW4vo8LeQLRC38WjulN4ODOJNNazqWUT In5ezs7XLNL1U0Yrmq8OnzW+NCG04OikdqToBPbETiHGycVJV6HVYPimoxAuDA/3 cLgqoe6VzApRi5v2GFJ7hQyeaLrg2PqJBOTsCQIsVwQ++d9vvXF539Ljy2PFuwLb u7QZkNRLtUO67z6rQqpYin/d/GOUH1SqjNMLEFD2jwzcpy7Ld/wWoNpM5HoEU0N5 qoq+lgEXZu30uPLbHB8IwrL6HDmosxY3E3Kjc/xAfk8RgvNsClHfyySvJxrKCkJT eNBAZbPD1vkvJuPA== Received: (qmail 3810044 invoked from network); 6 Jul 2024 13:21:38 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:38 +0200 X-UD-Smtp-Session: l3s3148p1@Z6EwYpIcQIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 23/60] i2c: isch: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:23 +0200 Message-ID: <20240706112116.24543-24-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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..33dbc19d3848 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 target is stuck in mid-transmission */ } else if (temp & 0x02) { result = -EIO; dev_err(&sch_adapter.dev, "Error: no response!\n"); From patchwork Sat Jul 6 11:20: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: 811001 Received: from mail.zeus03.de (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 99A32146000 for ; Sat, 6 Jul 2024 11:21: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=1720264916; cv=none; b=ueHNAofayITLlh+yZFrd3XdEnMaAmy81eQu0+Pwpl3svO2qDq6/TYcXpwUZixB1ZS+Flu0DIIYxr1tZoUeSwL8WITjRWTkj0UO5odiwVsF1AgMcH6DbxKQm4nL8xijBLPO2N+BDet7qGP7jRKc7Sljj2RyU8YDmzWUoPQ/+u84k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264916; c=relaxed/simple; bh=TNI+L/52fU12C35bC8ALJbFy7cqdmVY1g5fmdAJc1mU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=skbqRF7VchHQSdRT5Ht5NjvvoabS5C9zEctiCDr6AXsT/eJ7Rs6yJ7uKW200k5zJsh/q6KEvKTYuSbtzcu43s/odmYKKOI9RGyoN8LX3g1q01A7s3HXvwVAE89oJDoHv6p6Cpjy3dz0hXpPB4TJNRr34OXYpL8tmwMzcu9rf2XU= 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=etwR/S80; 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="etwR/S80" 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=SHNrzh4WajxFTgbzTsdFLWb8IzqbL0O1YmyvMU0gP+c=; b=etwR/S 807NoeIwIQ/0rYzvf4q8FCbehx6M39xADnbyGX2aIZQHAaELyxvz5LqNrcWuvqF+ 4wHrpn9+WU7+IFHY2yQQVaO+CveTvrMRxPeXVzWiXHJfbQQeh6GpvOZ0Ka56yjEN CLr8J1xkMMG1iB3KHF49B3WJ2ucpAJQZTskUBCP2o8NjN1CGR2S31tJj8TTjVnZM y9X6iHH1ij/GAFjjKQEcKnaw3ZTecRWy4pTLRtjmXSdBvIBeoJYr0460+wlRS26e Dp7uw8IigbW9lzrRZjS52l2D/KJy25t2KVAkpQINFgiPOXYz9kJ5+W1y/xBtTTZP hQsSUHbo/dlAJsTQ== Received: (qmail 3810105 invoked from network); 6 Jul 2024 13:21:39 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:39 +0200 X-UD-Smtp-Session: l3s3148p1@oy07YpIcTIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Paul Cercueil , Andi Shyti , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 24/60] i2c: jz4780: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:24 +0200 Message-ID: <20240706112116.24543-25-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Acked-by: Paul Cercueil --- drivers/i2c/busses/i2c-jz4780.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c index 7951891d6b97..4aafdfab6305 100644 --- a/drivers/i2c/busses/i2c-jz4780.c +++ b/drivers/i2c/busses/i2c-jz4780.c @@ -730,8 +730,8 @@ static u32 jz4780_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm jz4780_i2c_algorithm = { - .master_xfer = jz4780_i2c_xfer, - .functionality = jz4780_i2c_functionality, + .xfer = jz4780_i2c_xfer, + .functionality = jz4780_i2c_functionality, }; static const struct ingenic_i2c_config jz4780_i2c_config = { From patchwork Sat Jul 6 11:20: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: 811000 Received: from mail.zeus03.de (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 A923614A62F for ; Sat, 6 Jul 2024 11:21: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=1720264918; cv=none; b=EFAL2t0Io5xepmh1XImrXLvNAday03NVbQiirtU1fuqEDwzqut5eCjnw5qjssMgzuIaMlXnCfgIaBrskXM25sP6Gkyse78rh9RHApcdlIchhbz/tWOIFhfbscV+E9+ykAX4OlJHfhrP/+rnqqtTYdEppg3H49m1rYAvjCLz6ECY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264918; c=relaxed/simple; bh=T4jrk/kzzw6tCtoxphDXWydkQlC4LvCGJTQQEQf4feQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AgTCHTrY6AEMxpDzHHJlv88AlWWsC93P7+QVFk3L/g9iD//bvE1Ju+S++aFcDKE/wQLS+YSHKrevvdu1/PCVjd7z5TS4WbxJNZ+7i2IPdBAtPbkf5Q18S9jhToi1oDCw4blu32NwNFNRswE+MR5omCUAqLHbUQNgTmMNHOIxvnE= 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=RULRLKX/; 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="RULRLKX/" 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=SKSqotO9cRDWN6hrQrF4vCwa0Gryrx/y0GC4hbpD4k0=; b=RULRLK X/1FBMiWoQKbx0toQDy8/KyiVHgjw64Pmxo5j7T5NVpgf0pFtOzWVPHZQgTh53my hdjW61UcieQu0/QBGlAVkOrel8LL99utIyKPl3ZAAzPneCUQDI+x9O/NyVtR2Mgm D0WhCt9pBCfg4/K+YjSb94RTOa/WYc5hSeJfNTEip9u+0ogFfiwnxehAS3lp022x /Rw1r7TTKVHNdEh+c/WV2OiFdXx5VGfEEHO5GRT8eGALEzvznDme18CiAtt/MlSl ebPMbdIOQ531Z0KleFWK48VgboNHcw7jk0Xc8iXUbhznmjl0KK4p1f6E9OBz7moG 6QE0DBxb6E06WYpQ== Received: (qmail 3810155 invoked from network); 6 Jul 2024 13:21:40 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:40 +0200 X-UD-Smtp-Session: l3s3148p1@djtFYpIcXIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 25/60] i2c: kempld: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:25 +0200 Message-ID: <20240706112116.24543-26-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-kempld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index c3a529a73b5b..eb66942e0b7d 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -276,8 +276,8 @@ static u32 kempld_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm kempld_i2c_algorithm = { - .master_xfer = kempld_i2c_xfer, - .functionality = kempld_i2c_func, + .xfer = kempld_i2c_xfer, + .functionality = kempld_i2c_func, }; static const struct i2c_adapter kempld_i2c_adapter = { From patchwork Sat Jul 6 11:20: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: 811297 Received: from mail.zeus03.de (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 AB1EE149DEE for ; Sat, 6 Jul 2024 11:21: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=1720264917; cv=none; b=e3zhoBHlenj5Hr8kpMm373gU2CKoimo+v0s3A3zjl6/BNlkvitmr/LsACY9aGxcRpzBd6t49bS9+Fnel4p3qkQfXc3nM0lh0BH5QcwRx4cfZAFshfPmH5GJF2jwXKoDpCC3Ms0A+M/NIBJMXepfR/KTb4nMAMDM4lqHMHEXdehM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264917; c=relaxed/simple; bh=WhEB32QR5+vdGbvGdgr3ulOt2WUVoQ3ffFanTD/1Jfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N0401q7RBur3Pg0AXlb6KDzoYZkx6F01kq68JxmAb6QMR9K30uy3Cv/cEaspAK+q+SrIKm8iOpUMkbJqWEeu0vXX0zR/OBoa3Xt7b9dTcK+pr/rvZ4KeZz4Wnuh0vQ8c7OAyJ0l9fhuoh97HADfM/PSbXrDXaKxmV18z+B4sDFs= 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=TfUmRLTM; 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="TfUmRLTM" 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=SUv9JzPme2t2ffHT1WQETFl0fRpIq23L/uCConbVk74=; b=TfUmRL TMcxkA3B5h7c0w1f7WC7ZMoTodBusywCSAmpn6EBIfkDhKr3XYFbZSUPw0FLcSQS uiFC9Qxr9+xSogAxd2GkLo6Lmfukzj55bf6wXakgvPvRKVngH+J5WV9a4g1qde2f 5TiSxh3sotHmt/7KiJWrKV/ZL6Gufb9SCjmQZurBZT0GLTrvuqIr4Gs2psCJSe3b mZiGSi+RJdWk+S9lkUTpjO+DjC1u6VG8C+UAWAb50RyJMLQPQidBijoeGUN6k+ST ZvqEdo+imf407W0nxG5eVZG+Kfl9+f8tx8ferqbcdL0W3GTSmMI6D85Zo4j6kZZ/ irJsNYFrzdMIXFDA== Received: (qmail 3810210 invoked from network); 6 Jul 2024 13:21:40 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:40 +0200 X-UD-Smtp-Session: l3s3148p1@ovlPYpIcXoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 26/60] i2c: ljca: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:26 +0200 Message-ID: <20240706112116.24543-27-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. 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..0b70621cf9d3 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 target_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] = (target_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 target_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 target_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, target_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, target_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 target_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, target_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, target_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 Sat Jul 6 11:20: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: 811296 Received: from mail.zeus03.de (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 F3C8714B092 for ; Sat, 6 Jul 2024 11:21: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=1720264918; cv=none; b=rlQBnbSg25wabormeltqGCspg+dupEyDYiBgz8NxoLY6kgneZ8PCddIipgHpjd3wdBy9cfAEIqR5UORorI0vFRZKAvMCS6/OMu1vOmwPSmgxXLr0Y98QWigUHwjwOvFKLUvstD9kfs8dEcNQws1NmFDoXajua3izcohnWkYVXwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264918; c=relaxed/simple; bh=9QWvlSczun9moMCOETWvHJGW+Uh7dk/ns0ejbWRYdP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OeI5f5+fCVg07tPKnTkoZX8cBI44EBbWu0lDBKSa8TXqfuApOLbpOSW+JtFQzDzcmI0YmXiaYwfP1dOA5+AmLGy0zhHACdbWNbnORDqJFnzvtUah77uv2TETig0Umu268ljgWyjRS+d3e0uE3kK1AUCoITWjV4TuKeT0bEUPtyI= 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=efM9bYrw; 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="efM9bYrw" 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=Hx9gDFXCtpqgkO9P5FolartfjY2YrLB3I4D/2wnut1Q=; b=efM9bY rwWk6x+sRL4PXlgbzPJPxa0L8ZkD2nq9dXimn81cssIy8DnQ4RtdLvCIKFmqDvqd 9reoeVoCV3snixD3Bj3MTrlaaCbi5mmZdpN9z/8mdZu0LgKs7wtsA6+lnE6Bkdb/ E33hv+ZMxKab1hHIUOq2h857ktQMOCh16EED3ngihq08G7jU1v1/qRKn6IWsEs75 KDyUnXeAbeJb9O6TUdbTRTjFmYh2prFhdd5Uj3uwhDjU5Ak0HoDxs11h9LDChWc5 XQYL/csCev/r4KsKgEY06fSzf7ZrHEDwPMCsFdmXKOgj10RoK2zulTp/uPpnlRLt HP3yxCask96zYHHQ== Received: (qmail 3810263 invoked from network); 6 Jul 2024 13:21:41 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:41 +0200 X-UD-Smtp-Session: l3s3148p1@gGJcYpIcZIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Vladimir Zapolskiy , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 27/60] i2c: lpc2k: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:27 +0200 Message-ID: <20240706112116.24543-28-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-lpc2k.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-lpc2k.c b/drivers/i2c/busses/i2c-lpc2k.c index e3660333e91c..9fb33cbf7419 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 controller 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 target */ 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 target that * this is going to be the last data byte to be transferred. */ if (i2c->msg_idx >= i2c->msg->len - 2) { @@ -338,8 +338,8 @@ static u32 i2c_lpc2k_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm i2c_lpc2k_algorithm = { - .master_xfer = i2c_lpc2k_xfer, - .functionality = i2c_lpc2k_functionality, + .xfer = i2c_lpc2k_xfer, + .functionality = i2c_lpc2k_functionality, }; static int i2c_lpc2k_probe(struct platform_device *pdev) From patchwork Sat Jul 6 11:20: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: 811295 Received: from mail.zeus03.de (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 643E214EC40 for ; Sat, 6 Jul 2024 11:21:58 +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=1720264920; cv=none; b=LWr6RMbOviAjpzxvuXCgHpiKbzfBQ7RQPR7JT83LcxgnkuHcDdQte0sO88gQ5UF6vK8QpPqSS2rT1xQsaaAThshOblXrYQuhQKBlDOREAnxogPbrpBaTLKc9NSIhuRu0QhkMLnoDQCtkhQHAL7oOzZGdPh2tU/ilEL/kDnZmIHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264920; c=relaxed/simple; bh=GQ7AscxsiB7KIMXnS10kEk9JG7HElWTNr/HQFaAEMhM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ELvl2ZVKAIZrj8Yw+QrObKcDqtm3F8uVoQild/yRt2Ef18E4khrJgjXuGL8fDo8f4bDsObj2LXe3bFA17TZ0bBY+QMQACPjSf6gU9OQR35vhUkxFavozxdJBzI2/Dav+oFaK/7z11GaQ5h6vyFA5wx8VaN05mdpya5Uv9IqPPi4= 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=DkyU674e; 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="DkyU674e" 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=cp618S8vHhzxJdcIjg6Ny+vaCeHJI56nQ4VnW8vX7Yw=; b=DkyU67 4eIORXOVGvvWCQ0bDVFn0oL0wSuz+Oap8H4NrESaJlabd4v+2z9iePfGUaUR2u/y HX+kXF0nnULB0p6csq+/ESX1vT5dnvqDCoc/GFjy8JXsIeYMU2Ai9u/WLRio9FPl sXGYOZSNTAi1GxbuWrF8/lvflt55as9xRf6zwGYUWdTndQp5+35vhI9VjHv0FdvV uPTECT39ErGJ085rVxBsUwXQng34qPG5Y0dhDWuEsWh/ItraVYH39r0kTzYKByTd 32NQBZOAr433nEcSlF0lofVH7Z6gczFoiI+j8Z/517+sHsDiEVBE3zivuQeV5G/B BZu9GqFirYHg73AQ== Received: (qmail 3810285 invoked from network); 6 Jul 2024 13:21:42 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:42 +0200 X-UD-Smtp-Session: l3s3148p1@jitnYpIcaoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Binbin Zhou , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 28/60] i2c: ls2x: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:28 +0200 Message-ID: <20240706112116.24543-29-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-ls2x.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-ls2x.c b/drivers/i2c/busses/i2c-ls2x.c index ebae6035701d..8821cac3897b 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 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: Controller mode */ #define CTR_FREQ_MASK GENMASK(7, 6) #define CTR_READY_MASK GENMASK(7, 5) @@ -251,8 +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, - struct i2c_msg *msgs, int num) +static int ls2x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { int ret; struct i2c_msg *msg, *emsg = msgs + num; @@ -273,8 +272,8 @@ static unsigned int ls2x_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm ls2x_i2c_algo = { - .master_xfer = ls2x_i2c_master_xfer, - .functionality = ls2x_i2c_func, + .xfer = ls2x_i2c_xfer, + .functionality = ls2x_i2c_func, }; static int ls2x_i2c_probe(struct platform_device *pdev) From patchwork Sat Jul 6 11:20: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: 810999 Received: from mail.zeus03.de (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 8FF4214C5AA for ; Sat, 6 Jul 2024 11:21: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=1720264919; cv=none; b=ZnG+/RAEPJQ3+kWOU/JE+hdAJGo6+zzU87taiILlOhLWF+IwlUbHfiMrXL68pV+qLZMK5MiekhviBpfXAoqTHFhtEgg8kFf5DioZTzoAh1Idb/nrTeOK/Ja0aNK1fLPyWWA3J7SaPMCIAp1mtU/f91OhKxVpD76zwZ/AfMVMwwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264919; c=relaxed/simple; bh=saJXPg+uSqStEGQa2wIjQFqCMf8tfELwrH75EGCUDq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LHWn8XprCQ8wkKMEEw/8yyH95fVZOCxI9I9DhrejdfeYjeTZ3c7JlB1CAp1A3fsf/pfgqgHzK6LBkSYcMiUmckaS7FpF2pgqbLmiAtcOVDAsGj1H/rEuVT5raS9wqJmM2fZapH5ziX2j9MRZwg2X0PlGbQIsAOF+AY0unUVt2iA= 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=Mk4MGwqt; 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="Mk4MGwqt" 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=lfy80e6d4DUyOSyxafEW8neOKGy3kSepWSUjXkXFp1Y=; b=Mk4MGw qtFhu0JMd5G7tMIR7etieKyTzZ67HWYaBxzFCjcSI3gDaxQwiYxwomTkPxJ8xsba Zzbsi+yfsNVUFQu5e79OKDIdcEo/q3mqRzinMoODxjdo6eNPACT8mENaM6lIFcNe OBVmAvwf9iWnZ70OWiK9h1vyWZHmun6uKreqNtCv3sBNHqEDtLoGRlCwPaydlbj/ o2/ZJJ7z8jcIrF1o0N8tOqzr9ikD/bCa/W+QxRjNe0+GzeXZc3AajY9xkFIm7Bel ih6evBYVz/4l5BZ2u4FhfzHCdUVRvzE7smwqAu7m78vCNAvndzL3SBNoKTSbKVlo fwoYfECXsE7K3n0w== Received: (qmail 3810313 invoked from network); 6 Jul 2024 13:21:42 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:42 +0200 X-UD-Smtp-Session: l3s3148p1@0sBxYpIccIZQT+F6 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 v2 29/60] i2c: mlxcpld: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:29 +0200 Message-ID: <20240706112116.24543-30-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Acked-by: Vadim Pasternak Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-mlxcpld.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c index 099291a0411d..8223f6d29eb3 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 target is unable to accept the data. No such + * target, 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 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 target 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 target address with command for transfer. * It should be latest executed function before CPLD transaction. */ cmd = (priv->xfer.msg[0].addr << 1) | priv->xfer.cmd; @@ -449,8 +449,8 @@ static u32 mlxcpld_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm mlxcpld_i2c_algo = { - .master_xfer = mlxcpld_i2c_xfer, - .functionality = mlxcpld_i2c_func + .xfer = mlxcpld_i2c_xfer, + .functionality = mlxcpld_i2c_func }; static const struct i2c_adapter_quirks mlxcpld_i2c_quirks = { From patchwork Sat Jul 6 11:20: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: 810998 Received: from mail.zeus03.de (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 69F0614B092 for ; Sat, 6 Jul 2024 11:21: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=1720264921; cv=none; b=G5STEhtmsZfHkbYcl+pkNOspqHo6OkvmF/vpEfOzdFX9t0Kjq7Ht4R15V/yiUN32fOwAolwHITK8SWNHZjOuPAbiFORqyq1o8+Yciwqz3DofpNxY3GjirYGs3EKGfrH0vj2QApb5LGE5uT5PDkDVcBWxzO2zIAxLzshz09R6j6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264921; c=relaxed/simple; bh=bqyay/X3ryYlkM6GK63fhh9HjwIXLb74ZPsZ65zkKcg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EmZw/uAi0E4Xvz1/7ot1+KohSOzcbIFP4zN3B1OHxT3Pp0wjcAgF74OzI/MwL1rPmtsBcTiSOE7zAfea66bAtcf6XSc83BvDobfoHcb33ruyoQyE6WtCYN1zjnXD7PI7yej3LdYe05NhB5HrmjVoB8YaPeYDkwD2DqGnSVcNA5c= 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=N7DggVXf; 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="N7DggVXf" 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=OFSio78sHLDzMdb966A5zrpCuagi9XRDemXSMad7UUs=; b=N7DggV Xfc9no1Xi8prtO7048djjtbo5C1n2E9sWS7L9KFO/I18OG/kq2vq081sD4IcSMP0 nTc1PAeZN16FJjo2CY5KxfVw3xZO6UUALWIYN0fYB6oveIzzJDDY8pXkNAj5zL2o yGOMEowsLKWkfnRlfnN5Q5G725/5CGcQUXuoxIdgtj2gojPOylPIJ5obQAxaip7U s6jxanQ5hLXlHAtLAv0IJ4ZcPu4WWOf7pAIXjoy9de/+Ha3RapgrjIUdiKb7mOLH ugPFe5rYT5Vh24HCwgx9XwkSMnw3QzKDdhmjbX+F13Owvus7gF0EHYSInOKrYZkM Dajn86LrYeZDENSw== Received: (qmail 3810343 invoked from network); 6 Jul 2024 13:21:43 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:43 +0200 X-UD-Smtp-Session: l3s3148p1@1MB8YpIcgIZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Chris Packham , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 30/60] i2c: mpc: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:30 +0200 Message-ID: <20240706112116.24543-31-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Chris Packham --- 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 c4223556b3b8..41d6c8ed163a 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 target 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. @@ -759,7 +759,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 Sat Jul 6 11:20: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: 811293 Received: from mail.zeus03.de (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 3467F153506 for ; Sat, 6 Jul 2024 11:21: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=1720264923; cv=none; b=UUaLFNbtcufTvbeVkXEOmtkWjFdXPDBjPxX97ALCvx66Qv/rIcW3dw/xKJIfzloLcF1QzyC4n7rPwUoPszKPqD8gvVnfGptXFHNAEPaH060N6cbjMNBN8zXAPGPACxArWLsWHBMd2SDzAGe/vNrsE62avnswbm22UyD3ASuH4AE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264923; c=relaxed/simple; bh=/pre7y9zQAqiTpguhYev4JRunh/mORvfT+ltkPz6LuI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pRwBKvs1BVa0sUWhXM8vqrjaVHMPNY6KR6RQjL5DmWGdcSa61Hg1pz5u+KTAJEwRxCaFAJ3ziEh32VkMBYm2EXRnjE4bc6FXvnpaGCY3rkeFC6Q5u74BeKTcSWPGMi0a5fhjpPsU/Ww5qZkkebBeskX+Tt9m0lwKsPj9dFpwGnU= 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=IRdBNqvV; 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="IRdBNqvV" 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=HQCk7DO6hU38Dyc/nf2rcEWHOg3LjU+USrXlQ2610Iw=; b=IRdBNq vVaqq5+x1F4Fwoq8bPnJZkaAVU+exmIklp6gz5VJPCv/OmiqxMOvakbc7KAvm8m7 /sWl6hZrwAODvl3soec03CbMNG4kYdbtX1A83ESndh8dJLN5/TwEpg0EProD9LLl V0DRabARUEbjKJBArVBNRlrgHgM4ys6HyDW17wJvdPo7y6QGzCymvERB15oYh+3L BVrYMym6UIEGKTWVH7B8zSY3rj6Z8slj+Ua9XOyWPLrny/+6Ni7+Mb3NTvcHtG7o dS4/BlQC2pVKYsov1ou6Lj2lQKj+VU/tB1aUWVoC80Yy2MADSc3O9oT8ZE20bNef fzIgAfOnuW/9lc3A== Received: (qmail 3810389 invoked from network); 6 Jul 2024 13:21:44 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:44 +0200 X-UD-Smtp-Session: l3s3148p1@40qHYpIcgoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , AngeloGioacchino Del Regno , Stefan Roese , Andi Shyti , Matthias Brugger , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 31/60] i2c: mt7621: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:31 +0200 Message-ID: <20240706112116.24543-32-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Stefan Roese Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-mt7621.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c index 81d46169bc1f..23d417ff5e71 100644 --- a/drivers/i2c/busses/i2c-mt7621.c +++ b/drivers/i2c/busses/i2c-mt7621.c @@ -117,27 +117,27 @@ 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_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_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_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, - int num) +static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num) { struct mtk_i2c *i2c; struct i2c_msg *pmsg; @@ -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_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_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_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_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_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_stop(i2c); if (ret) goto err_timeout; return -ENXIO; @@ -247,8 +247,8 @@ static u32 mtk_i2c_func(struct i2c_adapter *a) } static const struct i2c_algorithm mtk_i2c_algo = { - .master_xfer = mtk_i2c_master_xfer, - .functionality = mtk_i2c_func, + .xfer = mtk_i2c_xfer, + .functionality = mtk_i2c_func, }; static const struct of_device_id i2c_mtk_dt_ids[] = { From patchwork Sat Jul 6 11:20: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: 811294 Received: from mail.zeus03.de (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 C4940154454 for ; Sat, 6 Jul 2024 11:22: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=1720264922; cv=none; b=GD+Ha2ElDj7zEjfm3R6Aii0xbV0XhTbyyMUv4seMbPNOM9Chojzo7mzkvPwt35UMCeuhR9kRflcD+ATTfsTRvhtIxdz25RqvFZOOGSAhW+IO7nCO1Nr1f8nogJZiPW05sG7fnGmfuppA9qjT+YYQkkExzCur/qXW8FMCG89BoyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264922; c=relaxed/simple; bh=6jC+GwaNH6JmxBwsDgfSQuHLXozf4vHpzv45HFTYqkk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cyIB8Mrwfoy/fgkeQHf8KfYsPJ7ZvVxVVgYa6eHru3fp8TFcir3H03qxS7trpo6PDNnaogk5YBLZhKObmiB3Z9pDhPnvIP31iPI7ZyzC4RWfN2Jd1slSYJ6qt0NfGAso240Sl9ehjRo++plJvVJ6Oen3u2Zn07JLGRAkfHU89d0= 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=hKd5UCvE; 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="hKd5UCvE" 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=VgZrsbp9k+FQorho2Fp2hQDSX4SGk3CY29bDccymkiY=; b=hKd5UC vE5ysgzL0JMV7F+x095BF0B3yEJUMVLmVdQOa7x2gp9KQCygft/shzC7vD9r0f4j gzJpGhNf9HepQFBdNZ84Eso7zdUIxFYOQPQRx7Wk5SFK+Drsv1uRBVkHTdkFhoGC tF8q/9nlrjYve4o88SZALT9q/hXfMFxQbHipgpeikB5k74D7BaxiaLf7urg+rCeP dZSmsTS9Tj0ZzL4R4a8iM4LKFwyruI/ukFeHEY9iT2r6JYRJgHHE3Q+rtOm0SqGz dcJUI/XGSWYUrqMLMyJEvFbFTGxZdZP71y8IwwCze85q2OSyJip8h+0RHyEQqutB 3TTg08S26QNWODPQ== Received: (qmail 3810424 invoked from network); 6 Jul 2024 13:21:45 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:45 +0200 X-UD-Smtp-Session: l3s3148p1@EsGRYpIchoZQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Gregory CLEMENT , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 32/60] i2c: mv64xxx: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:32 +0200 Message-ID: <20240706112116.24543-33-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Acked-by: Gregory CLEMENT --- 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..29f94efedf60 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_TARGET_ACK, + MV64XXX_I2C_STATE_WAITING_FOR_TARGET_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_TARGET_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_TARGET_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 Sat Jul 6 11:20: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: 810997 Received: from mail.zeus03.de (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 379A0155310 for ; Sat, 6 Jul 2024 11:22: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=1720264923; cv=none; b=fp+Q6Qtk/TUb2Tb+0ZQq2/c8LZLAoQoRRLbo7lEBXzNHIgdlWxb3q/QtYFN4kYtDL1Jb/HX2YEejcgOIFxwZ6DDkmIW8j5CZDOTHMr6Hpf3P3RFpxX2guw+5n/IAYdy6lYAUCMvIM/5QyS6+wRjblu/66aVC6CDFmMa10g7R9Ac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264923; c=relaxed/simple; bh=uASGBnRIOAUunsBu4PC5+W+eVdqyB+P6JqFrF86wJMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PqjfdBdIHzL1Hxs+z0ozOxuQK25tIJHk+Ocx9VSpm4pAdK940au/bUw0vxVUb9985lqgmVvkfBpfWXBQc1UGIWRsCBnspJSilrAcrPyXD5ZCr2FHdPjEgi4XFvMRA1152EzZ/p/ie8EPVO8XYAD1bocPu9hFkaC842WUOYjDuOI= 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=ROV2pcBa; 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="ROV2pcBa" 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=V5hj0O5AUmD5ufh1dIsleSmlRFxggB91JNffQLCPKFw=; b=ROV2pc Ba428bheivtFBYD/QwxY/9Kvx7XxiagtsvF6mukI71+L7d+D9IO2mZ8P8h/Rephw BtNaV4HMC2sX90EmjNu7etGSNic774+haT93E9uIrEc+Kv2BPXKP15aCSBUKmgHU QLK5vlBmNX9HkeL9dKtZYFi+iV1/hzuNcB0oigv/8nszVpoSkRelEVraIRtvRN6D IaCEi8rNlYfyM9siyztZTMqAphmilqzWiTq3OIVbXsFXScm6yFtqYvgzbS/qc6cC OoUFyz2EP7GPy0kFx06SqtDo6GtAFb2rOnQoGZ3HdQBh0uMLehO/g5EWr84BvwE2 kDzLL6Pdj1RyaEpQ== Received: (qmail 3810456 invoked from network); 6 Jul 2024 13:21:45 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:45 +0200 X-UD-Smtp-Session: l3s3148p1@HzibYpIc/sFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Peter Korsgaard , Andrew Lunn , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 33/60] i2c: ocores: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:33 +0200 Message-ID: <20240706112116.24543-34-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-ocores.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 4ad670a80a63..482b37c8a129 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -444,8 +444,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, }; @@ -682,13 +682,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); From patchwork Sat Jul 6 11:20: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: 810996 Received: from mail.zeus03.de (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 D6D1F155749 for ; Sat, 6 Jul 2024 11:22: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=1720264923; cv=none; b=mZAqUJgfNh7jhY0+wxY06sJDgJx/wZK+1ymUGhNXOHbjCvxf8N5pCjHF/VWib2KDLuB4nEeO02FkosOfQcNbvNgEF2eBWgwJkMIkVLSJSS7LrFUw8upOAptZWz4Xl0yNueHKOrohvRQn3TvNoljRS/AZLomK+CaGdpFL/zKZEyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264923; c=relaxed/simple; bh=FZluNKjq2UTA1D7/cQ+l7ws3ClAxigdEED5x/EbY778=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ikoa+NLl4IqP5dIKzTVtgJV2U5m61e0trjZDOsOFR2TOVlJsn39MkbN4HxLbJ4HOkkdkOI6enR9Ra52QjRT4T+6ElQldm4XkRtOutPsDQIbBWE72WLuIE1UZ9qnZfRnPGlGNCKNCGMnffSMJ6obIf3vFk/mYGv120H7HgCOg/hQ= 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=R2Hfadrr; 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="R2Hfadrr" 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=N1PwxPL8CNJDYeVjR4HvcrKu3KtQLbZ1YXWFnBOhDwg=; b=R2Hfad rrwV2VX2Umk6bQIuY75BclpPhx39JqCqWHxa4ZAbZtgkhcfQfBNLtOhomt+zQqqf SgipuchQtXWPJWWLRkIq0hG8OOLKh+y1qvjn25UYpRDE1ixSKfuVtgSQbG/5SJOz wQmEQdIcnbxkV7VXmeYFXy6b2WzCwKzBL0FPKuetLWIZuUuzaa+lAJHSzhkTYpFM Kn9oujkJ8oSwxYwPgrhRH8iQ7Lmhkbtw0xNu3v8rhMxgtSx+tS/ed2zt7aqeCiwX XxGMCtgMKna4Rd8bappvQxQdot4cC66sUQcnNixfC+yL1RyI/54G2HdG78vh5hcq wu9l67GQSlqpsZHw== Received: (qmail 3810488 invoked from network); 6 Jul 2024 13:21:46 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:46 +0200 X-UD-Smtp-Session: l3s3148p1@7AOoYpIcAsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Robert Richter , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 34/60] i2c: octeon: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:34 +0200 Message-ID: <20240706112116.24543-35-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-octeon-core.c | 6 +++--- drivers/i2c/busses/i2c-octeon-core.h | 4 ++-- drivers/i2c/busses/i2c-octeon-platdrv.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c index 5b7b942141e7..16cc34a0526e 100644 --- a/drivers/i2c/busses/i2c-octeon-core.c +++ b/drivers/i2c/busses/i2c-octeon-core.c @@ -221,14 +221,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 local 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 local target */ case STAT_SLAVE_80: case STAT_SLAVE_88: case STAT_SLAVE_A0: @@ -608,7 +608,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 diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index 7af01864da75..b265e21189a1 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h @@ -39,8 +39,8 @@ /* Controller command and status bits */ #define TWSI_CTL_CE 0x80 /* High level controller enable */ #define TWSI_CTL_ENAB 0x40 /* Bus enable */ -#define TWSI_CTL_STA 0x20 /* Master-mode start, HW clears when done */ -#define TWSI_CTL_STP 0x10 /* Master-mode stop, HW clears when done */ +#define TWSI_CTL_STA 0x20 /* Controller-mode start, HW clears when done */ +#define TWSI_CTL_STP 0x10 /* Controller-mode stop, HW clears when done */ #define TWSI_CTL_IFLG 0x08 /* HW event, SW writes 0 to ACK */ #define TWSI_CTL_AAK 0x04 /* Assert ACK */ 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, }; From patchwork Sat Jul 6 11:20: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: 810995 Received: from mail.zeus03.de (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 0C5F615884A for ; Sat, 6 Jul 2024 11:22: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=1720264925; cv=none; b=K3DQurGtYd6tZOuE9Hxfz3Uq8tGc5y3YI1WDOENhplkHWYNX1e5bqPLEhRaooIi/wNphZ001MT0eGcWIv6hCGpbsdOtBMZATa46qkXDFhp7vlZ/G7LbhhXSuHWeJFq254j7gijjI7xEPGPL8Y4CosW/fuEOOfa9IcFmEUjfZh2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264925; c=relaxed/simple; bh=ScaL0Ozty9ZSgQUVbj3nwMkwJgaXyJfRepDSjvMz2dE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HetnQKfFjwSS0M/fr1GblLbw7YiWGFs278BH/5uu83o86wf5IB3lVqYc4miHjMFZ+jKxWBIfYP13yEHyVIa/G045TXdzxKUqNvlvIWWnHWOyyIzN348dMTB99xeOo3b6qA2vYzyRULK8YHOpMSd8tXkBtMAuAFsK00zNmc8d3c8= 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=GQndvjGO; 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="GQndvjGO" 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=LBOEuPmP45x17I1fwDIjtyeY3JJeak/7XBOt8b+rk0Y=; b=GQndvj GO9tntaD22QpjEHsVWIl+PXS9ut84waujSJYHUm5/ZTemkH/9Ze6jnN7BupSp/gw e0m21RK7kZ1nc7npNS1ZsN+hVtX4qDWSoo/t2pC8WohZaGRlCBDdXovBOnqwEUe4 kB8WvkjvjzvVqR2Eg/H9Ges84KDDuMw77o3aXfUn1IXaMaXo8o6OnBmgcveyIpKS OPpYUyD84xMiutNhHzQSKW9wLQTgmrd+/v7t9qG1DQvYjWok8kV+CfRCRwoZeyO4 9YFCU4OdP8HK4Jt/GX+U7IcAM5tdqbxz7GoXHRTmBsI3WvuIbq+A2hTKe4EdVVPG +u1+D7q+r1tljYSA== Received: (qmail 3810518 invoked from network); 6 Jul 2024 13:21:47 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:47 +0200 X-UD-Smtp-Session: l3s3148p1@GHOyYpIcEMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" , Andi Shyti , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 35/60] i2c: opal: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:35 +0200 Message-ID: <20240706112116.24543-36-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-opal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-opal.c b/drivers/i2c/busses/i2c-opal.c index 17ef87d50f7c..d9dd71cf37fd 100644 --- a/drivers/i2c/busses/i2c-opal.c +++ b/drivers/i2c/busses/i2c-opal.c @@ -70,8 +70,8 @@ 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, - int num) +static int i2c_opal_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num) { unsigned long opal_id = (unsigned long)adap->algo_data; struct opal_i2c_request req; @@ -179,9 +179,9 @@ static u32 i2c_opal_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm i2c_opal_algo = { - .master_xfer = i2c_opal_master_xfer, - .smbus_xfer = i2c_opal_smbus_xfer, - .functionality = i2c_opal_func, + .xfer = i2c_opal_xfer, + .smbus_xfer = i2c_opal_smbus_xfer, + .functionality = i2c_opal_func, }; /* From patchwork Sat Jul 6 11:20: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: 811292 Received: from mail.zeus03.de (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 8F21B156862 for ; Sat, 6 Jul 2024 11:22: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=1720264924; cv=none; b=UdHD79cSa1spj7Vq6RLhVj8+0zEIy6wBc8iBiu/zlYQAAs55ejbuEjq7N/CVP/ZHmwOjz9N+/QpQ2Y3r/6dZe9X45Igu8dusXPcHA3B2oNO10j4qTvJ0Zav/iV50WUr6E7WailUQUj8C/VFS6WGsU+x0+X9aS8SQU9uojkWyG0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264924; c=relaxed/simple; bh=AVr8OD19xzmckBYHnS9TvD6yvY4gB56cNiw6JOoCwIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P4RzjySmqhlSYxPlgs8e8rKFmGuqXb6yibEKWsGP5KEe/9mxMxeg198Bj/N2IpgZ0Wk7zTDJN8odCuhIEpw4jJg/cKsg1kFxEp1iXRm1pm+42JdTeiQiJw8ifRUbHXq32uBzoqlXs4CSEV5ElDjiyTt4BL5teQOKHu9TKXRxhMY= 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=fZ3aorz2; 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="fZ3aorz2" 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=4SfqK3a3ab1W0iaWE9SHADzKqKu/0soHbCUAPyHoA7w=; b=fZ3aor z2AYi9bXR2+KD6x7oNaHAtybWU+78rTcYpFozktkP+fiTs7m9llAcALPM5+Sw0x6 ImdgDAdO3womljU1sZTz43E8PlaVxCUVKctG2iAIUVMGGvUiKx3JBE7PoaxsS5M4 CxbT5G9kKJlNIDUKSydyPuKCm8aB88qCJ0bj4/fmDbyGFxqvHrjxAZMCOLe9MmkT yK8g4Bi+IxJVEAm18oPzj8bjLSPUro4ONVP3AtMj5w0uaeLo/BtoK1htU3/gc1DK Djig+mldT3PPO2CtShpkIf1bB2zveaInE3imrWFCkyfIZgr/CJwoYMhb/sFj8qrP Io76D8V015HwKBMQ== Received: (qmail 3810543 invoked from network); 6 Jul 2024 13:21:47 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:47 +0200 X-UD-Smtp-Session: l3s3148p1@vZm8YpIcFsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 36/60] i2c: owl: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:36 +0200 Message-ID: <20240706112116.24543-37-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-owl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c index 777f1a0278c7..84a195e35886 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 target */ 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, controller 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 target address */ addr = i2c_8bit_addr_from_msg(&msgs[0]); writel(addr, i2c_dev->base + OWL_I2C_REG_TXDAT); @@ -420,9 +420,9 @@ 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, - .functionality = owl_i2c_func, + .xfer = owl_i2c_xfer, + .xfer_atomic = owl_i2c_xfer_atomic, + .functionality = owl_i2c_func, }; static const struct i2c_adapter_quirks owl_i2c_quirks = { From patchwork Sat Jul 6 11:20: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: 811291 Received: from mail.zeus03.de (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 D617F1591F1 for ; Sat, 6 Jul 2024 11:22:04 +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=1720264926; cv=none; b=p3MNQd2HLtkvkW2o7vB3WjbMj8X039pKr3JNveaHigJ+jG1kPZ9+vHAqY2ObC/oZI/zlJqrUaxgXbLZlSKJ+6wjAAkqy66ncJah5BVS+qOEVA8kWScyCe2S1qvewpKK09qMsv056oFOqHrs/tgS6dP0Ye+UGLDsRe4Uhl3kFznE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264926; c=relaxed/simple; bh=cYeIEPevFKeER7rNatuXkS56BKGnO7fpmd74rioOOwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/Ouwn8wIyKYxiDG+ItiFSc2QhIbqKIReiJqrkegavLOZYLQDhIdBkaBSqRWzhRdb3RvHbh9JeKwi+PTAalXs13ZVjZE0fuFys2TBa+l86QBcTw9rDcv9pL8CjBQJolcRZni8u4LZKTpVMaJ7Oqa+qtoqRpwDgBTb7fGLW/AZJQ= 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=bb6i1/pB; 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="bb6i1/pB" 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=7oZE53EqwBJ41YgA1lOP+r1p1fkFj5Ah6izJNlUQSw8=; b=bb6i1/ pBSvPM0QWPAlXgSbfX5ryFvQVJV0iC+OkPEdf9u83ehcXfZJLFl8XazQ2Lp8Odr5 +4VnVDPiHrtr4PNyp1XDXFqOtIK0Zf5EQLNRWXYG3XI1F9shZR28a7AQg6wpuGJe dASWosDlIyzc9J81yr6dNMmb1sX5jLriavnaw5U7adfIPkHqtuw7RV2mGxQ5548G Top84KGEaAeo4TkNTTD1FmrjyII2tyjW/Yns+hYXJqMX44OvJEvozbLDuEzY6Fe1 3TYLurhTGrcq0/jlH/M+JKp/QyvGBQxujOYaBb3ybX3ZQvAIKPH/PfL3R64K2xzg +AN+ZpRcK7iIVMEw== Received: (qmail 3810577 invoked from network); 6 Jul 2024 13:21:48 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:48 +0200 X-UD-Smtp-Session: l3s3148p1@667GYpIcJMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" , Hector Martin , Sven Peter , Alyssa Rosenzweig , Andi Shyti , linuxppc-dev@lists.ozlabs.org, asahi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 37/60] i2c: pasemi: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:37 +0200 Message-ID: <20240706112116.24543-38-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-pasemi-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-pasemi-core.c b/drivers/i2c/busses/i2c-pasemi-core.c index bd8becbdeeb2..dac694a9d781 100644 --- a/drivers/i2c/busses/i2c-pasemi-core.c +++ b/drivers/i2c/busses/i2c-pasemi-core.c @@ -336,9 +336,9 @@ static u32 pasemi_smb_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm smbus_algorithm = { - .master_xfer = pasemi_i2c_xfer, - .smbus_xfer = pasemi_smb_xfer, - .functionality = pasemi_smb_func, + .xfer = pasemi_i2c_xfer, + .smbus_xfer = pasemi_smb_xfer, + .functionality = pasemi_smb_func, }; int pasemi_i2c_common_probe(struct pasemi_smbus *smbus) From patchwork Sat Jul 6 11:20: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: 810994 Received: from mail.zeus03.de (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 6393815ECC0 for ; Sat, 6 Jul 2024 11:22:06 +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=1720264928; cv=none; b=hSqoOzHSrA5A5o1pID184d4aRHDzgWyaoxklg/xBBie62npIzDmSfSGMFc4GlZWpWph8hzH4HJZqi0d0tr6cDFYM+OGvCoZOCXALscePORM2M9lI60QgBwc1SbmlRSw3+EJBB533J6IqZl8vt3Aq5Da32f10J3a8ezVQ5nGC5SM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264928; c=relaxed/simple; bh=SMo1+G58Da0cnxrv2+Ymv41Xnq0euK7lrerRkMD65rg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M4ZpzSxiqdTTSZBRah2opThRHs+kZaz+u58PKq+cH2JdCMvhl3wT3kilu3gKL+vRH0too7L/o13w06fGT4yM4srgfBiSRofp6L59QuX4zWGOlr0Y78ENVnCA944Vp30VrReOlnMp6ag/tRCB4kKN7/sD+jBaH6B3AU4sWejsuys= 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=l1Ggj8Kd; 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="l1Ggj8Kd" 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=uRNQSfAVpo9Svrbvvr9vmil5A+5LzFem8tfy/6QTdoc=; b=l1Ggj8 KdOeRtO1G7Ym9OwkgOKoIGRy+E1Libnk1rfOihW+A2m565tZwrWbaraTBtszukp2 RvKhPICmk1WnRWApH6QfqyZDACtZ3mfhkBj+Tja0axHEjJzs5CH69EvgAxNbJuFC p/WmXwDmoPGQ6ZGdVZ/XWtuKZLtoF+pCKHkI/K+dDnYrIiVjNDWNYQyOZ/iuXaJ2 9UAwIp5E7qxLB39cODPTxd1LCYg6d/ioZNPqxGSF5NnNsaWLZKMMqx+8LYzDL4mV HtBU+Rdtw9VMLGEgKNo7yp/6RyanNnU9gjIqjrcj2MW2kOGXHJeOo/iSO4pQs66j qXRdny6n9U4AXpOQ== Received: (qmail 3810611 invoked from network); 6 Jul 2024 13:21:49 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:49 +0200 X-UD-Smtp-Session: l3s3148p1@CxPSYpIcKsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 38/60] i2c: piix4: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:38 +0200 Message-ID: <20240706112116.24543-39-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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..84aa18d1003b 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 target is stuck in mid-transmission */ } if (temp & 0x04) { From patchwork Sat Jul 6 11:20: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: 811290 Received: from mail.zeus03.de (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 66F9915F314 for ; Sat, 6 Jul 2024 11:22: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=1720264929; cv=none; b=fdHt7YX9/J8SL0IgRhL314Un4MvmIBsMZ8JQwgpUo/9IjvymnGKAVlNHiJFGDHgR3m0CfzZBRiG/Zi7z19MpoFfVh32TH9fHT+bnjwHLCtsL0dX4t6dCLIk54Go4GIkW4e9XF3Vdu5XbTnKhR3e/Aj17j7zuKq46m5iSsXGfHhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264929; c=relaxed/simple; bh=7dg6OjUul6CGYPKqeHT59FN/DW+jNVzMTYuArvmRep4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DBbYlF9nHh1MEPLeoSErFwwVD2EuFDVIVs8b6ujOvT6Gi5YaWBKMYB/QnykDZd3xNYXLV/qF9kH4dknAnog+8/2By4rKHJgy2ZBTiB4QpAoBgUSxAaIZqgwNnELHoabEL1iNaHG1A1HWOBbD8w5pWXwtqN4StR/jyoBWDOM7Q2E= 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=l+5qkZV3; 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="l+5qkZV3" 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=O+DQTIwXTC7DeV38nbA6p6oVvBJeZ5V9St2bzhvReOQ=; b=l+5qkZ V3hn1i5UCfgjdB/NMxnOMIKXwUsVOIau3NOx8SApuMhduvNDuw37LT0NqZ02RHl2 vy3HMrXqH+CNR+3vIkVQNK1u4RGuP72WXcHEa2aMV1AZqybnD+KkpTCeksrtsmRj i8oM6udJNXh/lbhz5xzhn6ddSGlSgewcL2F31B4c6ska0kVEWJcOYP7ewKih2/Om cuUiW0JCEB2ZSZyXAyP0PK70A6J8PGZ0hoqdJv9PATkfWbeUioxwTpwvv9ybtMBC aYv4rCwDrgDpnC7z2VHVRp0p0xc2LL29FEp5sENOVjBkoFia//g53qTY5oN8xfpq FY56Ka29EaWThRow== Received: (qmail 3810632 invoked from network); 6 Jul 2024 13:21:49 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:49 +0200 X-UD-Smtp-Session: l3s3148p1@LindYpIcMMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 39/60] i2c: powermac: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:39 +0200 Message-ID: <20240706112116.24543-40-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-powermac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 8e57ebe595be..b6b03539f626 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -127,13 +127,13 @@ 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, - struct i2c_msg *msgs, - int num) +static int i2c_powermac_xfer(struct i2c_adapter *adap, + struct i2c_msg *msgs, + int num) { struct pmac_i2c_bus *bus = i2c_get_adapdata(adap); int rc = 0; @@ -179,9 +179,9 @@ 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, - .functionality = i2c_powermac_func, + .smbus_xfer = i2c_powermac_smbus_xfer, + .xfer = i2c_powermac_xfer, + .functionality = i2c_powermac_func, }; static const struct i2c_adapter_quirks i2c_powermac_quirks = { From patchwork Sat Jul 6 11:20: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: 810993 Received: from mail.zeus03.de (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 851CE15F41D for ; Sat, 6 Jul 2024 11:22: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=1720264930; cv=none; b=Ru000K9b7Tj2gJgFaIyeYUCB75ikJC9EZXUDnR0ypHfZ12LDexy91iTyfULpvqG3yzpUqsO97qsxX1HQjHp7z7lHhuwByMB0NWf6y/ECOntuMjZW5vBlA2oNTxQkLH+8Irlg2s7TNC5YrpBeGvYPiGJ/P1qi5mj8/Vo73TU8s84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264930; c=relaxed/simple; bh=LC9274zYZNNoIDjW9gtVpFmKwtZgBHWPcK2ESnBlMIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M3+1B5NIoB7fM1eNLWkebVHC4W1OYOhKcmW1MMb0GbUWzxE6XlHcg3UZ9BsxJDpuwWthcdN78ks6nxhGpOvmcwXYWWEiKWTVq0WwNcTWAZQQK31kGk3qMnr9eJOdwmkoL0nrdoTpzz33V+qPQdPTGNgIr5lw+kicrF/YGymC/h4= 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=i5o4V6U9; 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="i5o4V6U9" 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=xIfP0ObNR3Sa4KA9WJrJhsOmA19adO8Gkgz3gqnCOiU=; b=i5o4V6 U9dZy30EU5m8SCenoLQBqZOoF2vq3Z7B9coBjQIYHubLkP77ImknPpAaL1h2xlbY l09GI6TV+Wfh/uh7jmwSGv7AohEEJmbnuEfKZ9MfA/X0D8eLWDaPDetcVKck9pmn 65r3wlN9HEbiM1w8P7J7+FVUnqDU3yguYy5SG4rKv94wtKSs2O09aAhyAjeQdvF/ exZ4GBCVXW+RwzWp+ZOte95i5pi4Dg5HTLqkHdgHERGFnchxXs0mrDwFl3HEye5W 4GCsEaj4HreiH1aqgCP4yV86CZu49Aw2hQMVlVLNINd5KaOv7aO75QS/oQQSBF1i XIYUburcWFEEDCZg== Received: (qmail 3810663 invoked from network); 6 Jul 2024 13:21:50 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:50 +0200 X-UD-Smtp-Session: l3s3148p1@KSXnYpIcNMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 40/60] i2c: pxa-pci: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:40 +0200 Message-ID: <20240706112116.24543-41-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 Sat Jul 6 11:20: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: 811289 Received: from mail.zeus03.de (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 031BE15FA85 for ; Sat, 6 Jul 2024 11:22: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=1720264930; cv=none; b=j13epl3JjVLReKQS9IAL1cQgnG1Gl9pFuvmBHT4w/zbqxmQWLYxOBpiVbO0WY31NzR0O54UthAUjrT7Z9hiPHUkht/znEIAvKDDbNm1YawSSFCMBPhm/X7CTBFem/22bajzt67C2gfw0iYXHa/iskaagp85mYI2gZJ3GBz3TpTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264930; c=relaxed/simple; bh=/0mbUXQOssGvOZp9PXUiF3M123C187KgRjX28VAN3ck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NRmCg2TB6snVEzvWHejG7ffJUd3EAMIJNvBO1aTI8kJPyRtGuC4zvtf4USb5nOP5obFyc6c9k4351uGoPoof3lY9zeH23KGX/Q8IO1aAudkoS231EsE/8rnkZKVUqApjgMuTJ8LdEkWceI4DhNLAhVbODIYvyE+rIMiyXgH7otQ= 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=dGnexEob; 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="dGnexEob" 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=KGGekxitNI5E5Pu69wof1oXEJUTdt9X6qQPqXga/kPo=; b=dGnexE ob6B6EH3+zjS4abBHZ9KJThmGIC6FwNrDonw8DotATWe8VCpFmNxWbbzBEmr+nYo QSLnVEfYZRdECNJvtzT2FqommW4/biiX6VLHIUl618ZxplRrQ7gijNdzjNu4mvqk iEqKgAUEMKcq8MIcZ7Gg3Eey4DiI1lOhIYa95ORJYlNZeuTQ/ydbzSsvHwVT3O9P lJ+xTorsDY+THLzPVqyhe0maPJZxvgsXmp7FKncWzky8S8lpXgSg3Qh9pGl3XRiF CNO7/04g7ZQyFtxC0HeB4vTokM7s+BFqNUxqN5su7Am4ZUPzFRjish5ejMa1jCzG MFOmgkf2x28CIjXw== Received: (qmail 3810695 invoked from network); 6 Jul 2024 13:21:51 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:51 +0200 X-UD-Smtp-Session: l3s3148p1@zqfyYpIcRMJQT+F6 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 v2 41/60] i2c: riic: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:41 +0200 Message-ID: <20240706112116.24543-42-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-riic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-riic.c b/drivers/i2c/busses/i2c-riic.c index f608b1838cad..d6f585cdb7e5 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 target address + RW bit in every case. * - * 2) TIE sends slave address + RW bit and selects how to continue. + * 2) TIE sends target 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 @@ -294,8 +294,8 @@ static u32 riic_func(struct i2c_adapter *adap) } static const struct i2c_algorithm riic_algo = { - .master_xfer = riic_xfer, - .functionality = riic_func, + .xfer = riic_xfer, + .functionality = riic_func, }; static int riic_init_hw(struct riic_dev *riic, struct i2c_timings *t) From patchwork Sat Jul 6 11:20: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: 810992 Received: from mail.zeus03.de (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 EEE521607BD for ; Sat, 6 Jul 2024 11:22: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=1720264931; cv=none; b=qwqpsu3df3Radt1J4lLXf3Mk5En9BDxERITDK7uZX4U4GE6G32k5TJ5jhOGUcE1lU271p+cGFU9pUqmFI6keSkmubyEeNksWQNuGk5P9MAWstOMquYuWqramEbOOXB7gCbhpW49efbJGsoS4o9WirO78h8INakOSJEhJWsxQ81U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264931; c=relaxed/simple; bh=fV4Z8lsCHMIKW0jWPNAkbOq3VO5joB0a9eHcp7lyDmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GqsPi5MHbBMPLGcTP7VG2pYCF99dJBajV9IFaYvTnG0FM/nwcKFUPtu6t3rwflwyRTEohunDeNlt1vfewacpaQWTxZD5n/H8yzIOHqKxECZpWwNeNWkvZG/HnY4j13sQsybAr0/+FP/NXx4cFKejRN2v5M2+9qIStKFWUdRcs+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=j+XQVk6B; 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="j+XQVk6B" 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=PAKZYb75MbZIlrhGBH5RBytdsA/Ghy1+cbVsoMUguWM=; b=j+XQVk 6By7LGB9+eDr3bl7zhu3fBf+VSks0q75o31VUqvVX0emMpwM+CsUZ6ymb+9YSYx8 qohWv0AypEpEDtJLjv5P46LcXQ1LamzfkP/NrE5XYU5R4TF2NDEbxfBts6h2rBZv f4IwEkgNZKKOlJi0uE5zwjp2cXBnihrZFJcJSjNsDgYX9rqfxolMiHwpM1MdMaCW xDiRxO5zfNS1DyF4BNft4ZouV6ESDM3DljsVSDsfNqcfCYlCRRg29yNLDvYRo/Oq f1wnw4tvsE7s6sTJ0mtMXsWvvY3XFMz9+Hf39Mng9NswBWePNQ0HaDN4YF+g9z4v pvBBbt3LA3FJs6Gw== Received: (qmail 3810740 invoked from network); 6 Jul 2024 13:21:52 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:52 +0200 X-UD-Smtp-Session: l3s3148p1@pxj9YpIcUsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Heiko Stuebner , Andi Shyti , linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 42/60] i2c: rk3x: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:42 +0200 Message-ID: <20240706112116.24543-43-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Heiko Stuebner --- drivers/i2c/busses/i2c-rk3x.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index beca61700c89..4ef9bad77b85 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 /* target address for REGISTER_TX */ +#define REG_MRXRADDR 0x0c /* target 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) /* controller data transmit finished */ +#define REG_INT_MBRF BIT(3) /* controller 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 target 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 target address and the target 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 target addr first. Use * MOD_REGISTER_TX for that purpose. */ i2c->mode = REG_CON_MOD_REGISTER_TX; @@ -1160,9 +1160,9 @@ 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, - .functionality = rk3x_i2c_func, + .xfer = rk3x_i2c_xfer, + .xfer_atomic = rk3x_i2c_xfer_polling, + .functionality = rk3x_i2c_func, }; static const struct rk3x_i2c_soc_data rv1108_soc_data = { From patchwork Sat Jul 6 11:20: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: 811288 Received: from mail.zeus03.de (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 EB62C163A9B for ; Sat, 6 Jul 2024 11:22: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=1720264932; cv=none; b=k95ubMR06h+f7bPUT7LNg+lXiR8/tr3fH6g2F1SORAKmC1hcVEhdytZWRa6uWhOIv9SnJPrDxyT8GAWw8RHpRVdztpc7Qr+UOhRn6zmwaCigg99O8KpOi3c0rt3GBgNTsp47I0/LeDs4AUd3fCpf2pt+8STtPUdNg/zEBoHP+NA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264932; c=relaxed/simple; bh=w5GcCkcs6imTks9IbKCY9YoQgcB5kKw6KzWCMSJTC/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hh3TTA5FW23r2xzWcr3Ta1PJUnrMF0JrR23dggYploZg7YNzLz77EkP5MVL4WBSmjXm7VZ1QXNdZLHChhinsGrMPEBARMfYpW+39NBEB9DgRykHZY1rbLMFDnvU0km1xdCLrIGjjlPvyasQrU1CShGYQ29M6pYFpm0IF8+EVn+Y= 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=lPs95hzk; 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="lPs95hzk" 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=yWAWcS0izyrYqOoxdBOC0Ijbo75Su8wsUQVwvGrthAo=; b=lPs95h zkLE/aXldtIAgeBtkAresAdHyssWgy+CtCdE6x3UkOa6J1lxlzSGhH+OzrA2Qh9W 3xFDi4CkZEPH5OLpVhZ4QKvroFfkNft6oAV3FFcFTxXcP2jCXnHGx+ExDx8emf0m PvXCVuweON6f+Q0HPBLFaFf92ulvHiwdym2vasLmZbh8mh72CxlbM88R4X/7F2CM +3lsi+mbBl792EzYrLT4lT7kOVN7GOmdhvMLFoGG+HJWx/zAYEJRAMoOnm8WBGM7 CAojjl1231e1VTHvxV0H6rCYGlx0TwS3QCjxZbvkNRIkaneXYE02d0mpW2fs5Tee rUIZ5qK6mFnZDV+A== Received: (qmail 3810766 invoked from network); 6 Jul 2024 13:21:52 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:52 +0200 X-UD-Smtp-Session: l3s3148p1@UuIGY5IcWsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 43/60] i2c: robotfuzz-osif: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:43 +0200 Message-ID: <20240706112116.24543-44-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-robotfuzz-osif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-robotfuzz-osif.c b/drivers/i2c/busses/i2c-robotfuzz-osif.c index 66dfa211e736..80d45079b763 100644 --- a/drivers/i2c/busses/i2c-robotfuzz-osif.c +++ b/drivers/i2c/busses/i2c-robotfuzz-osif.c @@ -112,8 +112,8 @@ static u32 osif_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm osif_algorithm = { - .master_xfer = osif_xfer, - .functionality = osif_func, + .xfer = osif_xfer, + .functionality = osif_func, }; #define USB_OSIF_VENDOR_ID 0x1964 From patchwork Sat Jul 6 11:20: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: 810991 Received: from mail.zeus03.de (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 E221C1667C7 for ; Sat, 6 Jul 2024 11:22: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=1720264933; cv=none; b=JDjFaSVuVLulh7wgwEM9JswthOWjexeXxQssT+0DUCk5XBxHwd/uU8+d9Torr2y9QYZ+5Pt5hdtck9A5Hn3ChAQoEhS0iM7UKpmkZX41DQQe5ov0RyHF8bvvsppwITFvxC7EJaUCx6BKAuafcLN3aKx8UncG9QPBnANXysUxULU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264933; c=relaxed/simple; bh=V8GzMYxUk0jHdZK4zpgyxLvV94uulnNsO+n9pA51jpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVHidu9ELSJNBCgmPnRCIi2/fgOqIOUBkXarHYAp7tq4A2fb2xhsazxyn55W2Yre9qmIM+4JwUt4z+ZZEvzZNMyYD/XBAnMSeJvVJXiqwxn44Tf+q7Jslpytd817hLOwXM/e7k/MomTSnQIMpj3ft4skEmDAPAsbe11qR8jeTvw= 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=ka0BtGaI; 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="ka0BtGaI" 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=/P4DoAP5gYAxjEHPsExZWYzXzNikF5f0sRGxYHSLQ98=; b=ka0BtG aI9yT89bk8EFs1JvtMldAVVSg8CFFNBeR2UiwyHQHn9Bt+H1LSLmD2CmQr2rx3GJ InfW0SZ8Hb2a4kyVaQMmU/TflcKyPnuPpNDOrm3xqk1EGygZ7ENnSO05l6I5Ga2P gSbfPNP7tzt24Xr7gtDAxE+N+tf3qIW/9TDx9uo/yYuxBqTqUEpX2HjLhb3aV0cL 7qMbD9X4KKY5anQs7k7Yb0zZaXUmR1eSgoEjnwyDh8Bib3VJmrVwY61ESI/eLE3m 37iADGECWFPQkFi6SqvqxpZwQhfTlJR324WTAPtj0efDu9vylxvRg3+aCikzRTOj Bf5kdQGtfUS1ZSuQ== Received: (qmail 3810807 invoked from network); 6 Jul 2024 13:21:53 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:53 +0200 X-UD-Smtp-Session: l3s3148p1@x9gSY5IcZMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Fabrizio Castro , Andi Shyti , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 44/60] i2c: rzv2m: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:44 +0200 Message-ID: <20240706112116.24543-45-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-rzv2m.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-rzv2m.c b/drivers/i2c/busses/i2c-rzv2m.c index b0bfc96b9ede..8380a68538ab 100644 --- a/drivers/i2c/busses/i2c-rzv2m.c +++ b/drivers/i2c/busses/i2c-rzv2m.c @@ -321,8 +321,8 @@ 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, - struct i2c_msg *msg, int stop) +static int rzv2m_i2c_xfer_msg(struct rzv2m_i2c_priv *priv, + struct i2c_msg *msg, int stop) { unsigned int count = 0; int ret, read = !!(msg->flags & I2C_M_RD); @@ -351,8 +351,8 @@ static int rzv2m_i2c_master_xfer_msg(struct rzv2m_i2c_priv *priv, return ret; } -static int rzv2m_i2c_master_xfer(struct i2c_adapter *adap, - struct i2c_msg *msgs, int num) +static int rzv2m_i2c_xfer(struct i2c_adapter *adap, + struct i2c_msg *msgs, int num) { struct rzv2m_i2c_priv *priv = i2c_get_adapdata(adap); struct device *dev = priv->adap.dev.parent; @@ -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, }; From patchwork Sat Jul 6 11:20: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: 811286 Received: from mail.zeus03.de (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 C2EAA15F400 for ; Sat, 6 Jul 2024 11:22:13 +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=1720264935; cv=none; b=giMIrkgHa92Pzg9flxpHjdkONWuC59przsW5AJtsrcUi0G0bt1dfVqcF3XlYYVdiyhooNtJ/c640iRJe/qcdO1a55dl0LQsGiR3ultAkRyyTBwKCxWmtfL8kZkEfnXy7v354Jzi7hJGjwaeg9McGoPLWcQzleWI+9p4OdCRFhkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264935; c=relaxed/simple; bh=oe9kE7IlLNP12Xetii5tL+q+oVquoer3DC9xvAqBaHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZH6whkP6WKhe0htNCf0XPNSkxp5MiWIs6Ta6LKLXYyiaayezPwRAY0C57KguLOYGLG23dPKzrHLfnxh+dhr+tpx9hU7+qWuWGWl+YAO2+MuOQFkGzb/RZOS2v4S2HlkhhunBpIsGEnTsAovcYi1WuOUB2kvbyukTbn8gWlqE6v8= 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=aab3VH7X; 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="aab3VH7X" 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=JcAYAk0ghBJQVZv6kEqnQcCKNw8XhxvsQElmIK29aYs=; b=aab3VH 7X0h+0AJL89UZ8LEAcoVykZR6OO9g5tMLldWc48a7mlqgFFTsZApN5j/VC7tssOj JitbYiLpl6JfTtCj2XOoxMkcJCG648UzivdPYPkjnlUi9vxhgBgu39vOAcIXyuEr FEfIAKHEHuTyZXGExSgavlf2KNLK328MVROVdjatT3aEUaiviS0ZV4EKOIx2b+e3 9s/4sEvSZNp+ARpP3KNfBeorSdete7yPbY+BoJqkjOoQVFfopK9z9sSSheuICOjf QiTJz3iZz3xdHjIlAs2B/KatAIR+BDnzAEH2OQBYrF6jWQtcsPDR5DRM4KLWF5bT vQlTKlnGFi7Lp3Ow== Received: (qmail 3810829 invoked from network); 6 Jul 2024 13:21:54 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:54 +0200 X-UD-Smtp-Session: l3s3148p1@+MYcY5IcZsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 45/60] i2c: sis5595: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:45 +0200 Message-ID: <20240706112116.24543-46-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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..ca06fffb8f61 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 target is stuck in mid-transmission */ result = -EIO; } From patchwork Sat Jul 6 11:20: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: 811287 Received: from mail.zeus03.de (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 8A36C16133E for ; Sat, 6 Jul 2024 11:22: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=1720264934; cv=none; b=FeQkqs7KUpI3mZqOLdxQZgnjErCbwfR40yZUgR1v7w5pp/5jrBfeAjSKMZvYA6XB3P68n1Uhz8/RJC0MInrAfhqaNdKWa4vuJObnr4vRJ2/4foi0O5jQjb65ORCS9mLqUC1Tr4iN0Haa6Q/sYG9V3QavqV7lgBi3gAk6sYUpqOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264934; c=relaxed/simple; bh=NqPUGmY4yPckXxebl+IF1xCeops/RXKYXBxYsfQOsj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dcTlVpUv+MPqWvRZWW62+qAW/GOUXjlCewxRuPzAsfq4NcGfH2Ikp1W2xuSMOm88cZGnj6tkCqXimryFBjMLDa2uBkc2FW3OT+2EXRjL7BTCbwDmfkBhXqM/Ckem+33EucK/aX4zwGDSYkIWzAOOZS3tRLGxb/k5KFGO96TcMRY= 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=Xj/BlVad; 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="Xj/BlVad" 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=SgAWAHCm2OkArTMAHN6HKOX3gXJ4UsWc8pEfBk8i5mY=; b=Xj/BlV adxaqmUG5/jeVIRP4JtcifKgj705u3ftXAcDiZwh9nX0kGzmhEZcyAlbi2tUlii7 DT7S/hTiSrc7cMaxqDIxUosN/KEH/hwYsZnnydtlhSud1GEH5u520D5IohU8B4WT C/0O+j0/skUvttwNbkyJcXe4kaiUluQdMeJEqf1WdN+mpJX+j4lvDaB0MdwOJqEz FyqllzLrqTqe8bq6z33tUz4TXfR7T3cxiBDhxH/7hKDwbvyYBhLnXnxtRsbIAAPT 1Qd+E1Vz5IPRy6sweIDBT9s8gC9NTyXTcaTrcwUZe/TAspmnoE37U1c/ZybAYJbP JkMthf+GDmqR1ttw== Received: (qmail 3810868 invoked from network); 6 Jul 2024 13:21:54 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:54 +0200 X-UD-Smtp-Session: l3s3148p1@kBAoY5IcbsJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Baolin Wang , Andi Shyti , Orson Zhai , Chunyan Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v2 46/60] i2c: sprd: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:46 +0200 Message-ID: <20240706112116.24543-47-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Baolin Wang --- drivers/i2c/busses/i2c-sprd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index 28c88901d9bc..9c45e75b9187 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -283,8 +283,8 @@ 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, - struct i2c_msg *msgs, int num) +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; int im, ret; @@ -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 target 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 target. */ 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 target 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 target 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 controller driver"); MODULE_LICENSE("GPL v2"); From patchwork Sat Jul 6 11:20: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: 810990 Received: from mail.zeus03.de (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 BC1B91662F8 for ; Sat, 6 Jul 2024 11:22:13 +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=1720264935; cv=none; b=mJu3topMGzPQU4OvFX7iYUJv14sR8OTpgrowfqSsYoCrpfdAl4HuyL9ysamiXCFsfxM/nIu5pOVqSj50TZi6oG/4UxdqjO4ZF3iqUP/xDFDFze7yE0SjNI0N0hJaO1aqcuvD9/XpoDDFUvW1fHuGKgH7YKR4/m2+Ry5/8zcmq1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264935; c=relaxed/simple; bh=xHPnpi6eiQDJE9L+MxdWpmnPjGGiALkR0vdSK6lSWo4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mC6Jero6HC9TFMO75Q0/AX3qVf9LZQk/JsMkrvehOpNx6TVWMC++vblPYNeqqb9PpLcq9BLNiL1hGqYcMv0tq2KBhLmHe0ZjpBf2jGXEG/5aXXau1VCiL+fuB5Q9bqqU7i+saPeGzeoSHHvooaVUk247SNgRHoq70Kjgq3zM6e0= 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=iZZLcf0C; 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="iZZLcf0C" 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=QJWNzgVhiKNUakSn/o8o6saMacqq+3MIaWzpwwRPzks=; b=iZZLcf 0C/yqF4Ipvs0fLkbI2GHbneYnvyphkTCN8MGd+HGJadBNkYa44fjrU+RB/Xkbd1e 8sErBBV7hK7RHG2JkkSWng5cyR6CFsRrib7xfrJAjQjkfSsRxwuGL1NKkYhaAgaR naJb93vpPDHn+ngOSDBu8TtjxYtjwrl2GPZ2NLZs9RUvjkdOdAKQXgvxgKoDs195 kBklfsyqjDehqrrUXtk38Zwb+n8UL3G/Xajz4jQPgHVSHfL8mvv7rkvu4+uayytF t7DWCYKVMSN4IRTXntY47KNp6pCw+GVwrxeoz/8n/jQzoHN8DxC+jS8MoNfoPhvt DPiF7YZZkLWHpYvQ== Received: (qmail 3810899 invoked from network); 6 Jul 2024 13:21:55 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:55 +0200 X-UD-Smtp-Session: l3s3148p1@uDUyY5IcSuFQT+F6 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-kernel@vger.kernel.org Subject: [PATCH v2 47/60] i2c: stm32f4: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:47 +0200 Message-ID: <20240706112116.24543-48-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 f8b12be6ef55..230fff0c0bf9 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 target 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 + * controller 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 controller 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 Sat Jul 6 11:20: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: 810989 Received: from mail.zeus03.de (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 1E60A16D30B for ; Sat, 6 Jul 2024 11:22: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=1720264937; cv=none; b=WT8X2GLoleDKnYy18MgSBDCTlHrOwWYmZEe3G1ZKFqPKce325alliu2B0DD78tCGPkDCztA/qw3vAZHeFOT8QXNPJqvqkajsO+WUspiyJvVffRMdphW3srzUOyMyp/1CSUvTNNo1n1tvQWBlzq5bZJa2qz5HzfcxL1fbnH6N1Vk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264937; c=relaxed/simple; bh=piYNfirvyvUfVGJpwWM2pBJIFdgHNDAvd7DaSUMEABo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e6tV0NiKJt0Kr8fwxnqCxNYTiMD18yXz9Zi53IKciogo+ypAmKagiWHdONNketCi23R2/zRrFqFRJgZdb3lcLDnhsWChDhhKQsY20kUscyaT1fhGHnw0CycwoSvrzP5h8L136nrBvUpDSo9g7mnIF2/SiKNcXuXpIDcpzI6gLrU= 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=cvNR0uhY; 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="cvNR0uhY" 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=bI3IPaPgeZwq3XbmFqqNETyD88lvDgDpAuhZWxBVAU0=; b=cvNR0u hYhMOldgrg1u1peLHJ6B1wVZGcNJdum/1PSgwf5eaQkyRvypgqPDF4N75rXtYPW+ T6fpS55oOfdY1ya94qAQGckW125xTDa+KAuDsU8XdpilTVJJvViNQtkaIeLqoNO6 g3YFzH1IWTPrjm7GWZQdbO8b4FKAyYzjAmjiKAmX7iYHEAI2xy6S2etS+AoqpmI9 duZCH3sfJOdIQDLFATtIcSeNfKvBSyYDaU0XH7gTd/8tbtDsKUQ7Wxm1aZbESos2 l5kLplvpBEcxzXcIhi8lA+pdqpBhZ6NIaPDphNkhmgTRw2YssTA7tJddVSLQ2NO4 w4YSk1J4F2hFKUJg== Received: (qmail 3810933 invoked from network); 6 Jul 2024 13:21:56 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:56 +0200 X-UD-Smtp-Session: l3s3148p1@KA49Y5IcWuFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 48/60] i2c: sun6i-p2wi: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:48 +0200 Message-ID: <20240706112116.24543-49-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Acked-by: Chen-Yu Tsai --- 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..074eade6c4a4 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 target 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 target_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->target_addr >= 0 && addr != p2wi->target_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 target_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 target 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->target_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 target_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", &target_addr); if (ret) { - dev_err(dev, "invalid slave address on node %pOF\n", + dev_err(dev, "invalid target address on node %pOF\n", childnp); return -EINVAL; } - p2wi->slave_addr = slave_addr; + p2wi->target_addr = target_addr; } p2wi->regs = devm_platform_ioremap_resource(pdev, 0); From patchwork Sat Jul 6 11:20: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: 811285 Received: from mail.zeus03.de (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 052D616DC34 for ; Sat, 6 Jul 2024 11:22: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=1720264938; cv=none; b=q/CiADs2QEocN81UkNZAyO3btsWAkHD8EPs8qYeJMa6yvfqk24bXNf5nVL6fvnpYj6y9XtSCfxw4XQhJW0NzM3EmtB207LIDC4ml3kyxa4uctvea6qU/wTR7QZQtKt7ZDWfcOBUR6Nzjocj015b25cSTrk+Ryrxozb5fV3KpIEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264938; c=relaxed/simple; bh=eBHrHkI6Nd4d5SCWQASyR9US5Mg6JBED6ehzIwuKkTw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qexrc6eFuXd3q4RCMkfsjtB968t93Bv6axk4rFZ0IJiIAezApiRQdhFGBPe28PlAJ6N5VccqkN3z0nQfSk8EU2bs2o18yq2jqJkQexMylXG2kQMKsBpZi2PkG2Hl6JkgV3Bh7lo2iQiz04Q3itr8ejpdE8k2oncNUmu7N5th/xM= 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=eaeuSlPf; 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="eaeuSlPf" 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=PXtdsFJxyZ9m8awyqCgDuxOaIoekKdLAdMsXbGbMzfs=; b=eaeuSl PflF/EcGuJKwitEEMAX6Wvm2iAHCo9Bt6Ua7JQ3WeL5o6X72L9Rb83zvVyiNwfWX z51+ZV2X34wnVDyhfPgyh+9JACk2ag84yrzN4qqlDhFG6i4SHzuUiTi3b6uYejLx C7BVTWJQ/r7Xwjd8X+d87FD7G5mEfoldRu9xLn6dsXFwU6EboEuxRWW1Qu7TCRBG 3ClnKYC/QOGyL07zOXIdkJi1Z4DCaOrHPSu2bN8t9/pt9WX9c0MdGzW+CHa1Qs2/ Q/JUW6hi9GKkywLMkc2ng0wFTZFt5oqgESjuSZ84BFi8B5OkHrKQNMg50qV7eI/H mIFbBZzlisYWkRew== Received: (qmail 3810957 invoked from network); 6 Jul 2024 13:21:56 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:56 +0200 X-UD-Smtp-Session: l3s3148p1@mTdGY5IcXOFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Jean Delvare , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 49/60] i2c: taos-evm: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:49 +0200 Message-ID: <20240706112116.24543-50-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- 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 Sat Jul 6 11:20: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: 810988 Received: from mail.zeus03.de (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 4AD8316EB47 for ; Sat, 6 Jul 2024 11:22: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=1720264938; cv=none; b=KpMH4BHpxXiw8/2ghqDzuGr24go3E3YfVizProbzGJhzjpO6iL/hyT62vs1uVkvuTSyUqrG+4x56WI66lzC/wGjAAIuwRq2m2O6lSUcAc0qv/iLj/xhSb2FdCsae+yPRk5T1kr0jXCHy1Arl9HR+GbA1K07YJEc3kSd1gUWxsXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264938; c=relaxed/simple; bh=sMBjjjQoRzu/y6oDuR1pOkVv5xeFLjAXjqL3/H01n3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FFWoszPhIhGI//SQfT6mlcJvXoHb+shaC4+OhKW5G/tMjosccFiwUbK+ikP9SCdTc6ybAPM1DS/RRvLfEhM5ls4iHQw0W2hkOH9jUYOE/G3lswcbKv+S9ILNICniXPMQ5hvN33bZ85i84QEDiedeKI1NutJc4M842VB/eDX8KpU= 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=mGTNW4DV; 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="mGTNW4DV" 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=RKPno80B5b7lMNmuILEfR5vn3B5nA82KHZrBqcTfrZE=; b=mGTNW4 DVedLtKjZp1Vr888EnmryAFZ9XwyXRbyYwt/V3u1KOYBOC+IsHrT2MkW7YlCCdkS azco/mwoUoXbgOS6M1U7SuYHD6CQeKFHAcYuhgJFrv9WnuO+Fzzv3jNKgNdZmDZj Peu93Rb7I21FUH9EBmoLlB5AjT78783hh66Hkx1qv3aRdxLJnQIES/NFAg1EhUtu weMBT37yUHeVuC203oga7Q5TbMrYBRbqrQJEBwcrtKcpztaSpPX2Hg7J8UBEPMkp almAeWaZ6/RoZjRAJhmtjyQzJ6XhkTdGLggGqx0pRbgs1MDmJLe+6sMF4zDJCvAf ZwKMnrsYBJqYXI4Q== Received: (qmail 3810984 invoked from network); 6 Jul 2024 13:21:57 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:57 +0200 X-UD-Smtp-Session: l3s3148p1@FMhQY5IcZuFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 50/60] i2c: tegra-bpmp: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:50 +0200 Message-ID: <20240706112116.24543-51-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-tegra-bpmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, }; From patchwork Sat Jul 6 11:20: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: 811284 Received: from mail.zeus03.de (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 5802617622D for ; Sat, 6 Jul 2024 11:22: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=1720264939; cv=none; b=ftBzZ+KdWMiVBHftRrn6aDcWyQV1KeV1TVsIUtUS2XnBzAV4IfcNIQImC0UbWge5jxn6fc+ICdkuuxOY7ZZ+SYHqJjlvcuXlOYzjUJm0clGNGF8glbVgo0EoKxEz2Zp5FABAKBP3a6NkhZB3JSKbzM76r4qlz/HSt8U0mbJywnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264939; c=relaxed/simple; bh=ay0NNYp6uB+Hzz66hQmEVe14Hbw3ALbsqZ22fhHX/ig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CUl40Ao70DJOKil8kJbB7gvxgdvvkfdNL7+n199XLpLuoENAVlJZS+GfBtKFJxgaJ7bsu66ufNgJiVdaXKDWxzPBdsiSAAEd51eQ1+vNOhvI80jPMX7yJDDn0MlJ93siM0mDLqAFmcVJF9h8S2nNUIWuZc6TSHg7kcx1Jbcai1Q= 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=i2FX1UCT; 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="i2FX1UCT" 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=/7futhidHP5gSersG6I/0JwsF+rinC/q3OXwrLgvIjY=; b=i2FX1U CThJagfpuhB9HEIXbAPHzXQKPTA86+2GDZY5JSShYE/8EwJGbEz5fzXO8/+4Uncm YyejBkkdbEI2C9wtliJEG59GuRP52GbU1VfSuijw9Ap2sfj6GtE8zUUlZASt3CJL gS6m6BgTlsCdiLY/BubVSLcVgBvE4m4CnYzMZEiUSLRWuf3ZT+OgLU6MN713+p7h MnT8IGy7gFDYyln3ns3l+x4wrEWWfKr5xabgf+0Or3Fq7+0pxHj97PuiCR1rwthZ vSLmzAAujQeIxrPKDR+1LKfpiHb070i0MFDsoMyX3+rgjT4bDkSKYvlKtePSd48+ 9AiJjDYtdU4RPz3Q== Received: (qmail 3811008 invoked from network); 6 Jul 2024 13:21:58 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:58 +0200 X-UD-Smtp-Session: l3s3148p1@XelaY5IcduFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Robert Richter , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 51/60] i2c: thunderx-pcidrv: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:51 +0200 Message-ID: <20240706112116.24543-52-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index 32d0e3930b67..143d012fa43e 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -72,7 +72,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, }; From patchwork Sat Jul 6 11:20: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: 811283 Received: from mail.zeus03.de (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 301DC176ADB for ; Sat, 6 Jul 2024 11:22: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=1720264941; cv=none; b=XAwV/K+wbM66jTIVVPq06/NlcaN7isg1cukUK+vzfV1JOfm7y9P8Bzt5+YLQMAJdVT2eszwhrrMH+zUkb9ZusZjKBxs4DejYc3M5okb2rZxeMv4zZNSo78Aou2HUu+KrcuZSQXCqG/jkHPPGKoWAi0PE+K/TMWgBODcffpZxeK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264941; c=relaxed/simple; bh=44/VerjRMZA30NequQC9tYr2rT1O0nD1yDM4lmWDf14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhLL/OYfwAID90oU3PM1FQK2A2vhCVL2JJWivynfudeKUKLfwGs8ILD8afi4ck0/HVnTgCe1E3moHf8Tg6NAxDp0+crwu1272j/eNPM69gjmfiwwK1JWNlvS8kjd3a0LmU6Vx1pRCLB5K8/9pnk+NShvnRhq78gfWpT3gvzMKN4= 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=g4Y8iwaz; 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="g4Y8iwaz" 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=7dHCK1HMmymfMi5aVj2Q/0weiMMX5OpcY1dlNcQSBpM=; b=g4Y8iw az+TME0+XuqsqIVOYWJ+GH6ikN0ag8QbSc07b+se3kPLeKjlfyJMYu/NlTekywy8 2/q7MbN7rB0ooaK8bEoS3v4Z2jridsyOS3MtIz2KcKMjP4+/+j25zS2QIBk6B5QJ HS6e+btes3HneBVgeuQ/w9QGXR9dLdLMp55zkVItaIQK7KvuVjz2Elk0vg7BL/Pb pEWXLws1l0Jm+mWtsqk0//n2OmaEqvs5xCOJXBzao7TkH5SzE641WyH55TcAugxU cLG6MkeJbhBWybICHJOugm0bqsuu6IQWO0V08LeiRRIg9MGTgNEsV84qZCbtRPHu iaePH14vcfncEhfw== Received: (qmail 3811044 invoked from network); 6 Jul 2024 13:21:58 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:58 +0200 X-UD-Smtp-Session: l3s3148p1@j7RlY5IchuFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Till Harbaum , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 52/60] i2c: tiny-usb: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:52 +0200 Message-ID: <20240706112116.24543-53-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a superfluous debug output which is already available via tracing. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-tiny-usb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c index 1bffe36c40ad..0f2ed181b266 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,8 +140,8 @@ 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, - .functionality = usb_func, + .xfer = usb_xfer, + .functionality = usb_func, }; /* ----- end of i2c layer ------------------------------------------------ */ From patchwork Sat Jul 6 11:20: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: 810987 Received: from mail.zeus03.de (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 A6098176ACD for ; Sat, 6 Jul 2024 11:22: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=1720264940; cv=none; b=f2z4KA0H17nWNx1TZ13MZKOeFEBntTKByMjMIwB3s5APkbEpYEsBmqjocnZkcp9CqmRQPBPqL+02+1INR99LrbUX7UjrMc2H97SsMG79FmCtq+CvausWEGOmLFGQ+Ss67C0YvHnOTCGsnJhLEYNHdR/uyeURBcPkBtsSi2Sj6Cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264940; c=relaxed/simple; bh=uto8Pdj1YRMUFV3G76FwUujDFt4c9/1d8SImzEdbYUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WjqcSestSiuGMRytTu54ZPD6kQmMsYYxUifm+HUAlJigUZX+7yfeSLi0TBJ2DBYc6QR+/nsc0WEseIm4M5YvQI6SBGrCdGAMJ54ht8ml5XiUoV8k7HS+5tdjG92mCvwVn9S06i+a1449vEWy5TAKZ/UYQCO164lCmRc+ly7pmi0= 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+bVB3Ul; 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+bVB3Ul" 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=pfpnH4vIg5DFjDwxK5vnInKOpo7NA3S1zIbA7Njtltc=; b=E+bVB3 UllDwFTr5PSFY7Sdxs1VrH1uExrVIX5mwyrWVA7ZEFV77Vs3BtV/wOof13BXvD+V i3zWYn3dr5MavWdyr2dfxIOlREwotkyzIfSc+gibSBlH/kXlpcvfCH0qtYxcAgAa puxnOBt76ENE82byitv6pQ8kEbPG18NeSvPDRm1ad3BD5t1azqXwGLswHncfZhTS lF3raTAmKGJT0INjM3Jcd5Q46pMSWJfPfTNHMrJZePUZeOgSpZqjPGqrUzFr12Am xr+1UA8JpDCrX3Mi7yoX1p1nJiRgdcuc/xF4FUs9GLE6zeIq7PqAEO7hLESrQTcA FgnmuB2HaTGScX5g== Received: (qmail 3811081 invoked from network); 6 Jul 2024 13:21:59 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:59 +0200 X-UD-Smtp-Session: l3s3148p1@fyFxY5IcjOFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Kunihiko Hayashi , Masami Hiramatsu , linux-kernel@vger.kernel.org Subject: [PATCH v2 53/60] i2c: uniphier-f: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:53 +0200 Message-ID: <20240706112116.24543-54-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-uniphier-f.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c index 6c3dac2cf568..10a99cd08972 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) /* controller 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 (target 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 /* target 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 target 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 target 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 target address with RD bit */ writel(UNIPHIER_FI2C_DTTX_CMD | UNIPHIER_FI2C_DTTX_RD | addr << 1, priv->membase + UNIPHIER_FI2C_DTTX); } @@ -310,9 +310,8 @@ 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, - struct i2c_msg *msg, bool repeat, - bool stop) +static int uniphier_fi2c_xfer_one(struct i2c_adapter *adap, struct i2c_msg *msg, + bool repeat, bool stop) { struct uniphier_fi2c_priv *priv = i2c_get_adapdata(adap); bool is_read = msg->flags & I2C_M_RD; @@ -340,7 +339,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 target address to the FIFO * kicks the controller. So, the UNIPHIER_FI2C_CR register should be * written only for a non-repeated START condition. */ @@ -403,8 +402,7 @@ static int uniphier_fi2c_check_bus_busy(struct i2c_adapter *adap) return 0; } -static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, - struct i2c_msg *msgs, int num) +static int uniphier_fi2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct i2c_msg *msg, *emsg = msgs + num; bool repeat = false; @@ -418,7 +416,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; @@ -434,7 +432,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 Sat Jul 6 11:20: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: 810986 Received: from mail.zeus03.de (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 C56B9176FD8 for ; Sat, 6 Jul 2024 11:22: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=1720264941; cv=none; b=ILAKJtExNpPqGXBUMlM18Rr0pvs3IWhRIRkwtCZiInxaMO5VGmTAD73OwR2bpJcMS20VDdNEAGxSQLITR3loNeQp+KGubKvkN5WXdtcBy5DhB6aCRMIEPphE8PNPIGvhj8vN+mfLR4VnVti0T9cD2hm275kIjyuPOZaEDOTYrx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264941; c=relaxed/simple; bh=2WiRw4A0uUfalWQnZpq8MFlR6BSfUDjxmFD2sxusIwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lsmYhIoxIvLAvgb/LCjb/kYj17EKrr84+wbFgSF+xEjM+39ccRaRsE6zz7ky9xpkpHP2Tgv9SLRafF7MKAJF0ajZHZE7DDPPJOnuBGkVvW84FCwkVeSgjNkcWE9kXc5B+G8qwQF2vfMs9JxQMSWrzDDy+Iex8jdnJB9Lk2eUWro= 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=AJqSrama; 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="AJqSrama" 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=4qXUrk5KAHzrtwDMU1DkIhzAt95pjR+KOVOKj2arxqI=; b=AJqSra maXntsJieNarI7/rB1lShi3982jeKDaQEDgO6AW5DXWkT6OMvk8FZJfEDOhNlu24 s3d/m9LwRYwhNqn/THis+/E2OuT5SDbYOuwHeb3U4KTG0jWTShsLvHHanNwCn/VW K4pG67/NkZTrT0b/DcBSdprtU7bAfCAlhjJgUqEYvzD8Rr3GZbCVamlB9j/qf/5P oogERZHjCSo9s4MzcXrhlAQnnCG8LTtbjN0Rhg6remVSxxaNvZtdLFPjpbtTqYKm Cf1upAzqu9U59OPz/vAEmuGKp/jZR+LIDl2tDDADerWAIBgnDIb6z2kBOYgD3/3N CwxxTX1iTBQJDHCA== Received: (qmail 3811121 invoked from network); 6 Jul 2024 13:22:00 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:00 +0200 X-UD-Smtp-Session: l3s3148p1@bTV7Y5IcluFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Kunihiko Hayashi , Masami Hiramatsu , linux-kernel@vger.kernel.org Subject: [PATCH v2 54/60] i2c: uniphier: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:54 +0200 Message-ID: <20240706112116.24543-55-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-uniphier.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c index e1b4c80e0285..ef5753307469 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 = controller, 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 /* local 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 */ @@ -152,8 +152,8 @@ static int uniphier_i2c_stop(struct i2c_adapter *adap) UNIPHIER_I2C_DTRM_NACK); } -static int uniphier_i2c_master_xfer_one(struct i2c_adapter *adap, - struct i2c_msg *msg, bool stop) +static int uniphier_i2c_xfer_one(struct i2c_adapter *adap, + struct i2c_msg *msg, bool stop) { bool is_read = msg->flags & I2C_M_RD; bool recovery = false; @@ -211,8 +211,7 @@ static int uniphier_i2c_check_bus_busy(struct i2c_adapter *adap) return 0; } -static int uniphier_i2c_master_xfer(struct i2c_adapter *adap, - struct i2c_msg *msgs, int num) +static int uniphier_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct i2c_msg *msg, *emsg = msgs + num; int ret; @@ -225,7 +224,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; } @@ -239,7 +238,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 Sat Jul 6 11:20: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: 811282 Received: from mail.zeus03.de (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 6CEE6137C37 for ; Sat, 6 Jul 2024 11:22:20 +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=1720264942; cv=none; b=sJybUMRbQjm3Uupy7pozyyK/3DJIPWpzIndgek/aBfb6FqHnIe3TZlmPPTlSrWS9Qd33fp1twIwqVQBEZXMqeq394Pv5OAZ5pzFFFnH6hf0GkGIrFtU4DWonut3hftimZoMdNXzeQX802ChQnJKKuSDMHO30H8oGT7eT372c9w8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264942; c=relaxed/simple; bh=ILpyGAT8PH5cBPd/u77XyqG3keeBSAhNNTzknC5K6B8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WKwx2W41IeOl/yspuonXEVHxmDGdz9e2U60VIFXIpqTrFJHi8KkyWuRwBR0cA2boIlbvdtLN3IbUOLGalO+Zdq/gSwCy+zKvO9Lpx2Q+Pz6f3fcfJFpUYlJXo90/zYAJoozRFfc1kkzCMIVae82xIF9syChFYmRuCU/oyzX0UF0= 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=BhHMmA2M; 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="BhHMmA2M" 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=zqYCUBvfBDZC4N4gYZQotgieK/uKq8Y98h1CwEc6O/8=; b=BhHMmA 2MJObwxT32OjiAFdwaPl377lcNswQUA9m9rriVeO7WIeRfLBqqjPd2cYhpZzYrk+ sEJxZk9e40HKGNHmO06npLXdJc1bH9Fh2JQ7lzQqhETBRERGMnS8Z4zc1iFnQGkq FckJfrRIvKgJJjMiSbt3QtLqnDPjkl731qHnUcL9OJvCwsuhiTyMlxiiIptgkegu 7hMKTOXS8kU+sGtMLUkAszepmE3BdiGkcUWdI/uhyG/GvAXNpIkaJ8asHhZqn+uJ sdS9ZoR6+05B4JbhVAuOtUfpyb9rGV7mZV3qSc1YbMZLR9yj0HldIP6AecovqBnp IDRi+JsHmklqmrkw== Received: (qmail 3811159 invoked from network); 6 Jul 2024 13:22:01 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:01 +0200 X-UD-Smtp-Session: l3s3148p1@esmFY5IcpOFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 55/60] i2c: viperboard: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:55 +0200 Message-ID: <20240706112116.24543-56-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a superfluous debug output which is already available via tracing. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-viperboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c index 3784b07f5371..2ed4130c0339 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,8 +343,8 @@ 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, - .functionality = vprbrd_i2c_func, + .xfer = vprbrd_i2c_xfer, + .functionality = vprbrd_i2c_func, }; static const struct i2c_adapter_quirks vprbrd_quirks = { @@ -460,6 +458,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 Sat Jul 6 11:20: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: 810985 Received: from mail.zeus03.de (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 5CE6A17839F for ; Sat, 6 Jul 2024 11:22:20 +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=1720264943; cv=none; b=QoKNP79yKLjVl4KTOSgcrKF1zmjaAnrFN1zi0fCcWg/PBdwFCeJEG79W+rzczcPUYiBEwZDEqKp0TxJs42y+4P/WTJtGjNShiviCgSOPmou0knHFD5y7pl6hSBt3OTQI/elLCCUnrTgcd0xM7lzFtyUv57QyK4gcX4p/AyLr2X8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264943; c=relaxed/simple; bh=6eb51MOTGBI7OZukMaHMR/yQNB0zOjnlttyLfhF9pKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kgo2NeymJr/xAQaHmZsYAIDw1a9Y/x99Bj9Bzt1wbNFceYTZk+4tXDJS3zegzuam0NyExnb/kWRQC7ABIO1EDyq71NkqHUv/O4DXmvuIbaIJ8hLr1EwVyfIJCnNmjec7RRPEn3Vao+PDrmqXYa3p9uo4dj58JRKhXKPaOZazyO4= 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=GEXpAqe4; 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="GEXpAqe4" 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=bPsQpXZGJKgS7AfXMtPt5PXQkvw0RqAM8l1t2WL8MAU=; b=GEXpAq e47VuL2iU2TfJCW6qFTaJtAVs1xa+ZIvO7KN8lpAfiPKmxlanuKKXWdbUVz/ZLBg 4WxFCx7WTPZG7GXYWblzon9uxbOfuUcCEkxWZkA6WtjNIk0WjWugj3ljWtFqz7cb L4wjc8JshFBn6jeIScRwwlTKzMEpljCT5TsqKLnFnkCXlP3HkvxrAfS+xHcOholA FxElatnmiLOYd67NGfnD2IrG3c6LM5cJ1fNhVHso9+19pqM18pIBaXM9Y/PwKBXD IzKauGL+Fpf++btDffoIg5u6Tp2y6lDAr8ExFeYgLD6NuDaebhG/KPJKG5JvZI1Q CTTCF8n1ghHrUDVQ== Received: (qmail 3811200 invoked from network); 6 Jul 2024 13:22:01 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:01 +0200 X-UD-Smtp-Session: l3s3148p1@tPiTY5IcsuFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Hans Hu , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 56/60] i2c: viai2c: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:56 +0200 Message-ID: <20240706112116.24543-57-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-viai2c-common.c | 2 +- drivers/i2c/busses/i2c-viai2c-wmt.c | 8 ++++---- drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-viai2c-common.c b/drivers/i2c/busses/i2c-viai2c-common.c index 162b31306cba..5a53ed95a59b 100644 --- a/drivers/i2c/busses/i2c-viai2c-common.c +++ b/drivers/i2c/busses/i2c-viai2c-common.c @@ -198,6 +198,6 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) } EXPORT_SYMBOL_GPL(viai2c_init); -MODULE_DESCRIPTION("Via/Wondermedia/Zhaoxin I2C master-mode bus adapter"); +MODULE_DESCRIPTION("Via/Wondermedia/Zhaoxin I2C controller core"); MODULE_AUTHOR("Tony Prisk "); MODULE_LICENSE("GPL"); diff --git a/drivers/i2c/busses/i2c-viai2c-wmt.c b/drivers/i2c/busses/i2c-viai2c-wmt.c index 420fd10fe3aa..3415683dab91 100644 --- a/drivers/i2c/busses/i2c-viai2c-wmt.c +++ b/drivers/i2c/busses/i2c-viai2c-wmt.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Wondermedia I2C Master Mode Driver + * Wondermedia I2C Controller Driver * * Copyright (C) 2012 Tony Prisk * @@ -35,8 +35,8 @@ static u32 wmt_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm wmt_i2c_algo = { - .master_xfer = viai2c_xfer, - .functionality = wmt_i2c_func, + .xfer = viai2c_xfer, + .functionality = wmt_i2c_func, }; static int wmt_i2c_reset_hardware(struct viai2c *i2c) @@ -178,7 +178,7 @@ static struct platform_driver wmt_i2c_driver = { module_platform_driver(wmt_i2c_driver); -MODULE_DESCRIPTION("Wondermedia I2C master-mode bus adapter"); +MODULE_DESCRIPTION("Wondermedia I2C controller driver"); MODULE_AUTHOR("Tony Prisk "); MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(of, wmt_i2c_dt_ids); diff --git a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c b/drivers/i2c/busses/i2c-viai2c-zhaoxin.c index ab3e44e147e9..95dc64902b7c 100644 --- a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c +++ b/drivers/i2c/busses/i2c-viai2c-zhaoxin.c @@ -38,7 +38,7 @@ #define ZXI2C_GOLD_FSTP_400K 0x38 #define ZXI2C_GOLD_FSTP_1M 0x13 #define ZXI2C_GOLD_FSTP_3400K 0x37 -#define ZXI2C_HS_MASTER_CODE (0x08 << 8) +#define ZXI2C_HS_CTRL_CODE (0x08 << 8) #define ZXI2C_FIFO_SIZE 32 @@ -136,7 +136,7 @@ static int viai2c_fifo_irq_xfer(struct viai2c *i2c) return 0; } -static int zxi2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) +static int zxi2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { u8 tmp; int ret; @@ -194,8 +194,8 @@ static u32 zxi2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm zxi2c_algorithm = { - .master_xfer = zxi2c_master_xfer, - .functionality = zxi2c_func, + .xfer = zxi2c_xfer, + .functionality = zxi2c_func, }; static const struct i2c_adapter_quirks zxi2c_quirks = { @@ -250,9 +250,9 @@ static void zxi2c_get_bus_speed(struct viai2c *i2c) i2c->tcr = params[1]; priv->mcr = ioread16(i2c->base + VIAI2C_REG_MCR); - /* for Hs-mode, use 0x80 as master code */ + /* for Hs-mode, use 0x80 as controller code */ if (params[0] == I2C_MAX_HIGH_SPEED_MODE_FREQ) - priv->mcr |= ZXI2C_HS_MASTER_CODE; + priv->mcr |= ZXI2C_HS_CTRL_CODE; dev_info(i2c->dev, "speed mode is %s\n", i2c_freq_mode_string(params[0])); } From patchwork Sat Jul 6 11:20: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: 811281 Received: from mail.zeus03.de (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 74034179972 for ; Sat, 6 Jul 2024 11:22: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=1720264944; cv=none; b=Sg5RsIclNq+LEt0n3Ei5iwgo5uN+pbAyTVIjlWUiPvCE+g+Tv/0QwthwtCcpRHxrGr1unqqFCiUIoOQdD+2rhmX3YFoeM4Ppqh/d/QxHANU28LO523G4dWOUEtj59DVbrdyUcZql5zpGS0dchN1nMOHhitObq8IsKBAUo/yW2rA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264944; c=relaxed/simple; bh=jhh9MUfaWQ65I6far/Diyix9dtImPeXZAPXOIGlV7jg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/U3cREfUKv2nZ2TnsxqFvgKj7c6se4mIV7FShdbHNj6SOFOQcRnqZpUk21aPz/4ewfCTHvvSyoSS0RgcHx0qn0fcAtZVGrw3ahjUTEV0mFqBzlBfscdg6NeSIxAgrmmos/yuHB1W0FCGDn8SL7fzZVeaX6e+gqXZiatjrGY2Rc= 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=DuPP6ygb; 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="DuPP6ygb" 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=LoDH+LfNyRYCgqYP8zmglvDfnEc2xA8iAA75gS5oYPs=; b=DuPP6y gbxy4DVm3r8QAgEs+xzpJALRQekxkqR0j3I5XxJrYIIl/6VcV18r90lkPG9okx4/ qdaOa4DMEED9jAwmGFTyRrn11GL8PRLu3oAEH1yW162xOkT+132rcpeZiwHNVrzo N+LlGxNPh1zzPpyAZ92Ivm//yPVLpM4PIHQ/d2PhSCe0BCdZlFFkO3OkpGWWawow xsYyN5oDGLMc73G3+3pGbqrreUZe6rtrCft/gHILIeLb9FGhvTwNerwpq1Iu4B1Y feEJkWiVy6cMpkGyHczsE6CNYzHzWQGn1ljwH+bCmJKEjZc7KnHN9R+v83wnJ/TR MGmqWMHLv1yyabJw== Received: (qmail 3811228 invoked from network); 6 Jul 2024 13:22:02 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:02 +0200 X-UD-Smtp-Session: l3s3148p1@u0WeY5IcuOFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Ajay Gupta , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 57/60] i2c: nvidia-gpu: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:57 +0200 Message-ID: <20240706112116.24543-58-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-nvidia-gpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 26622d24bb1b..9bcaa29a7191 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -163,8 +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, - struct i2c_msg *msgs, int num) +static int gpu_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { struct gpu_i2c_dev *i2cd = i2c_get_adapdata(adap); int status, status2; @@ -234,8 +233,8 @@ static u32 gpu_i2c_functionality(struct i2c_adapter *adap) } static const struct i2c_algorithm gpu_i2c_algorithm = { - .master_xfer = gpu_i2c_master_xfer, - .functionality = gpu_i2c_functionality, + .xfer = gpu_i2c_xfer, + .functionality = gpu_i2c_functionality, }; /* From patchwork Sat Jul 6 11:20: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: 810984 Received: from mail.zeus03.de (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 E61B517B405 for ; Sat, 6 Jul 2024 11:22: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=1720264944; cv=none; b=hW8K895/0a7CTaFZZyPRQ7Fr9ABhrAptPMFvVu/0cZlq9Ko7eqf7qWG3IwBVBzQlx2HGSnFdbozDJwuBlsOZ84aJ+io4Ju6BRns8P85Rhot1eAmaiYc0UeCqLCEu73AE8HG+RFpHUJGF8tw23vJYGUPodRwYVesREtiRuViyseE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264944; c=relaxed/simple; bh=vzEuQ+lrXLbvmLq0c8x+vqbbovkHgUmGXYcgQ5Mx6HE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EDeB7kmf7Wg4VQpVQVfB+HJPnPfkbzBNRnbQo5ccFL4Mxxg72wZ2NXCERit8HmDIFc3nmFXIZTaEtCCTijhlvHOEl4UwiaKaH06s6o4ISo35P75xeDM/cE6hukzCCd6fXJnrVA/aw+jnfEOEfZH0kZZQCz3sFHKZzCPt2vWXnbc= 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=DN7voEty; 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="DN7voEty" 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=ScNZzVtjtJ+63j5oihnknDrh2WBe9TwtSoZSFqQwENY=; b=DN7voE ty/7aabzGyavJdkHYBlNKntFys/YSNOQWA9vHUlAYjzEyx+Zt2Gd3M/ISCbE72i3 SZh0PZemLVp35B39fUoq+IStKhYRKj/wfEziAnC52wxjrspn/f1Lr8mfNk0WsGD0 SJzXYLGtuQHUQyhcmLJSgTmc0s+6VRdkQSymfTnVducTD7GGPx06bk5nCtWbKFBn UZgVTXjJvStsGe1nLu7XIC7UG0if/YyGlGQwwe6bGKSkAqT7RST2GK/v8FC9btIf +nK0nE+H/DHDj4iA/eIlE+47HB8t/APzhnpjMnzWYd2wg+Qngv1jV6sYmFH2gpjy bjPneSU3CL1MbdBQ== Received: (qmail 3811264 invoked from network); 6 Jul 2024 13:22:03 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:03 +0200 X-UD-Smtp-Session: l3s3148p1@FTyoY5IcwuFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Conghui Chen , Viresh Kumar , Andi Shyti , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 58/60] i2c: virtio: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:58 +0200 Message-ID: <20240706112116.24543-59-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, }; From patchwork Sat Jul 6 11:20: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: 811280 Received: from mail.zeus03.de (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 6857C17B437 for ; Sat, 6 Jul 2024 11:22: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=1720264945; cv=none; b=SauFw5M0sSv6WnNirwtTgbqqgVgZllsjuwQtSyj3mKrLmF/dwr9MIVLoF2EOfokbT6zrSrrayY/RtnwpLDqO8Wz6h0WEvY1VFRsvGHBoCzKPgLFhKltuzqXA6eL42Hv060NePMx1SR7HayCcu4qWm59/H5U8c4Lo70M2C7hXQHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264945; c=relaxed/simple; bh=nRZFPOR2dutX85ljeXMRi0ghy+9aPAwH6ruBUPb9I3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rrzVRrh9aFvccKNYZJiSg4QKaCsbdLNS2TUht470X/miT/VtmDBhLsxG8jLX/cldYi+dSz3mJwcGN1KD4vVYQqoRcFgNSdB4HnqfTRd07cb1ZVbwdf9vQWithyqyR/AsrfI00xewA4H3pEb5tIMfftXq66L/yqaGicfZGepVvCA= 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=kcJY/IXj; 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="kcJY/IXj" 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=3fwRgUirFZkfXKcJC7Vv4K4A/Dc48+trUOny3ev4Fh8=; b=kcJY/I XjUawthxhRKCMxtL1TNK9RqG22zDCp9Tr3p/+YF4aDqSxkppG+ld2jdpRoeBexWc 3ahuv1kD2Ym41tevqXsOGNcFIosuswGFy31+TkZ5mxZv3jQHf/Fk2t1jNe9lS7/K T7SPe5BtpjUYGVPsVVj2K2ASDTrRxsNilO91rD7eWowhPxY3x33TYjolfGELRMSy U04Rq04OF+AtvXWA9t6XgUjVjoUB1Cd5IR3B2LRBJ7WNHw39M4Oyhq1SPBYcIBrE U/Hytu85jskq9IB4HBku0oewZF45TbmG2f5mbViGSg2uwPlD3t7pc86TjZHF9/il tqR8q9Bawf+2SLWA== Received: (qmail 3811298 invoked from network); 6 Jul 2024 13:22:03 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:03 +0200 X-UD-Smtp-Session: l3s3148p1@heixY5IczOFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Jochen Friedrich , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 59/60] i2c: cpm: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:59 +0200 Message-ID: <20240706112116.24543-60-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Acked-by: Jochen Friedrich --- 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..4794ec066eb0 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); /* Disable interrupts. */ out_8(&cpm->i2c_reg->i2cmr, 0); From patchwork Sat Jul 6 11:21: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: 810983 Received: from mail.zeus03.de (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 A3B4F17BB2B for ; Sat, 6 Jul 2024 11:22:24 +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=1720264946; cv=none; b=l3IOuh4mX4wkMSYjQyD1m385XIkVJ1+spaXOlcuqAcK9ctdNYPJVZWEqv0DLfDG/EsnE4EZ5yBpXqEZutlsPhcqkWbtasE4xzmm2T/jCdBsI/Vr3YrSxbBFY1sggSVnek55r6CrqYUahFUR8NyOYYciOasu0CR8LgQJj5oZz+gU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264946; c=relaxed/simple; bh=65HBA5AoKxDKUriyLfXIeeIR8lK7hXBV17mOOB5kzcc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YCwBzk804mHcW59YdYPuKnsO67VUy512XZlCitWoQH0h66BOfR/n4mWLzAFP++w4SP3Yaa8XdGH4SUpQ1yJFCEAjZsp18FpkpHE7m9OV84QQaWAiRNAB2H4uYIKEaYkk1K9FMmzSAqXefPSeFKWf2PCxeUj1Zz8qaGtE2ayl0rw= 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=OHVEBbyH; 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="OHVEBbyH" 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=21CzCZ7VMAwEdtjnkGDCPoX24C9KiOgPmWGJZ44YprI=; b=OHVEBb yHj9zjmXvtsm3o+W+bgQZedbU3DiUl/2iAMkC7kCEAZWzD9W8VJVWr7oSj9XP5om pnVm0ajuKEX8oTuO/lCcahMbn7bq6xojIEryUs7IyTH/mBKYei+qOrOtlHSzwTK3 YXdFCSGTW86YKVdzRha+aDKbar557QA70dvPWdO0MVxudlgAMEIqfrtVo45JBQik qb+quSYbjeUIoSenzN1OHr28xR0BBssa8sMZ0n7Qcvsa3gLw6HNgA2A8/OWZGodv vulJQyIjtIzTn5ggvl5KvW3qm3S2awkwLeMWc3gYHDBEWVjPgB3xrzsQS29Jbgpp iZuqQP3MeBfiCt7Q== Received: (qmail 3811339 invoked from network); 6 Jul 2024 13:22:04 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:22:04 +0200 X-UD-Smtp-Session: l3s3148p1@Mxm9Y5Ic0OFQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Patrice Chotard , Andi Shyti , linux-kernel@vger.kernel.org Subject: [PATCH v2 60/60] i2c: st: reword according to newest specification Date: Sat, 6 Jul 2024 13:21:00 +0200 Message-ID: <20240706112116.24543-61-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-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 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-st.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c index 5e01fe3dbb63..05b19ede65a0 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 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 target addr, including r/w bit * @count: number of bytes to be transfered * @xfered: number of bytes already transferred * @buf: data buffer @@ -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 target address */ st_i2c_write_tx_fifo(i2c_dev, c->addr); /* Pre-fill Tx fifo with data in case of write */ @@ -766,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, };