Commit 393cc1ce authored Dec 29, 2014 by Mika Westerberg Committed by Wolfram Sang Jan 14, 2015

i2c: ACPI: Pick the first address if device has multiple

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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent 8a86c3ae

drivers/i2c/i2c-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message