media: mt9m111: allow to setup pixclk polarity

The chip can be configured to output data transitions on the
rising or falling edge of PIXCLK (Datasheet R58:1[9]), default is on the
falling edge.

Parsing the fw-node is made in a subfunction to bundle all (future)
dt-parsing / fw-parsing stuff.

[m.grzeschik@pengutronix.de: Fix inverting clock. INV_PIX_CLOCK bit is set
 per default. Set bit to 0 (enable mask bit without value) to enable
 falling edge sampling.]
[m.felsch@pengutronix.de: use fwnode helpers]
[m.felsch@pengutronix.de: mv fw parsing into own function]
[m.felsch@pengutronix.de: adapt commit msg]
[sakari.ailus@linux.intel.com: V4L2 API usage changes to compile
 on media tree master]

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 3b88f45..4c936e1 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -860,6 +860,7 @@ config VIDEO_MT9M032
 config VIDEO_MT9M111
        tristate "mt9m111, mt9m112 and mt9m131 support"
        depends on I2C && VIDEO_V4L2
+       select V4L2_FWNODE
        help
          This driver supports MT9M111, MT9M112 and MT9M131 cameras from
          Micron/Aptina

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index f97fd32..d639b9b 100644 (file)
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/module.h>
+#include <linux/property.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-clk.h>
@@ -22,6 +23,7 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-event.h>
+#include <media/v4l2-fwnode.h>
 
 /*
  * MT9M111, MT9M112 and MT9M131:
@@ -242,6 +244,8 @@ struct mt9m111 {
        const struct mt9m111_datafmt *fmt;
        int lastpage;   /* PageMap cache value */
        bool is_streaming;
+       /* user point of view - 0: falling 1: rising edge */
+       unsigned int pclk_sample:1;
 #ifdef CONFIG_MEDIA_CONTROLLER
        struct media_pad pad;
 #endif
@@ -594,6 +598,10 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
                return -EINVAL;
        }
 
+       /* receiver samples on falling edge, chip-hw default is rising */
+       if (mt9m111->pclk_sample == 0)
+               mask_outfmt2 |= MT9M111_OUTFMT_INV_PIX_CLOCK;
+
        ret = mt9m111_reg_mask(client, context_a.output_fmt_ctrl2,
                               data_outfmt2, mask_outfmt2);
        if (!ret)
@@ -1084,9 +1092,15 @@ static int mt9m111_s_stream(struct v4l2_subdev *sd, int enable)
 static int mt9m111_g_mbus_config(struct v4l2_subdev *sd,
                                struct v4l2_mbus_config *cfg)
 {
-       cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING |
+       struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
+
+       cfg->flags = V4L2_MBUS_MASTER |
                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
                V4L2_MBUS_DATA_ACTIVE_HIGH;
+
+       cfg->flags |= mt9m111->pclk_sample ? V4L2_MBUS_PCLK_SAMPLE_RISING :
+               V4L2_MBUS_PCLK_SAMPLE_FALLING;
+
        cfg->type = V4L2_MBUS_PARALLEL;
 
        return 0;
@@ -1156,6 +1170,30 @@ done:
        return ret;
 }
 
+static int mt9m111_probe_fw(struct i2c_client *client, struct mt9m111 *mt9m111)
+{
+       struct v4l2_fwnode_endpoint bus_cfg = {
+               .bus_type = V4L2_MBUS_PARALLEL
+       };
+       struct fwnode_handle *np;
+       int ret;
+
+       np = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), NULL);
+       if (!np)
+               return -EINVAL;
+
+       ret = v4l2_fwnode_endpoint_parse(np, &bus_cfg);
+       if (ret)
+               goto out_put_fw;
+
+       mt9m111->pclk_sample = !!(bus_cfg.bus.parallel.flags &
+                                 V4L2_MBUS_PCLK_SAMPLE_RISING);
+
+out_put_fw:
+       fwnode_handle_put(np);
+       return ret;
+}
+
 static int mt9m111_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
@@ -1173,6 +1211,10 @@ static int mt9m111_probe(struct i2c_client *client,
        if (!mt9m111)
                return -ENOMEM;
 
+       ret = mt9m111_probe_fw(client, mt9m111);
+       if (ret)
+               return ret;
+
        mt9m111->clk = v4l2_clk_get(&client->dev, "mclk");
        if (IS_ERR(mt9m111->clk))
                return PTR_ERR(mt9m111->clk);