Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"This has a mixture of merge window cleanups and bugfixes"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: st: add include for pinctrl
i2c: mux: use proper dev when removing "channel-X" symlinks
i2c: digicolor: remove duplicate include
i2c: Mark adapter devices with pm_runtime_no_callbacks
i2c: pca-platform: fix broken email address
i2c: mxs: fix broken email address
i2c: rk3x: report number of messages transmitted
+18
-14
+1
-2
drivers/i2c/busses/i2c-digicolor.c
+1
-2
drivers/i2c/busses/i2c-digicolor.c
···
12
12
13
13
#include <linux/clk.h>
14
14
#include <linux/completion.h>
15
+
#include <linux/delay.h>
15
16
#include <linux/i2c.h>
16
17
#include <linux/interrupt.h>
17
18
#include <linux/io.h>
18
-
#include <linux/clk.h>
19
-
#include <linux/delay.h>
20
19
#include <linux/kernel.h>
21
20
#include <linux/module.h>
22
21
#include <linux/of.h>
+1
-1
drivers/i2c/busses/i2c-mxs.c
+1
-1
drivers/i2c/busses/i2c-mxs.c
···
913
913
module_exit(mxs_i2c_exit);
914
914
915
915
MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
916
-
MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");
916
+
MODULE_AUTHOR("Wolfram Sang <kernel@pengutronix.de>");
917
917
MODULE_DESCRIPTION("MXS I2C Bus Driver");
918
918
MODULE_LICENSE("GPL");
919
919
MODULE_ALIAS("platform:" DRIVER_NAME);
+1
-1
drivers/i2c/busses/i2c-pca-platform.c
+1
-1
drivers/i2c/busses/i2c-pca-platform.c
+1
-1
drivers/i2c/busses/i2c-rk3x.c
+1
-1
drivers/i2c/busses/i2c-rk3x.c
+7
-6
drivers/i2c/busses/i2c-st.c
+7
-6
drivers/i2c/busses/i2c-st.c
···
10
10
* published by the Free Software Foundation.
11
11
*/
12
12
13
-
#include <linux/module.h>
14
-
#include <linux/platform_device.h>
15
-
#include <linux/i2c.h>
16
13
#include <linux/clk.h>
17
-
#include <linux/io.h>
18
14
#include <linux/delay.h>
19
-
#include <linux/interrupt.h>
20
15
#include <linux/err.h>
21
-
#include <linux/of.h>
16
+
#include <linux/i2c.h>
17
+
#include <linux/interrupt.h>
18
+
#include <linux/io.h>
19
+
#include <linux/module.h>
22
20
#include <linux/of_address.h>
23
21
#include <linux/of_irq.h>
22
+
#include <linux/of.h>
23
+
#include <linux/pinctrl/consumer.h>
24
+
#include <linux/platform_device.h>
24
25
25
26
/* SSC registers */
26
27
#define SSC_BRG 0x000
+2
drivers/i2c/i2c-core.c
+2
drivers/i2c/i2c-core.c
+5
-3
drivers/i2c/i2c-mux.c
+5
-3
drivers/i2c/i2c-mux.c
···
32
32
struct i2c_algorithm algo;
33
33
34
34
struct i2c_adapter *parent;
35
-
void *mux_priv; /* the mux chip/device */
36
-
u32 chan_id; /* the channel id */
35
+
struct device *mux_dev;
36
+
void *mux_priv;
37
+
u32 chan_id;
37
38
38
39
int (*select)(struct i2c_adapter *, void *mux_priv, u32 chan_id);
39
40
int (*deselect)(struct i2c_adapter *, void *mux_priv, u32 chan_id);
···
120
119
121
120
/* Set up private adapter data */
122
121
priv->parent = parent;
122
+
priv->mux_dev = mux_dev;
123
123
priv->mux_priv = mux_priv;
124
124
priv->chan_id = chan_id;
125
125
priv->select = select;
···
205
203
char symlink_name[20];
206
204
207
205
snprintf(symlink_name, sizeof(symlink_name), "channel-%u", priv->chan_id);
208
-
sysfs_remove_link(&adap->dev.parent->kobj, symlink_name);
206
+
sysfs_remove_link(&priv->mux_dev->kobj, symlink_name);
209
207
210
208
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
211
209
i2c_del_adapter(adap);