Skip to content

Commit c9449af

Browse files
Gerlando FalautoWolfram Sang
authored andcommitted
i2c: mux: create "channel-n" symlinks for child segments in the mux device
This makes the topology clearer. For instance, by adding a pca9547 device with address 0x70 to bus i2c-0, you get: /sys/class/i2c-dev/i2c-0/device/0-0070/channel-0 -> i2c-1 ... /sys/class/i2c-dev/i2c-0/device/0-0070/channel-7 -> i2c-8 Signed-off-by: Gerlando Falauto <[email protected]> [wsa: simplified sysfs-usage and fixed format string usage] Signed-off-by: Wolfram Sang <[email protected]> Acked-by: Martin Belanger <[email protected]> Acked-by: Danielle Costantino <[email protected]>
1 parent 51cf3b0 commit c9449af

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/i2c/i2c-mux.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
110110
void *, u32))
111111
{
112112
struct i2c_mux_priv *priv;
113+
char symlink_name[20];
113114
int ret;
114115

115116
priv = kzalloc(sizeof(struct i2c_mux_priv), GFP_KERNEL);
@@ -186,6 +187,9 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
186187
WARN(sysfs_create_link(&priv->adap.dev.kobj, &mux_dev->kobj, "mux_device"),
187188
"can't create symlink to mux device\n");
188189

190+
snprintf(symlink_name, sizeof(symlink_name), "channel-%u", chan_id);
191+
WARN(sysfs_create_link(&mux_dev->kobj, &priv->adap.dev.kobj, symlink_name),
192+
"can't create symlink for channel %u\n", chan_id);
189193
dev_info(&parent->dev, "Added multiplexed i2c bus %d\n",
190194
i2c_adapter_id(&priv->adap));
191195

@@ -196,6 +200,10 @@ EXPORT_SYMBOL_GPL(i2c_add_mux_adapter);
196200
void i2c_del_mux_adapter(struct i2c_adapter *adap)
197201
{
198202
struct i2c_mux_priv *priv = adap->algo_data;
203+
char symlink_name[20];
204+
205+
snprintf(symlink_name, sizeof(symlink_name), "channel-%u", priv->chan_id);
206+
sysfs_remove_link(&adap->dev.parent->kobj, symlink_name);
199207

200208
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
201209
i2c_del_adapter(adap);

0 commit comments

Comments
 (0)