|
@@ -15,6 +15,7 @@
|
|
|
#include <media/v4l2-device.h>
|
|
|
#include <media/i2c/tvp5150.h>
|
|
|
#include <media/v4l2-ctrls.h>
|
|
|
+#include <media/v4l2-of.h>
|
|
|
|
|
|
#include "tvp5150_reg.h"
|
|
|
|
|
@@ -43,6 +44,8 @@ struct tvp5150 {
|
|
|
u32 input;
|
|
|
u32 output;
|
|
|
int enable;
|
|
|
+
|
|
|
+ enum v4l2_mbus_type mbus_type;
|
|
|
};
|
|
|
|
|
|
static inline struct tvp5150 *to_tvp5150(struct v4l2_subdev *sd)
|
|
@@ -773,6 +776,10 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val)
|
|
|
v4l2_ctrl_handler_setup(&decoder->hdl);
|
|
|
|
|
|
tvp5150_set_std(sd, decoder->norm);
|
|
|
+
|
|
|
+ if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
|
|
|
+ tvp5150_write(sd, TVP5150_DATA_RATE_SEL, 0x40);
|
|
|
+
|
|
|
return 0;
|
|
|
};
|
|
|
|
|
@@ -952,7 +959,9 @@ static int tvp5150_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
|
|
|
static int tvp5150_g_mbus_config(struct v4l2_subdev *sd,
|
|
|
struct v4l2_mbus_config *cfg)
|
|
|
{
|
|
|
- cfg->type = V4L2_MBUS_BT656;
|
|
|
+ struct tvp5150 *decoder = to_tvp5150(sd);
|
|
|
+
|
|
|
+ cfg->type = decoder->mbus_type;
|
|
|
cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING
|
|
|
| V4L2_MBUS_FIELD_EVEN_LOW | V4L2_MBUS_DATA_ACTIVE_HIGH;
|
|
|
|
|
@@ -965,13 +974,20 @@ static int tvp5150_g_mbus_config(struct v4l2_subdev *sd,
|
|
|
|
|
|
static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
|
|
|
{
|
|
|
+ struct tvp5150 *decoder = to_tvp5150(sd);
|
|
|
+ /* Output format: 8-bit ITU-R BT.656 with embedded syncs */
|
|
|
+ int val = 0x09;
|
|
|
+
|
|
|
+ /* Output format: 8-bit 4:2:2 YUV with discrete sync */
|
|
|
+ if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
|
|
|
+ val = 0x0d;
|
|
|
+
|
|
|
/* Initializes TVP5150 to its default values */
|
|
|
/* # set PCLK (27MHz) */
|
|
|
tvp5150_write(sd, TVP5150_CONF_SHARED_PIN, 0x00);
|
|
|
|
|
|
- /* Output format: 8-bit ITU-R BT.656 with embedded syncs */
|
|
|
if (enable)
|
|
|
- tvp5150_write(sd, TVP5150_MISC_CTL, 0x09);
|
|
|
+ tvp5150_write(sd, TVP5150_MISC_CTL, val);
|
|
|
else
|
|
|
tvp5150_write(sd, TVP5150_MISC_CTL, 0x00);
|
|
|
|
|
@@ -1206,11 +1222,42 @@ static int tvp5150_init(struct i2c_client *c)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
|
|
|
+{
|
|
|
+ struct v4l2_of_endpoint bus_cfg;
|
|
|
+ struct device_node *ep;
|
|
|
+ unsigned int flags;
|
|
|
+ int ret = 0;
|
|
|
+
|
|
|
+ ep = of_graph_get_next_endpoint(np, NULL);
|
|
|
+ if (!ep)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ ret = v4l2_of_parse_endpoint(ep, &bus_cfg);
|
|
|
+ if (ret)
|
|
|
+ goto err;
|
|
|
+
|
|
|
+ flags = bus_cfg.bus.parallel.flags;
|
|
|
+
|
|
|
+ if (bus_cfg.bus_type == V4L2_MBUS_PARALLEL &&
|
|
|
+ !(flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH &&
|
|
|
+ flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH &&
|
|
|
+ flags & V4L2_MBUS_FIELD_EVEN_LOW))
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ decoder->mbus_type = bus_cfg.bus_type;
|
|
|
+
|
|
|
+err:
|
|
|
+ of_node_put(ep);
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
static int tvp5150_probe(struct i2c_client *c,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
|
struct tvp5150 *core;
|
|
|
struct v4l2_subdev *sd;
|
|
|
+ struct device_node *np = c->dev.of_node;
|
|
|
int res;
|
|
|
|
|
|
/* Check if the adapter supports the needed features */
|
|
@@ -1225,7 +1272,20 @@ static int tvp5150_probe(struct i2c_client *c,
|
|
|
core = devm_kzalloc(&c->dev, sizeof(*core), GFP_KERNEL);
|
|
|
if (!core)
|
|
|
return -ENOMEM;
|
|
|
+
|
|
|
sd = &core->sd;
|
|
|
+
|
|
|
+ if (IS_ENABLED(CONFIG_OF) && np) {
|
|
|
+ res = tvp5150_parse_dt(core, np);
|
|
|
+ if (res) {
|
|
|
+ v4l2_err(sd, "DT parsing error: %d\n", res);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ /* Default to BT.656 embedded sync */
|
|
|
+ core->mbus_type = V4L2_MBUS_BT656;
|
|
|
+ }
|
|
|
+
|
|
|
v4l2_i2c_subdev_init(sd, c, &tvp5150_ops);
|
|
|
|
|
|
res = tvp5150_detect_version(core);
|