From patchwork Wed May 30 11:00:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 161952 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 591A4B7063 for ; Wed, 30 May 2012 22:14:19 +1000 (EST) Received: from localhost ([::1]:41018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZgex-0003g5-MG for incoming@patchwork.ozlabs.org; Wed, 30 May 2012 07:01:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZgeH-00029q-Rc for qemu-devel@nongnu.org; Wed, 30 May 2012 07:01:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZge6-0001Ie-GT for qemu-devel@nongnu.org; Wed, 30 May 2012 07:01:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56866 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZge6-0001IE-9d; Wed, 30 May 2012 07:00:54 -0400 Received: from relay2.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 96BA4A04E2; Wed, 30 May 2012 13:00:51 +0200 (CEST) From: Alexander Graf To: qemu-devel Developers Date: Wed, 30 May 2012 13:00:26 +0200 Message-Id: <1338375646-15064-6-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1338375646-15064-1-git-send-email-agraf@suse.de> References: <1338375646-15064-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: Scott Wood , qemu-ppc Subject: [Qemu-devel] [PATCH 05/25] 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 --- 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 6cbc5af..6745d17 100644 --- a/device_tree.c +++ b/device_tree.c @@ -162,10 +162,24 @@ 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 *string) { - uint32_t phandle = fdt_get_phandle(fdt, findnode_nofail(fdt, string)); + uint32_t phandle = qemu_devtree_get_phandle(fdt, string); return qemu_devtree_setprop_cell(fdt, node_path, property, phandle); } diff --git a/device_tree.h b/device_tree.h index 2e87c58..376287a 100644 --- a/device_tree.h +++ b/device_tree.h @@ -33,6 +33,7 @@ int qemu_devtree_setprop_string(void *fdt, const char *node_path, const char *property, const char *string); int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, const char *property, const char *string); +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);