All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Darren Hart <dvhart@infradead.org>,
	platform-driver-x86@vger.kernel.org,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-acpi@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
	Wolfram Sang <wsa@the-dreams.de>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-i2c@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v5 13/15] platform/x86: i2c-multi-instantiate: Allow to have same slaves
Date: Wed, 28 Nov 2018 13:45:33 +0200	[thread overview]
Message-ID: <20181128114535.80223-14-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20181128114535.80223-1-andriy.shevchenko@linux.intel.com>

Currently the driver will not enumerate the devices where I2C slaves
are of the same type.

Add an instance number to make them unique.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/i2c-multi-instantiate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
index 365457f9c424..2439d4c71118 100644
--- a/drivers/platform/x86/i2c-multi-instantiate.c
+++ b/drivers/platform/x86/i2c-multi-instantiate.c
@@ -92,8 +92,8 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
 	for (i = 0; i < multi->num_clients && inst_data[i].type; i++) {
 		memset(&board_info, 0, sizeof(board_info));
 		strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE);
-		snprintf(name, sizeof(name), "%s-%s", match->id,
-			 inst_data[i].type);
+		snprintf(name, sizeof(name), "%s-%s.%d", match->id,
+			 inst_data[i].type, i);
 		board_info.dev_name = name;
 		switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) {
 		case IRQ_RESOURCE_GPIO:
-- 
2.19.2

  parent reply	other threads:[~2018-11-28 11:45 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28 11:45 [PATCH v5 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 01/15] platform/x86: intel_cht_int33fe: Remove duplicate NULL check Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 02/15] platform/x86: intel_cht_int33fe: Accept errors of i2c_acpi_new_device() Andy Shevchenko
2018-12-02 15:56   ` Jonathan Cameron
2018-12-02 17:38     ` Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 03/15] platform/x86: i2c-multi-instantiate: " Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 04/15] platform/x86: i2c-multi-instantiate: Defer probe when no adapter found Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 05/15] i2c: acpi: Return error pointers from i2c_acpi_new_device() Andy Shevchenko
2018-11-28 14:47   ` Mika Westerberg
2018-11-30  9:53   ` Wolfram Sang
2018-11-28 11:45 ` [PATCH v5 06/15] platform/x86: intel_cht_int33fe: Get rid of obsolete conditional Andy Shevchenko
2018-12-02 16:35   ` Jonathan Cameron
2018-11-28 11:45 ` [PATCH v5 07/15] platform/x86: i2c-multi-instantiate: " Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 08/15] i2c: acpi: Use ACPI_FAILURE instead of !ACPI_SUCCESS Andy Shevchenko
2018-11-30  9:53   ` Wolfram Sang
2018-11-28 11:45 ` [PATCH v5 09/15] i2c: acpi: Introduce i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-28 14:47   ` Mika Westerberg
2018-11-30  9:55   ` Wolfram Sang
2018-11-30 10:57     ` Andy Shevchenko
2018-11-30 11:06       ` Wolfram Sang
2018-11-30 11:45         ` Andy Shevchenko
2018-11-30 11:49           ` Wolfram Sang
2018-11-30 12:12             ` Mika Westerberg
2018-11-30 12:17               ` Andy Shevchenko
2018-11-30 12:16   ` Wolfram Sang
2018-11-28 11:45 ` [PATCH v5 10/15] platform/x86: i2c-multi-instantiate: Count I2cSerialBus() resources Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 11/15] platform/x86: i2c-multi-instantiate: Distinguish IRQ resource type Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 12/15] platform/x86: i2c-multi-instantiate: Introduce IOAPIC IRQ support Andy Shevchenko
2018-11-28 11:45 ` Andy Shevchenko [this message]
2018-11-28 11:45 ` [PATCH v5 14/15] ACPI / scan: Create platform device for INT3515 ACPI nodes Andy Shevchenko
2018-11-28 12:07   ` Heikki Krogerus
2018-11-29 20:58   ` Rafael J. Wysocki
2018-11-30  9:56     ` Andy Shevchenko
2018-11-28 11:45 ` [PATCH v5 15/15] iio: inv_mpu6050: Use i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-12-02 16:41   ` Jonathan Cameron
2018-11-28 13:12 ` [PATCH v5 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Heikki Krogerus
2018-11-28 14:20 ` Hans de Goede
2018-12-03 19:44 ` Andy Shevchenko

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=20181128114535.80223-14-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=dvhart@infradead.org \
    --cc=hdegoede@redhat.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=jic23@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=wsa@the-dreams.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.