Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
i2c
/
i2c-mux.c
diff --git
a/kernel/drivers/i2c/i2c-mux.c
b/kernel/drivers/i2c/i2c-mux.c
index
2ba7c0f
..
00fc5b1
100644
(file)
--- a/
kernel/drivers/i2c/i2c-mux.c
+++ b/
kernel/drivers/i2c/i2c-mux.c
@@
-25,6
+25,7
@@
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
#include <linux/of.h>
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
#include <linux/of.h>
+#include <linux/acpi.h>
/* multiplexer per channel data */
struct i2c_mux_priv {
/* multiplexer per channel data */
struct i2c_mux_priv {
@@
-173,6
+174,13
@@
struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
}
}
}
}
+ /*
+ * Associate the mux channel with an ACPI node.
+ */
+ if (has_acpi_companion(mux_dev))
+ acpi_preset_companion(&priv->adap.dev, ACPI_COMPANION(mux_dev),
+ chan_id);
+
if (force_nr) {
priv->adap.nr = force_nr;
ret = i2c_add_numbered_adapter(&priv->adap);
if (force_nr) {
priv->adap.nr = force_nr;
ret = i2c_add_numbered_adapter(&priv->adap);