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: 9844 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 612B523E16 for ; Thu, 5 Jul 2012 13:06:40 +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 2FED4A18436 for ; Thu, 5 Jul 2012 13:06:40 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so7960629ghb.11 for ; Thu, 05 Jul 2012 06:06:40 -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=gS7tWnVGPFMAnFA+h499hOXEvHr6xHfuXrqWUVeFaQc=; b=m88S33MOMlbrON9OKRJjrCwv5CpgKye6zCTFlhBwQwLf0bbrh8KnumWoxD0IGT8cVK YUrS1q/+t4G21s7KregZuTguUml3C9rvKawYRv0m6vOS6hloT4qSpwVnq8uIwv9MblZC OrGjxdyqFe4zP+Fp2BwMdz9zSSmVI1aGSzuf58Vo95xfQDbZQsRuSnu1SYieOVn2ZVoM DAJJsYhHrF2ECUD1ZyPm1/2mmnkDNzTEnT4r5FdMrh/bCBetmLjGee/xG0v8EW/LJ0f+ JJg+wizWM5xX3+yxoK3cWwPKQ7ZSjxhhOoxMIxQG5yWOG9XsxwcBI3KOmROOLxLF6lp7 gSUg== Received: by 10.50.163.99 with SMTP id yh3mr13865285igb.53.1341493599788; Thu, 05 Jul 2012 06:06:39 -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 v20csp65210ibb; Thu, 5 Jul 2012 06:06:39 -0700 (PDT) Received: by 10.216.132.130 with SMTP id o2mr8790081wei.129.1341493598532; Thu, 05 Jul 2012 06:06:38 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id u49si23657593weh.73.2012.07.05.06.06.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 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-wi0-f172.google.com with SMTP id hm11so5144758wib.13 for ; Thu, 05 Jul 2012 06:06:38 -0700 (PDT) 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 Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones 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: ALoCoQl2TuN2hzNNBtzWFgggMhfgTtRU3lTC6Fz9Kw3HSKulCPATjUU9xuBneSB/hj01qSvHRbGz 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)) {