From patchwork Tue Jun 19 19:14:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 165836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB82AB7007 for ; Wed, 20 Jun 2012 06:41:08 +1000 (EST) Received: from localhost ([::1]:44011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh3up-0003oq-O4 for incoming@patchwork.ozlabs.org; Tue, 19 Jun 2012 15:16:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh3tm-0001VT-Gc for qemu-devel@nongnu.org; Tue, 19 Jun 2012 15:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sh3th-0004af-SE for qemu-devel@nongnu.org; Tue, 19 Jun 2012 15:15:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48189 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh3th-0004ZQ-Mk; Tue, 19 Jun 2012 15:15:29 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 674A5A472D; Tue, 19 Jun 2012 21:15:28 +0200 (CEST) From: Alexander Graf To: qemu-devel qemu-devel Date: Tue, 19 Jun 2012 21:14:58 +0200 Message-Id: <1340133324-352-6-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1340133324-352-1-git-send-email-agraf@suse.de> References: <1340133324-352-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: qemu-ppc Mailing List Subject: [Qemu-devel] [PATCH 05/31] dt: add helper for phandle enumeration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds a helper to search for a node's phandle by its path. This is especially useful when the phandle is part of an array, not just a single cell in which case qemu_devtree_setprop_phandle would be the easy choice. Signed-off-by: Alexander Graf Reviewed-by: Peter Crosthwaite --- device_tree.c | 16 +++++++++++++++- device_tree.h | 1 + 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/device_tree.c b/device_tree.c index 967c97a..2f127b7 100644 --- a/device_tree.c +++ b/device_tree.c @@ -132,11 +132,25 @@ int qemu_devtree_setprop_string(void *fdt, const char *node_path, return r; } +uint32_t qemu_devtree_get_phandle(void *fdt, const char *path) +{ + uint32_t r; + + r = fdt_get_phandle(fdt, findnode_nofail(fdt, path)); + if (r <= 0) { + fprintf(stderr, "%s: Couldn't get phandle for %s: %s\n", __func__, + path, fdt_strerror(r)); + exit(1); + } + + return r; +} + int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, const char *property, const char *target_node_path) { - uint32_t phandle = fdt_get_phandle(fdt, findnode_nofail(fdt, target_node_path)); + uint32_t phandle = qemu_devtree_get_phandle(fdt, target_node_path); return qemu_devtree_setprop_cell(fdt, node_path, property, phandle); } diff --git a/device_tree.h b/device_tree.h index 754bd2b..36fc9db 100644 --- a/device_tree.h +++ b/device_tree.h @@ -25,6 +25,7 @@ int qemu_devtree_setprop_string(void *fdt, const char *node_path, int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, const char *property, const char *target_node_path); +uint32_t qemu_devtree_get_phandle(void *fdt, const char *path); int qemu_devtree_nop_node(void *fdt, const char *node_path); int qemu_devtree_add_subnode(void *fdt, const char *name);