public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c / ACPI: Pick the first address if device has multiple
@ 2014-12-29 13:48 Mika Westerberg
  2015-01-13 15:50 ` Wolfram Sang
  2015-01-14 10:55 ` Wolfram Sang
  0 siblings, 2 replies; 6+ messages in thread
From: Mika Westerberg @ 2014-12-29 13:48 UTC (permalink / raw)
  To: linux-i2c
  Cc: Wolfram Sang, Srinivas Pandruvada, Mika Westerberg, linux-kernel

ACPI specification allows I2C devices with multiple addresses. The current
implementation goes over all addresses and assigns the last one to the
device. This is typically not the primary address of the device.

Instead of doing that we assign the first address to the device and then
let the driver handle rest of the addresses as it wishes.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/i2c/i2c-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 39d25a8cb1ad..a06be43b7842 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -102,7 +102,7 @@ static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data)
 		struct acpi_resource_i2c_serialbus *sb;
 
 		sb = &ares->data.i2c_serial_bus;
-		if (sb->type == ACPI_RESOURCE_SERIAL_TYPE_I2C) {
+		if (!info->addr && sb->type == ACPI_RESOURCE_SERIAL_TYPE_I2C) {
 			info->addr = sb->slave_address;
 			if (sb->access_mode == ACPI_I2C_10BIT_MODE)
 				info->flags |= I2C_CLIENT_TEN;
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-01-14 10:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-29 13:48 [PATCH] i2c / ACPI: Pick the first address if device has multiple Mika Westerberg
2015-01-13 15:50 ` Wolfram Sang
2015-01-13 16:44   ` Srinivas Pandruvada
2015-01-13 16:48     ` Wolfram Sang
2015-01-13 17:00       ` Mika Westerberg
2015-01-14 10:55 ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox