From patchwork Thu Feb 27 17:35:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 3734771 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E51079F35F for ; Thu, 27 Feb 2014 17:22:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12B462009C for ; Thu, 27 Feb 2014 17:22:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34BA220225 for ; Thu, 27 Feb 2014 17:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535AbaB0RW0 (ORCPT ); Thu, 27 Feb 2014 12:22:26 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:60494 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927AbaB0RWZ (ORCPT ); Thu, 27 Feb 2014 12:22:25 -0500 Received: from paszta.hi.pengutronix.de ([10.1.0.120] helo=paszta.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WJ4es-0001Z8-66; Thu, 27 Feb 2014 18:22:06 +0100 From: Philipp Zabel To: Grant Likely , Mauro Carvalho Chehab , Russell King - ARM Linux Cc: Rob Herring , Sylwester Nawrocki , Laurent Pinchart , Guennadi Liakhovetski , Tomi Valkeinen , Kyungmin Park , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, Philipp Zabel Subject: [PATCH v5 6/7] of: Implement simplified graph binding for single port devices Date: Thu, 27 Feb 2014 18:35:39 +0100 Message-Id: <1393522540-22887-7-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 1.9.0.rc3 In-Reply-To: <1393522540-22887-1-git-send-email-p.zabel@pengutronix.de> References: <1393522540-22887-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.120 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-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For simple devices with only one port, it can be made implicit. The endpoint node can be a direct child of the device node. Signed-off-by: Philipp Zabel --- drivers/of/base.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index ba3cfca..7d9c62b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2037,8 +2037,13 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, struct device_node *node; /* * It's the first call, we have to find a port subnode - * within this node or within an optional 'ports' node. + * within this node or within an optional 'ports' node, + * or at least a single endpoint. */ + endpoint = of_get_child_by_name(parent, "endpoint"); + if (endpoint) + return endpoint; + node = of_get_child_by_name(parent, "ports"); if (node) parent = node; @@ -2049,8 +2054,6 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, /* Found a port, get an endpoint. */ endpoint = of_get_next_child(port, NULL); of_node_put(port); - } else { - endpoint = NULL; } if (!endpoint) @@ -2065,6 +2068,10 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, if (WARN_ONCE(!port, "%s(): endpoint has no parent node\n", __func__)) return NULL; + if (port == parent) { + of_node_put(port); + return NULL; + } /* Avoid dropping prev node refcount to 0. */ of_node_get(prev); @@ -2105,9 +2112,11 @@ struct device_node *of_graph_get_remote_port_parent( /* Get remote endpoint node. */ np = of_parse_phandle(node, "remote-endpoint", 0); - /* Walk 3 levels up only if there is 'ports' node. */ + /* Walk 3 levels up only if there is 'ports' node */ for (depth = 3; depth && np; depth--) { np = of_get_next_parent(np); + if (depth == 3 && of_node_cmp(np->name, "port")) + break; if (depth == 2 && of_node_cmp(np->name, "ports")) break; } @@ -2130,6 +2139,11 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node) np = of_parse_phandle(node, "remote-endpoint", 0); if (!np) return NULL; - return of_get_next_parent(np); + np = of_get_next_parent(np); + if (of_node_cmp(np->name, "port")) { + of_node_put(np); + return NULL; + } + return np; } EXPORT_SYMBOL(of_graph_get_remote_port);