redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

media: platform: video-mux: convert to multiplexer framework 

Now that the multiplexer framework is merged, drop the temporary
mmio-mux implementation from the video-mux driver and convert it to use
the multiplexer API.

[mchehab@s-opensource.com: fix a merge conflict at Kconfig]
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
hifive-unleashed-5.1
Philipp Zabel 2017-07-18 09:26:00 -04:00 committed by Mauro Carvalho Chehab
parent d82cf24859
commit 435945e085
2 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/Kconfig
View File

@ -76,6 +76,7 @@ config VIDEO_M32R_AR_M64278
config VIDEO_MUX
tristate "Video Multiplexer"
select MULTIPLEXER
depends on VIDEO_V4L2 && OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER
select REGMAP
help

53
drivers/media/platform/video-mux.c
View File

@ -17,8 +17,7 @@
#include <linux/err.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
#include <linux/mux/consumer.h>
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/platform_device.h>
@ -30,7 +29,7 @@ struct video_mux {
struct v4l2_subdev subdev;
struct media_pad *pads;
struct v4l2_mbus_framefmt *format_mbus;
struct regmap_field *field;
struct mux_control *mux;
struct mutex lock;
int active;
};
@ -71,7 +70,7 @@ static int video_mux_link_setup(struct media_entity *entity,
}
dev_dbg(sd->dev, "setting %d active\n", local->index);
ret = regmap_field_write(vmux->field, local->index);
ret = mux_control_try_select(vmux->mux, local->index);
if (ret < 0)
goto out;
vmux->active = local->index;
@ -80,6 +79,7 @@ static int video_mux_link_setup(struct media_entity *entity,
goto out;
dev_dbg(sd->dev, "going inactive\n");
mux_control_deselect(vmux->mux);
vmux->active = -1;
}
@ -193,46 +193,6 @@ static const struct v4l2_subdev_ops video_mux_subdev_ops = {
.video = &video_mux_subdev_video_ops,
};
static int video_mux_probe_mmio_mux(struct video_mux *vmux)
{
struct device *dev = vmux->subdev.dev;
struct of_phandle_args args;
struct reg_field field;
struct regmap *regmap;
u32 reg, mask;
int ret;
ret = of_parse_phandle_with_args(dev->of_node, "mux-controls",
"#mux-control-cells", 0, &args);
if (ret)
return ret;
if (!of_device_is_compatible(args.np, "mmio-mux"))
return -EINVAL;
regmap = syscon_node_to_regmap(args.np->parent);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
ret = of_property_read_u32_index(args.np, "mux-reg-masks",
2 * args.args[0], &reg);
if (!ret)
ret = of_property_read_u32_index(args.np, "mux-reg-masks",
2 * args.args[0] + 1, &mask);
if (ret < 0)
return ret;
field.reg = reg;
field.msb = fls(mask) - 1;
field.lsb = ffs(mask) - 1;
vmux->field = devm_regmap_field_alloc(dev, regmap, field);
if (IS_ERR(vmux->field))
return PTR_ERR(vmux->field);
return 0;
}
static int video_mux_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
@ -270,8 +230,9 @@ static int video_mux_probe(struct platform_device *pdev)
return -EINVAL;
}
ret = video_mux_probe_mmio_mux(vmux);
if (ret) {
vmux->mux = devm_mux_control_get(dev, NULL);
if (IS_ERR(vmux->mux)) {
ret = PTR_ERR(vmux->mux);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get mux: %d\n", ret);
return ret;