From patchwork Thu Aug 15 10:55:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 2845079 Return-Path: X-Original-To: patchwork-linux-arm@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 791C79F239 for ; Thu, 15 Aug 2013 10:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEC39203DC for ; Thu, 15 Aug 2013 10:59:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A73F203DB for ; Thu, 15 Aug 2013 10:59:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9vGl-0006et-Ue; Thu, 15 Aug 2013 10:59:08 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9vGa-0004uG-GW; Thu, 15 Aug 2013 10:58:56 +0000 Received: from co9ehsobe005.messaging.microsoft.com ([207.46.163.28] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9vGC-0004qH-84 for linux-arm-kernel@lists.infradead.org; Thu, 15 Aug 2013 10:58:34 +0000 Received: from mail124-co9-R.bigfish.com (10.236.132.253) by CO9EHSOBE001.bigfish.com (10.236.130.64) with Microsoft SMTP Server id 14.1.225.22; Thu, 15 Aug 2013 10:58:10 +0000 Received: from mail124-co9 (localhost [127.0.0.1]) by mail124-co9-R.bigfish.com (Postfix) with ESMTP id 8BE8C200218; Thu, 15 Aug 2013 10:58:10 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h1155h) Received: from mail124-co9 (localhost.localdomain [127.0.0.1]) by mail124-co9 (MessageSwitch) id 1376564288371816_30298; Thu, 15 Aug 2013 10:58:08 +0000 (UTC) Received: from CO9EHSMHS023.bigfish.com (unknown [10.236.132.227]) by mail124-co9.bigfish.com (Postfix) with ESMTP id 4C2FBD40047; Thu, 15 Aug 2013 10:58:08 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS023.bigfish.com (10.236.130.33) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 15 Aug 2013 10:58:08 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.3.136.1; Thu, 15 Aug 2013 10:58:07 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r7FAw008002450; Thu, 15 Aug 2013 03:58:05 -0700 From: Dong Aisheng To: , Subject: [PATCH 1/3] of: add device node status update APIs Date: Thu, 15 Aug 2013 18:55:31 +0800 Message-ID: <1376564133-11286-2-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1376564133-11286-1-git-send-email-b29396@freescale.com> References: <1376564133-11286-1-git-send-email-b29396@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130815_065832_502312_11C51555 X-CRM114-Status: GOOD ( 14.42 ) X-Spam-Score: -4.2 (----) Cc: grant.likely@linaro.org, rob@landley.net, rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Used for convineniently update the device node status. Signed-off-by: Dong Aisheng --- drivers/of/base.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of.h | 5 +++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 5c54279..f944a54 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1424,6 +1424,80 @@ int of_update_property(struct device_node *np, struct property *newprop) return 0; } +/* update the node status property to be "enabled" or "disabled" */ +static int of_node_status_update(struct device_node *np, bool enable) +{ + struct property *oldprop; + struct property *newprop; + int ret; + + if (of_device_is_available(np) == enable) + return 0; + + oldprop = of_find_property(np, "status", NULL); + + if (enable) { + /* for disabled node, there must be a status property with "disabled" state */ + ret = of_remove_property(np, oldprop); + } else { + newprop = kzalloc(sizeof(*newprop), GFP_KERNEL); + if (!newprop) + return -ENOMEM; + + newprop->name = kstrdup("status", GFP_KERNEL); + newprop->value = kstrdup("disabled", GFP_KERNEL); + newprop->length = 9; + if (!newprop->name || !newprop->value) { + kfree(newprop->name); + kfree(newprop->value); + kfree(newprop); + return -ENOMEM; + } + + ret = of_update_property(np, newprop); + } + + pr_debug("%s: %s --> %s %s\n", np->full_name, enable ? + "disabled" : "enabled", enable ? "enabled" : "disabled", + ret ? "failed" : "okay"); + + return ret; +} + +int of_node_status_disable(struct device_node *np) +{ + return of_node_status_update(np, 0); +} + +int of_node_status_enable(struct device_node *np) +{ + return of_node_status_update(np, 1); +} + +int of_node_status_disable_by_path(const char *path) +{ + struct device_node *np; + + pr_debug("disable node: %s\n", path); + np = of_find_node_by_path(path); + if (!np) + return -ENODEV; + + return of_node_status_update(np, 0); +} + +int of_node_status_enable_by_path(const char *path) +{ + struct device_node *np; + + pr_debug("enable node: %s\n", path); + np = of_find_node_by_path(path); + if (!np) + return -ENODEV; + + return of_node_status_update(np, 1); +} + #if defined(CONFIG_OF_DYNAMIC) /* * Support for dynamic device trees. diff --git a/include/linux/of.h b/include/linux/of.h index 1fd08ca..61b35fe 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -292,6 +292,11 @@ extern int of_add_property(struct device_node *np, struct property *prop); extern int of_remove_property(struct device_node *np, struct property *prop); extern int of_update_property(struct device_node *np, struct property *newprop); +extern int of_node_status_disable(struct device_node *np); +extern int of_node_status_enable(struct device_node *np); +extern int of_node_status_disable_by_path(const char *path); +extern int of_node_status_enable_by_path(const char *path); + /* For updating the device tree at runtime */ #define OF_RECONFIG_ATTACH_NODE 0x0001 #define OF_RECONFIG_DETACH_NODE 0x0002