diff options
author | Gerlando Falauto <gerlando.falauto@keymile.com> | 2014-11-13 08:39:56 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2014-11-18 10:09:49 -0500 |
commit | c9449affad2ae0824927df5a207705e07f346fb1 (patch) | |
tree | e1ca67535ca757925c0a73a65230145070e4a92c /drivers/i2c | |
parent | 51cf3b0e2a72bb08cd280be6c0ead4e08ed50a2c (diff) |
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 <gerlando.falauto@keymile.com>
[wsa: simplified sysfs-usage and fixed format string usage]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Martin Belanger <martin.belanger@cyaninc.com>
Acked-by: Danielle Costantino <danielle.costantino@gmail.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/i2c-mux.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index f246a9f7dd22..593f7ca9adc7 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c | |||
@@ -110,6 +110,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, | |||
110 | void *, u32)) | 110 | void *, u32)) |
111 | { | 111 | { |
112 | struct i2c_mux_priv *priv; | 112 | struct i2c_mux_priv *priv; |
113 | char symlink_name[20]; | ||
113 | int ret; | 114 | int ret; |
114 | 115 | ||
115 | priv = kzalloc(sizeof(struct i2c_mux_priv), GFP_KERNEL); | 116 | priv = kzalloc(sizeof(struct i2c_mux_priv), GFP_KERNEL); |
@@ -186,6 +187,9 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, | |||
186 | WARN(sysfs_create_link(&priv->adap.dev.kobj, &mux_dev->kobj, "mux_device"), | 187 | WARN(sysfs_create_link(&priv->adap.dev.kobj, &mux_dev->kobj, "mux_device"), |
187 | "can't create symlink to mux device\n"); | 188 | "can't create symlink to mux device\n"); |
188 | 189 | ||
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); | ||
189 | dev_info(&parent->dev, "Added multiplexed i2c bus %d\n", | 193 | dev_info(&parent->dev, "Added multiplexed i2c bus %d\n", |
190 | i2c_adapter_id(&priv->adap)); | 194 | i2c_adapter_id(&priv->adap)); |
191 | 195 | ||
@@ -196,6 +200,10 @@ EXPORT_SYMBOL_GPL(i2c_add_mux_adapter); | |||
196 | void i2c_del_mux_adapter(struct i2c_adapter *adap) | 200 | void i2c_del_mux_adapter(struct i2c_adapter *adap) |
197 | { | 201 | { |
198 | struct i2c_mux_priv *priv = adap->algo_data; | 202 | 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); | ||
199 | 207 | ||
200 | sysfs_remove_link(&priv->adap.dev.kobj, "mux_device"); | 208 | sysfs_remove_link(&priv->adap.dev.kobj, "mux_device"); |
201 | i2c_del_adapter(adap); | 209 | i2c_del_adapter(adap); |