2 files changed, 80 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
new file mode 100644
index 000000000000..cb60443ff78f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
@@ -0,0 +1,40 @@
+* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
+
+The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor with
+an active array size of 2592H x 1944V. It is programmable through a simple
+two-wire serial interface.
+
+Required Properties:
+- compatible: value should be either one among the following
+        (a) "aptina,mt9p031" for mt9p031 sensor
+        (b) "aptina,mt9p031m" for mt9p031m sensor
+
+- input-clock-frequency: Input clock frequency.
+
+- pixel-clock-frequency: Pixel clock frequency.
+
+Optional Properties:
+- reset-gpios: Chip reset GPIO
+
+For further reading on port node refer to
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+
+        i2c0@1c22000 {
+                ...
+                ...
+                mt9p031@5d {
+                        compatible = "aptina,mt9p031";
+                        reg = <0x5d>;
+                        reset-gpios = <&gpio3 30 0>;
+
+                        port {
+                                mt9p031_1: endpoint {
+                                        input-clock-frequency = <6000000>;
+                                        pixel-clock-frequency = <96000000>;
+                                };
+                        };
+                };
+                ...
+        };
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index fe3414866a63..1abc86ed2255 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -16,9 +16,10 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/gpio.h>
-#include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
 #include <linux/pm.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
@@ -27,6 +28,7 @@
 #include <media/mt9p031.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-of.h>
 #include <media/v4l2-subdev.h>
 
 #include "aptina-pll.h"
@@ -927,10 +929,36 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = {
  * Driver initialization and probing
  */
 
+static struct mt9p031_platform_data *
+mt9p031_get_pdata(struct i2c_client *client)
+{
+        struct mt9p031_platform_data *pdata;
+        struct device_node *np;
+
+        if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
+                return client->dev.platform_data;
+
+        np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);
+        if (!np)
+                return NULL;
+
+        pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                goto done;
+
+        pdata->reset = of_get_named_gpio(client->dev.of_node, "reset-gpios", 0);
+        of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq);
+        of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq);
+
+done:
+        of_node_put(np);
+        return pdata;
+}
+
 static int mt9p031_probe(struct i2c_client *client,
                          const struct i2c_device_id *did)
 {
-        struct mt9p031_platform_data *pdata = client->dev.platform_data;
+        struct mt9p031_platform_data *pdata = mt9p031_get_pdata(client);
         struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
         struct mt9p031 *mt9p031;
         unsigned int i;
@@ -1069,8 +1097,18 @@ static const struct i2c_device_id mt9p031_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, mt9p031_id);
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id mt9p031_of_match[] = {
+        { .compatible = "aptina,mt9p031", },
+        { .compatible = "aptina,mt9p031m", },
+        { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, mt9p031_of_match);
+#endif
+
 static struct i2c_driver mt9p031_i2c_driver = {
         .driver = {
+                .of_match_table = of_match_ptr(mt9p031_of_match),
                 .name = "mt9p031",
         },
         .probe          = mt9p031_probe,