From patchwork Wed Jun 20 12:56:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9497 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6E1A323E1B for ; Wed, 20 Jun 2012 12:57:19 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3D8D9A182F0 for ; Wed, 20 Jun 2012 12:57:19 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so6026493ghb.11 for ; Wed, 20 Jun 2012 05:57:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Ju/JXOotqlQOyK/iWMaqKu/J2q5/VDaCMoNj9ZSUSDY=; b=LWSZMLLaps6+jnTVL/5sW/EqXzBX+8aJo/7WzeMZOQ2BaytbBWrKrc5F/B//u0lWXz 4EwYtNQGjV9GKjnGj1+/8D7s8ARMaRKCMkz6zv28kGPacCP9ST0finhW9u7ELf240KAC Wp5v9boda1UDaoXs3lywlbXhG6kQ1gd65cw/1UjzEZ87fLdcU2dTXDE+TAfji7T0Bv7+ G5m3owm/6VdGjXQV4FSUctIP5+57aEkZEZJo1Sqz1qNWQYf0mNHzFJkTlGKU6jEjqqCx wgo6xA4g1wjn9FRi2AorwSZiU3DwOHOvI7EOuPEjeuXFGCFj0meno3EVorc9nZjfMFoS UO7g== Received: by 10.50.40.193 with SMTP id z1mr4445352igk.0.1340197038843; Wed, 20 Jun 2012 05:57:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp178549ibb; Wed, 20 Jun 2012 05:57:17 -0700 (PDT) Received: by 10.180.24.193 with SMTP id w1mr11942326wif.5.1340197037168; Wed, 20 Jun 2012 05:57:17 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id n13si28848410wee.108.2012.06.20.05.57.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:17 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id f13so5152523wer.37 for ; Wed, 20 Jun 2012 05:57:16 -0700 (PDT) Received: by 10.180.98.201 with SMTP id ek9mr11932317wib.7.1340197036644; Wed, 20 Jun 2012 05:57:16 -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 gc6sm38878374wib.0.2012.06.20.05.57.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:16 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: linus.walleij@stericsson.com, arnd@arndb.de, grant.likely@secretlab.ca, linux@arm.linux.org.uk, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 10/15] pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes Date: Wed, 20 Jun 2012 13:56:46 +0100 Message-Id: <1340197011-5435-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> References: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnbbdEDtY0WJPOmjIU+W/SNN2xDDjmbrEU2zOJd+ySDqEzcMY8qa7pavKtzKE14f+g8tkDn 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 e297499..8ca100d 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)) {