From patchwork Thu Jan 7 13:28:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 12004143 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0B7C3C4332E for ; Thu, 7 Jan 2021 13:31:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D065922B4B for ; Thu, 7 Jan 2021 13:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728649AbhAGNaV (ORCPT ); Thu, 7 Jan 2021 08:30:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728635AbhAGNaT (ORCPT ); Thu, 7 Jan 2021 08:30:19 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E239C061285; Thu, 7 Jan 2021 05:29:11 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id 3so5539204wmg.4; Thu, 07 Jan 2021 05:29:11 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=UbXPmlsNfj3rZdgW4jkqaOrVVChzq9tlyKQWVU1cs38=; b=cFwM/aEFWhr0cvn50i/tgxcNEwYlItPIYysJ85JkIZXRS08YXC0luAFW0ptZim0bB/ Bc7P9Z51Cps76okxUydaMOAn5HeCNPgdZOE1ReAe6qyRnzw1LNRI+iv/oL17yv3y0k74 9PieMotLzK5Act48skwSutwkHRrx+eEBneeSwvo1zwcNxwWapO00beYD2snAAOmgjP2d oALQ1pcEKNPacGPwOmmXFQp+3rwpzxp/Z9NaG9qZ1EA0+BawCt1xN1v60UhjTsMxZxzd un5IzFMyFEsD4zDqWB0Q1//DDNHExaB2x2Xzzlgh9IAtnt9FWgcA61qFyrrFkLG+AVg1 o0Bw== 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:mime-version:content-transfer-encoding; bh=UbXPmlsNfj3rZdgW4jkqaOrVVChzq9tlyKQWVU1cs38=; b=Eh2k8drjGJwTDGcPhMYPQnNHImUrWSWJtNM6ISDeurId+qWEcCRyoaZYCmUT9leC0C 094WQpA1GbL/pe8ebt5q1G1MjY7LfwBR3/iHzeduCXMGo8UsL8rgBskItFeu3cClrSj2 IyNSOhQxeIlnPTr/7e2VAsy8xd1Iw6e6sU3KQXiutGxTo/9VnlZiMk2+Y2BptmlVWMe3 WYhHHXT6/PBjLjigTlP9X6Oep0c2JVl+D8x3g9O0OjufIbLW2AeklIel88PHbqCBQSLu hQgy5m20OeUk/pFgj3yy+UqYQmjHJ1fwxffW8q7Sr4d6RkDnOZcCmvwoSv7nK+AtAU+g RebA== X-Gm-Message-State: AOAM533peGI5tQkSJqz9dH8xKCJhhLoPcnqi/69QKZnh5UpX/Myk4/oC 7tAKogeoIDKNaILDourkRFAmIL92TgFCGCk5 X-Google-Smtp-Source: ABdhPJyvu1Z/3WmwtfBkIcQLLlj03xuAxmWGX9Qk5zQFUFieIuMaQLzdC+14Z77Q95nEnWmoO364Sw== X-Received: by 2002:a7b:c8c5:: with SMTP id f5mr8066051wml.106.1610026150302; Thu, 07 Jan 2021 05:29:10 -0800 (PST) Received: from valhalla.home ([2.29.208.120]) by smtp.gmail.com with ESMTPSA id o83sm7660125wme.21.2021.01.07.05.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 05:29:09 -0800 (PST) From: Daniel Scally To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-media@vger.kernel.org, devel@acpica.org, rjw@rjwysocki.net, lenb@kernel.org, gregkh@linuxfoundation.org, mchehab@kernel.org, sergey.senozhatsky@gmail.com Cc: yong.zhi@intel.com, sakari.ailus@linux.intel.com, bingbu.cao@intel.com, tian.shu.qiu@intel.com, robert.moore@intel.com, erik.kaneda@intel.com, pmladek@suse.com, rostedt@goodmis.org, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, laurent.pinchart+renesas@ideasonboard.com, jacopo+renesas@jmondi.org, kieran.bingham+renesas@ideasonboard.com, hverkuil-cisco@xs4all.nl, m.felsch@pengutronix.de, niklas.soderlund+renesas@ragnatech.se, prabhakar.mahadev-lad.rj@bp.renesas.com, slongerbeam@gmail.com, heikki.krogerus@linux.intel.com, Laurent Pinchart Subject: [PATCH v5 12/15] media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in match_fwnode() Date: Thu, 7 Jan 2021 13:28:35 +0000 Message-Id: <20210107132838.396641-13-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107132838.396641-1-djrscally@gmail.com> References: <20210107132838.396641-1-djrscally@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Where the fwnode graph is comprised of software_nodes, these will be assigned as the secondary to dev->fwnode. Check the v4l2_subdev's fwnode for a secondary and attempt to match against it during match_fwnode() to accommodate that possibility. Reviewed-by: Andy Shevchenko Reviewed-by: Laurent Pinchart Signed-off-by: Daniel Scally --- Changes in v5: - None drivers/media/v4l2-core/v4l2-async.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index e3ab003a6c85..9dd896d085ec 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -87,6 +87,14 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier, if (sd->fwnode == asd->match.fwnode) return true; + /* + * Check the same situation for any possible secondary assigned to the + * subdev's fwnode + */ + if (!IS_ERR_OR_NULL(sd->fwnode->secondary) && + sd->fwnode->secondary == asd->match.fwnode) + return true; + /* * Otherwise, check if the sd fwnode and the asd fwnode refer to an * endpoint or a device. If they're of the same type, there's no match.