aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-12-16 15:11:54 -0500
committerJean Delvare <khali@endymion.delvare>2012-12-16 15:11:54 -0500
commitf6afc8b158951cf2c8492e10e4ee70abc7b213f3 (patch)
treec8202139e2295540fa31a779022fe84e3fee5979
parent8547a5bc104496d54c66355df944c348e6525e3f (diff)
i2c-i801: Add device tree support
Add support for probing slave devices parsed from the device tree. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--drivers/i2c/busses/i2c-i801.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 6abc00d59881..e80eafc48e78 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -81,6 +81,7 @@
81#include <linux/slab.h> 81#include <linux/slab.h>
82#include <linux/wait.h> 82#include <linux/wait.h>
83#include <linux/err.h> 83#include <linux/err.h>
84#include <linux/of_i2c.h>
84 85
85#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ 86#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \
86 defined CONFIG_DMI 87 defined CONFIG_DMI
@@ -1215,6 +1216,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
1215 goto exit_free_irq; 1216 goto exit_free_irq;
1216 } 1217 }
1217 1218
1219 of_i2c_register_devices(&priv->adapter);
1218 i801_probe_optional_slaves(priv); 1220 i801_probe_optional_slaves(priv);
1219 /* We ignore errors - multiplexing is optional */ 1221 /* We ignore errors - multiplexing is optional */
1220 i801_add_mux(priv); 1222 i801_add_mux(priv);