From patchwork Thu Jul 5 13:06:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1160801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3B7F33FE4F for ; Thu, 5 Jul 2012 13:42:34 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmmFO-0007VC-CP; Thu, 05 Jul 2012 13:37:33 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmllX-0008G3-GH for linux-arm-kernel@lists.infradead.org; Thu, 05 Jul 2012 13:06:48 +0000 Received: by werb13 with SMTP id b13so3369364wer.36 for ; Thu, 05 Jul 2012 06:06:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gS7tWnVGPFMAnFA+h499hOXEvHr6xHfuXrqWUVeFaQc=; b=l7cMShdzoFUD63BVgB05UKg5dqbpjMIpDhaZxDEQvj3d8AiokBixyT/yUODZQuWO5R ccuHYfNI/wgwbmzaAZZfcMGHZwwNDIwS9914l1F5yKUinv1RLDa6wl1N+Ld6tFLs2AOO M1GutXdGbcf5mv/cVTRoSg535G+qY20H3J9ej8YKv+ox7w1y3vVcBw8klfV/bvqNtztJ VWVoYugpw/XPP7JhVT1zX+g037lmIUcwTYD54bUh+pM/5mR7aneULgO2rMk/hny1lroT vA0eIcMaaae9E4OAXSQ59fE09Hsad0ZJ/DPdQ6TmpeCe/KpoUA92p15NgHjJ5eHQ8NSi k7Cw== Received: by 10.216.80.22 with SMTP id j22mr1299702wee.198.1341493597951; Thu, 05 Jul 2012 06:06:37 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id k8sm76767305wia.6.2012.07.05.06.06.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:37 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes Date: Thu, 5 Jul 2012 14:06:05 +0100 Message-Id: <1341493572-29735-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlYjdTQZ4SwqSB8r1f9rAyIIUIOy4fwuxxdpzG9/659Tukkx2VGTLbLWcrEEIerzOCg+x8Q X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Any non-standard property should contain the vendor's identifier which should be perpended onto the property name followed by a comma. This aids in name-space collision prevention. This patch ensures the sleepmode property adheres to the rules. Signed-off-by: Lee Jones --- .../devicetree/bindings/gpio/gpio-nmk.txt | 2 +- drivers/pinctrl/pinctrl-nomadik.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt index ee87467..8315ac7 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt @@ -26,6 +26,6 @@ Example: #gpio-cells = <2>; gpio-controller; interrupt-controller; - supports-sleepmode; + st,supports-sleepmode; gpio-bank = <1>; }; diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index af0389f..520aa23 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -1198,7 +1198,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) if (!pdata) return -ENOMEM; - if (of_get_property(np, "supports-sleepmode", NULL)) + if (of_get_property(np, "st,supports-sleepmode", NULL)) pdata->supports_sleepmode = true; if (of_property_read_u32(np, "gpio-bank", &dev->id)) {