Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70762abb authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Rafael J. Wysocki
Browse files

i2c: Use stable dev_name for ACPI enumerated I2C slaves 



Current I2C adapter id - client address "x-00yy" based device naming scheme
is not always stable enough to be used in name based matching, for instance
within ALSA SoC subsystem.

This is problematic in PC kind of platforms where I2C adapter numbers can
change due variable amount of bus controllers, probe order, add-on cards or
just because of BIOS settings.

This patch addresses the problem by using the ACPI device name with
"i2c-" prefix for ACPI enumerated I2C slaves. For them device name
"x-00yz" becomes "i2c-INTABCD:ij" after this patch.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 45c42a7f

drivers/i2c/i2c-core.c

+17 −4
Original line number Diff line number Diff line
@@ -618,6 +618,22 @@ void i2c_unlock_adapter(struct i2c_adapter *adapter) 
}

EXPORT_SYMBOL_GPL(i2c_unlock_adapter);



static void i2c_dev_set_name(struct i2c_adapter *adap,

			     struct i2c_client *client)

{

	struct acpi_device *adev = ACPI_COMPANION(&client->dev);



	if (adev) {

		dev_set_name(&client->dev, "i2c-%s", acpi_dev_name(adev));

		return;

	}



	/* For 10-bit clients, add an arbitrary offset to avoid collisions */

	dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),

		     client->addr | ((client->flags & I2C_CLIENT_TEN)

				     ? 0xa000 : 0));

}



/**

 * i2c_new_device - instantiate an i2c device

 * @adap: the adapter managing the device
@@ -676,10 +692,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 
	client->dev.of_node = info->of_node;

	ACPI_COMPANION_SET(&client->dev, info->acpi_node.companion);



	/* For 10-bit clients, add an arbitrary offset to avoid collisions */

	dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),

		     client->addr | ((client->flags & I2C_CLIENT_TEN)

				     ? 0xa000 : 0));

	i2c_dev_set_name(adap, client);

	status = device_register(&client->dev);

	if (status)

		goto out_err;