From patchwork Thu Aug 7 23:01:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 378025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 14301140114 for ; Fri, 8 Aug 2014 09:03:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbaHGXC3 (ORCPT ); Thu, 7 Aug 2014 19:02:29 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:1148 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754696AbaHGXCJ (ORCPT ); Thu, 7 Aug 2014 19:02:09 -0400 Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Thu, 07 Aug 2014 16:02:01 -0700 Received: from hqemhub03.nvidia.com ([172.20.12.94]) by hqnvupgp07.nvidia.com (PGP Universal service); Thu, 07 Aug 2014 15:49:14 -0700 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Thu, 07 Aug 2014 15:49:14 -0700 Received: from ttynkkynen-lnx.Nvidia.com (172.20.144.16) by hqemhub03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.342.0; Thu, 7 Aug 2014 16:02:07 -0700 From: Tuomas Tynkkynen To: Grant Likely , Rob Herring CC: Stephen Warren , Thierry Reding , , , , , , "Rafael J. Wysocki" , Daniel Lezcano , Lorenzo Pieralisi , Tuomas Tynkkynen Subject: [PATCH 1/3] of: Add of_match_machine helper Date: Fri, 8 Aug 2014 02:01:53 +0300 Message-ID: <1407452515-2390-2-git-send-email-ttynkkynen@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1407452515-2390-1-git-send-email-ttynkkynen@nvidia.com> References: <1407452515-2390-1-git-send-email-ttynkkynen@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Add of_match_machine function to test the device tree root for an of_match array. This can be useful when testing SoC versions at runtime, for example. Signed-off-by: Tuomas Tynkkynen Acked-by: Rob Herring --- drivers/of/base.c | 21 +++++++++++++++++++++ include/linux/of.h | 3 +++ 2 files changed, 24 insertions(+) diff --git a/drivers/of/base.c b/drivers/of/base.c index d8574ad..37798ea 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -977,6 +977,27 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, EXPORT_SYMBOL(of_find_matching_node_and_match); /** + * of_match_machine - Tell if root of device tree has a matching of_match struct + * @matches: array of of device match structures to search in + * + * Returns the result of of_match_node for the root node. + */ +const struct of_device_id *of_match_machine(const struct of_device_id *matches) +{ + const struct of_device_id *match; + struct device_node *root; + + root = of_find_node_by_path("/"); + if (!root) + return NULL; + + match = of_match_node(matches, root); + of_node_put(root); + return match; +} +EXPORT_SYMBOL(of_match_machine); + +/** * of_modalias_node - Lookup appropriate modalias for a device node * @node: pointer to a device tree node * @modalias: Pointer to buffer that modalias value will be copied into diff --git a/include/linux/of.h b/include/linux/of.h index 6c4363b..b7a8817 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -289,6 +289,8 @@ extern int of_n_addr_cells(struct device_node *np); extern int of_n_size_cells(struct device_node *np); extern const struct of_device_id *of_match_node( const struct of_device_id *matches, const struct device_node *node); +extern const struct of_device_id *of_match_machine( + const struct of_device_id *matches); extern int of_modalias_node(struct device_node *node, char *modalias, int len); extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args); extern struct device_node *of_parse_phandle(const struct device_node *np, @@ -584,6 +586,7 @@ static inline const char *of_prop_next_string(struct property *prop, #define of_match_ptr(_ptr) NULL #define of_match_node(_matches, _node) NULL +#define of_match_machine(_matches) NULL #endif /* CONFIG_OF */ #if defined(CONFIG_OF) && defined(CONFIG_NUMA)