From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06334C5CFE7 for ; Mon, 9 Jul 2018 22:42:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B34592086B for ; Mon, 9 Jul 2018 22:42:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m+i4YibT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B34592086B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933600AbeGIWmg (ORCPT ); Mon, 9 Jul 2018 18:42:36 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40325 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932798AbeGIWjy (ORCPT ); Mon, 9 Jul 2018 18:39:54 -0400 Received: by mail-pl0-f65.google.com with SMTP id t6-v6so6674979plo.7; Mon, 09 Jul 2018 15:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4V8ddSLke/gsEPETJSHH2JZLxPsQODdtBbtSduvOQmk=; b=m+i4YibTd8yfnk0VyENvf7awiADKHUOLXtHmC01JFMLRrWRBevbn5NiNepzTMi9YLO 6g4CK9M7bZBP+C51xDPB5dEKXoF0cMSNgbKQzuky/8b/5x1Q1WsR6AVaZHBjtdYsLFvP 3n33fBPvUGL8r1wx+ZcHc3yrY79ZJgXTYY0p3C+G7Eaamd4mIHBQk9FYKWM5RhQeeh8e W3VrVqshOLoKEaeUgmGxb5g5FM/eaFCH8iTED5W3nnhGkeH1EIYhPyfutZxAIROIP6HP /LAmHR2L3piUYB87QeVKXM8dwJQJBcJwssHgups28sFlf1GM+tLdvjVdo7bAgx4nQj9V 4c4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4V8ddSLke/gsEPETJSHH2JZLxPsQODdtBbtSduvOQmk=; b=YYmpd2IrIfFk1satc1u5BRrVz9ZXB993Yy/LPos9oLtiU864g+8vSDJ28cXXluVB2l 8bPpEIKtX1yru4HvjhlupCKaS2q2JmabvsbcgGmIu/XrTpn1RApcuW5cBclMyweAKQPZ DO+KWcXsS4qVLUNqWclp20NYvFwFQZqT3OmyTrATZh5JWXRug4Qz7haxogMAF4r3ujEM kCnvUsZlZu/Y7xcVYitp4ZQKkisNcZrOCIJn8k/R4569Qk20BNMU/szBoix5j4h/3cFF U46iGPlseeI3tVLUSI/MkQACKn7MkWbzb82mooMNHWb8GjGRkB37G50rYdOcpeasF2iD +YVw== X-Gm-Message-State: APt69E1xI4lvUcgeVDcv/jWZPKbLrU9cwfY9kl31A4LxIVCCXPdywMng aJRvZxky/+v5ykGn9w02kfetuw== X-Google-Smtp-Source: AAOMgpeSmXccjW5gAuiA5Rhyiige2OwJWBeZbzt6687nMHEdu5Cvewtt1LvPVyzPj+RICusEAgS+VQ== X-Received: by 2002:a17:902:8486:: with SMTP id c6-v6mr21923533plo.283.1531175993798; Mon, 09 Jul 2018 15:39:53 -0700 (PDT) Received: from majic.sklembedded.com (c-98-210-181-167.hsd1.ca.comcast.net. [98.210.181.167]) by smtp.googlemail.com with ESMTPSA id r16-v6sm30143804pfe.173.2018.07.09.15.39.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jul 2018 15:39:53 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam , Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 09/17] media: imx: mipi csi-2: Register a subdev notifier Date: Mon, 9 Jul 2018 15:39:09 -0700 Message-Id: <1531175957-1973-10-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531175957-1973-1-git-send-email-steve_longerbeam@mentor.com> References: <1531175957-1973-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Parse neighbor remote devices on the MIPI CSI-2 input port, add them to a subdev notifier, and register the subdev notifier for the MIPI CSI-2 receiver, by calling v4l2_async_register_fwnode_subdev(). csi2_parse_endpoints() is modified to be the parse_endpoint callback. Signed-off-by: Steve Longerbeam --- drivers/staging/media/imx/imx6-mipi-csi2.c | 31 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c index ceeeb30..94eb9a1 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -551,35 +551,34 @@ static const struct v4l2_subdev_internal_ops csi2_internal_ops = { .registered = csi2_registered, }; -static int csi2_parse_endpoints(struct csi2_dev *csi2) +static int csi2_parse_endpoint(struct device *dev, + struct v4l2_fwnode_endpoint *vep, + struct v4l2_async_subdev *asd) { - struct device_node *node = csi2->dev->of_node; - struct device_node *epnode; - struct v4l2_fwnode_endpoint ep; + struct v4l2_subdev *sd = dev_get_drvdata(dev); + struct csi2_dev *csi2 = sd_to_dev(sd); - epnode = of_graph_get_endpoint_by_regs(node, 0, -1); - if (!epnode) { - v4l2_err(&csi2->sd, "failed to get sink endpoint node\n"); + if (!fwnode_device_is_available(asd->match.fwnode)) { + v4l2_err(&csi2->sd, "remote is not available\n"); return -EINVAL; } - v4l2_fwnode_endpoint_parse(of_fwnode_handle(epnode), &ep); - of_node_put(epnode); - - if (ep.bus_type != V4L2_MBUS_CSI2) { + if (vep->bus_type != V4L2_MBUS_CSI2) { v4l2_err(&csi2->sd, "invalid bus type, must be MIPI CSI2\n"); return -EINVAL; } - csi2->bus = ep.bus.mipi_csi2; + csi2->bus = vep->bus.mipi_csi2; dev_dbg(csi2->dev, "data lanes: %d\n", csi2->bus.num_data_lanes); dev_dbg(csi2->dev, "flags: 0x%08x\n", csi2->bus.flags); + return 0; } static int csi2_probe(struct platform_device *pdev) { + unsigned int sink_port = 0; struct csi2_dev *csi2; struct resource *res; int ret; @@ -601,10 +600,6 @@ static int csi2_probe(struct platform_device *pdev) csi2->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE; csi2->sd.grp_id = IMX_MEDIA_GRP_ID_CSI2; - ret = csi2_parse_endpoints(csi2); - if (ret) - return ret; - csi2->pllref_clk = devm_clk_get(&pdev->dev, "ref"); if (IS_ERR(csi2->pllref_clk)) { v4l2_err(&csi2->sd, "failed to get pll reference clock\n"); @@ -654,7 +649,9 @@ static int csi2_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &csi2->sd); - ret = v4l2_async_register_subdev(&csi2->sd); + ret = v4l2_async_register_fwnode_subdev( + &csi2->sd, sizeof(struct v4l2_async_subdev), + &sink_port, 1, csi2_parse_endpoint); if (ret) goto dphy_off; -- 2.7.4