public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Hans de Goede" <hdegoede@redhat.com>,
	"Pali Rohár" <pali@kernel.org>,
	"Wolfram Sang" <wsa+renesas@sang-engineering.com>,
	"Andi Shyti" <andi.shyti@kernel.org>,
	"Sasha Levin" <sashal@kernel.org>,
	jdelvare@suse.com, linux-i2c@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 10/16] i2c: i801: Use a different adapter-name for IDF adapters
Date: Fri,  4 Oct 2024 14:31:37 -0400	[thread overview]
Message-ID: <20241004183150.3676355-10-sashal@kernel.org> (raw)
In-Reply-To: <20241004183150.3676355-1-sashal@kernel.org>

From: Hans de Goede <hdegoede@redhat.com>

[ Upstream commit 43457ada98c824f310adb7bd96bd5f2fcd9a3279 ]

On chipsets with a second 'Integrated Device Function' SMBus controller use
a different adapter-name for the second IDF adapter.

This allows platform glue code which is looking for the primary i801
adapter to manually instantiate i2c_clients on to differentiate
between the 2.

This allows such code to find the primary i801 adapter by name, without
needing to duplicate the PCI-ids to feature-flags mapping from i2c-i801.c.

Reviewed-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/i2c/busses/i2c-i801.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index c1e2539b79502..b552f8d62fa2f 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1674,8 +1674,15 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
 	i801_add_tco(priv);
 
+	/*
+	 * adapter.name is used by platform code to find the main I801 adapter
+	 * to instantiante i2c_clients, do not change.
+	 */
 	snprintf(priv->adapter.name, sizeof(priv->adapter.name),
-		"SMBus I801 adapter at %04lx", priv->smba);
+		 "SMBus %s adapter at %04lx",
+		 (priv->features & FEATURE_IDF) ? "I801 IDF" : "I801",
+		 priv->smba);
+
 	err = i2c_add_adapter(&priv->adapter);
 	if (err) {
 		platform_device_unregister(priv->tco_pdev);
-- 
2.43.0


  parent reply	other threads:[~2024-10-04 18:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-04 18:31 [PATCH AUTOSEL 4.19 01/16] bpf: Check percpu map value size first Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 02/16] s390/facility: Disable compile time optimization for decompressor code Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 03/16] s390/mm: Add cond_resched() to cmm_alloc/free_pages() Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 04/16] ext4: fix i_data_sem unlock order in ext4_ind_migrate() Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 05/16] ext4: ext4_search_dir should return a proper error Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 06/16] ext4: nested locking for xattr inode Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 07/16] s390/cpum_sf: Remove WARN_ON_ONCE statements Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 08/16] ktest.pl: Avoid false positives with grub2 skip regex Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 09/16] clk: bcm: bcm53573: fix OF node leak in init Sasha Levin
2024-10-04 18:31 ` Sasha Levin [this message]
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 11/16] PCI: Mark Creative Labs EMU20k2 INTx masking as broken Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 12/16] media: videobuf2-core: clear memory related fields in __vb2_plane_dmabuf_put() Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 13/16] usb: chipidea: udc: enable suspend interrupt after usb reset Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 14/16] tools/iio: Add memory allocation failure check for trigger_name Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 15/16] driver core: bus: Return -EIO instead of 0 when show/store invalid bus attribute Sasha Levin
2024-10-04 18:31 ` [PATCH AUTOSEL 4.19 16/16] fbdev: sisfb: Fix strbuf array overflow Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241004183150.3676355-10-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=andi.shyti@kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=jdelvare@suse.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pali@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=wsa+renesas@sang-engineering.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox