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

Commit c7032923 authored by Robert Hancock's avatar Robert Hancock Committed by Greg Kroah-Hartman
Browse files

i2c: xiic: Make bus names unique 



[ Upstream commit 1d366c2f9df8279df2adbb60471f86fc40a1c39e ]

This driver is for an FPGA logic core, so there can be arbitrarily many
instances of the bus on a given system. Previously all of the I2C bus
names were "xiic-i2c" which caused issues with lm_sensors when trying to
map human-readable names to sensor inputs because it could not properly
distinguish the busses, for example. Append the platform device name to
the I2C bus name so it is unique between different instances.

Fixes: e1d5b659 ("i2c: Add support for Xilinx XPS IIC Bus Interface")
Signed-off-by: default avatarRobert Hancock <robert.hancock@calian.com>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6f41e4a6

drivers/i2c/busses/i2c-xiic.c

+2 −1
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ static const struct i2c_adapter_quirks xiic_quirks = { 


static const struct i2c_adapter xiic_adapter = {

	.owner = THIS_MODULE,

	.name = DRIVER_NAME,

	.class = I2C_CLASS_DEPRECATED,

	.algo = &xiic_algorithm,

	.quirks = &xiic_quirks,
@@ -752,6 +751,8 @@ static int xiic_i2c_probe(struct platform_device *pdev) 
	i2c_set_adapdata(&i2c->adap, i2c);

	i2c->adap.dev.parent = &pdev->dev;

	i2c->adap.dev.of_node = pdev->dev.of_node;

	snprintf(i2c->adap.name, sizeof(i2c->adap.name),

		 DRIVER_NAME " %s", pdev->name);



	mutex_init(&i2c->lock);

	init_waitqueue_head(&i2c->wait);