From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3E3151F5511; Fri, 4 Oct 2024 18:22:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066170; cv=none; b=GWuxqGz0Ie7T+O5xFCXoOdUBiqQdtJ81WaNSSZbfGOk8B6Q5BBbDSm0Kj1IHar6NYqCSoPhYnsH5SsVJT7rT/f4PFk0pu37bDc4er3QM3vuwFAEiQTRSMc4zk8RvXZU+3dJykYX9HPKZTCsZFC4atsda5KM7yKWrDCECU7UaOwM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066170; c=relaxed/simple; bh=I+BsAlxSUqDoWMWkfM7GaNBC9b+4uKpximOs5Wxrthg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JQA7yLG4dH/qnPW+EsL+BNMhkaGu7UiZseFcVIA6wjZe69lvPg2anBP6vSZfQKxdu0PHrf6vCt7ty42i24rghXoesYf92vkGNl3uPHz2xc/7xBVjIKGMVHmNGFX7s8qsrGwnRIUjgt+LS1K7R21uWmSgfiSWzbUOzBwa0j48hxs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LuzA02XM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LuzA02XM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21F2AC4CECD; Fri, 4 Oct 2024 18:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728066170; bh=I+BsAlxSUqDoWMWkfM7GaNBC9b+4uKpximOs5Wxrthg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LuzA02XMWvHBTtDo/rxmImms2Rx3wxgeT32MiPDi2U3kMFNcL1y3ab04OuIDRAp/j poaqmmanRxef74mUpYTSIZoJFkeZNadqsMeCvw7HTwwIVPbe5TXY6hMcG/2E/tYRNd qHw08lMrETCuLHeVwIL+a8nH+rldFf2c1AnoOAHYbRB50E8svtqLMwqCaFYAHhBP2g pZrBxa8HGkxhSSRVg1sfhKb1Wy+hSr26tx4ms/YtNSbs01jYa58B5Jv0LELJPg0wb2 BTLzCrMTVXzoDE4M/L6c8y9XSyaGXN5FHnuvWPkh0p4po2faJt4Z/chmqalzPEcw2w sh0YlYaWSCpWQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Wolfram Sang , Andi Shyti , Sasha Levin , jdelvare@suse.com, linux-i2c@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 27/70] i2c: i801: Use a different adapter-name for IDF adapters Date: Fri, 4 Oct 2024 14:20:25 -0400 Message-ID: <20241004182200.3670903-27-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004182200.3670903-1-sashal@kernel.org> References: <20241004182200.3670903-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.13 Content-Transfer-Encoding: 8bit From: Hans de Goede [ 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 Signed-off-by: Hans de Goede Acked-by: Wolfram Sang Signed-off-by: Andi Shyti Signed-off-by: Sasha Levin --- 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 d2d2a6dbe29f2..94265ee300c0d 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1760,8 +1760,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