From patchwork Wed May 17 15:15:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9731429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B3E2F602DB for ; Wed, 17 May 2017 15:15:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5605287A9 for ; Wed, 17 May 2017 15:15:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99B13287B6; Wed, 17 May 2017 15:15:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D423287A9 for ; Wed, 17 May 2017 15:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbdEQPPT (ORCPT ); Wed, 17 May 2017 11:15:19 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:37335 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753518AbdEQPPR (ORCPT ); Wed, 17 May 2017 11:15:17 -0400 Received: from lupine.hi.4.pengutronix.de ([10.1.0.115] helo=lupine.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1dB0fT-0002Dz-Lf; Wed, 17 May 2017 17:15:15 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, Steve Longerbeam , Peter Rosin , Sakari Ailus , Pavel Machek , Rob Herring , Mark Rutland , Vladimir Zapolskiy , Sebastian Reichel , Kieran Bingham , kernel@pengutronix.de, Philipp Zabel Subject: [PATCH v5 3/3] [media] platform: video-mux: include temporary mmio-mux support Date: Wed, 17 May 2017 17:15:07 +0200 Message-Id: <1495034107-21407-3-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495034107-21407-1-git-send-email-p.zabel@pengutronix.de> References: <1495034107-21407-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.115 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As long as the mux framework is not merged, add temporary mmio-mux support to the video-mux driver itself. This patch is to be reverted once the "mux: minimal mux subsystem" and "mux: mmio-based syscon mux controller" patches are merged. Signed-off-by: Philipp Zabel --- This patch allows the video-mux driver to be built and used on i.MX6 before the mux framework [1][2] is merged. It can be dropped after that happened, but until then, it should help to avoid a dependency of the i.MX6 capture drivers on the mux framework, so that the two can be merged independently. [1] https://patchwork.kernel.org/patch/9725911/ [2] https://patchwork.kernel.org/patch/9725893/ --- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/video-mux.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 259c0ff780937..fea1dc05ea7b7 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,7 @@ config VIDEO_M32R_AR_M64278 config VIDEO_MUX tristate "Video Multiplexer" - depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER && MULTIPLEXER + depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER help This driver provides support for N:1 video bus multiplexers. diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c index e35ffa18126f3..b997ff881ad24 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c @@ -17,7 +17,12 @@ #include #include #include +#ifdef CONFIG_MULTIPLEXER #include +#else +#include +#include +#endif #include #include #include @@ -29,7 +34,11 @@ struct video_mux { struct v4l2_subdev subdev; struct media_pad *pads; struct v4l2_mbus_framefmt *format_mbus; +#ifdef CONFIG_MULTIPLEXER struct mux_control *mux; +#else + struct regmap_field *field; +#endif struct mutex lock; int active; }; @@ -70,7 +79,11 @@ static int video_mux_link_setup(struct media_entity *entity, } dev_dbg(sd->dev, "setting %d active\n", local->index); +#ifdef CONFIG_MULTIPLEXER ret = mux_control_try_select(vmux->mux, local->index); +#else + ret = regmap_field_write(vmux->field, local->index); +#endif if (ret < 0) goto out; vmux->active = local->index; @@ -79,7 +92,9 @@ static int video_mux_link_setup(struct media_entity *entity, goto out; dev_dbg(sd->dev, "going inactive\n"); +#ifdef CONFIG_MULTIPLEXER mux_control_deselect(vmux->mux); +#endif vmux->active = -1; } @@ -193,6 +208,48 @@ static const struct v4l2_subdev_ops video_mux_subdev_ops = { .video = &video_mux_subdev_video_ops, }; +#ifndef CONFIG_MULTIPLEXER +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], ®); + 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; +} +#endif + static int video_mux_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; @@ -230,9 +287,14 @@ static int video_mux_probe(struct platform_device *pdev) return -EINVAL; } +#ifdef CONFIG_MULTIPLEXER vmux->mux = devm_mux_control_get(dev, NULL); if (IS_ERR(vmux->mux)) { ret = PTR_ERR(vmux->mux); +#else + ret = video_mux_probe_mmio_mux(vmux); + if (ret) { +#endif if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get mux: %d\n", ret); return ret;