These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / i2c / adv7180.c

diff --git a/kernel/drivers/media/i2c/adv7180.c b/kernel/drivers/media/i2c/adv7180.c
index a493c0b..f82c8aa 100644 (file)
--- a/kernel/drivers/media/i2c/adv7180.c
+++ b/kernel/drivers/media/i2c/adv7180.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
@@ -1324,11 +1325,20 @@ static SIMPLE_DEV_PM_OPS(adv7180_pm_ops, adv7180_suspend, adv7180_resume);
 #define ADV7180_PM_OPS NULL
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id adv7180_of_id[] = {
+       { .compatible = "adi,adv7180", },
+       { },
+};
+
+MODULE_DEVICE_TABLE(of, adv7180_of_id);
+#endif
+
 static struct i2c_driver adv7180_driver = {
        .driver = {
-                  .owner = THIS_MODULE,
                   .name = KBUILD_MODNAME,
                   .pm = ADV7180_PM_OPS,
+                  .of_match_table = of_match_ptr(adv7180_of_id),
                   },
        .probe = adv7180_probe,
        .remove = adv7180_remove,