From patchwork Thu Nov 22 12:24:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13071 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 B0DF823FC2 for ; Thu, 22 Nov 2012 12:24:37 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D6FAA197E3 for ; Thu, 22 Nov 2012 12:24:37 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so484570ieb.11 for ; Thu, 22 Nov 2012 04:24:36 -0800 (PST) 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:x-gm-message-state; bh=y8d2Jf1Tv26VgF3yDv+0QSIYPIJaU8BfhtNI15HPaDE=; b=ktw/Wumx2KYyrdOth8L8ImjDHK1oJeFIk6ZmD/J33Q7EdYp2ZoEHQ05l5C3qw/DsvS hOPHVyLlTbd5U+ZOZ6/21ZUfsh0exuFFv9AI6K51l8nUn4lrcS4c+k1oW7MUyP/3Z1zP h5dW3ibbBGFheud39NJxFLL5AFqf6TDfUlq8nplo8p6todNdMuN+R0DRVXx6DepBf/nN mLZCqIvxCB83GWotgu7Y8Qgxt9Olg8tKm2TNYfP7WMLfq7M309wLgi6p+KqDyfvKnYDx 6zAxUiGmdLaGLpUseRXtBfe0Zr9NT67faRxlzIH9DAakgiuP9VRP3xnY1kHPnSjEklTI aD4A== Received: by 10.50.161.169 with SMTP id xt9mr2903656igb.62.1353587076588; Thu, 22 Nov 2012 04:24:36 -0800 (PST) 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.50.67.148 with SMTP id n20csp201419igt; Thu, 22 Nov 2012 04:24:35 -0800 (PST) Received: by 10.216.193.29 with SMTP id j29mr189479wen.143.1353587075271; Thu, 22 Nov 2012 04:24:35 -0800 (PST) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by mx.google.com with ESMTPS id m63si1717575wep.63.2012.11.22.04.24.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 04:24:35 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.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-we0-f172.google.com with SMTP id r3so1807490wey.17 for ; Thu, 22 Nov 2012 04:24:34 -0800 (PST) Received: by 10.216.199.206 with SMTP id x56mr222740wen.75.1353587074590; Thu, 22 Nov 2012 04:24:34 -0800 (PST) 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 az2sm3798528wib.7.2012.11.22.04.24.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 04:24:34 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: Lee Jones , Samuel Ortiz , devicetree-discuss@lists.ozlabs.org Subject: [PATCH 1/1] Documentation: Fix historical inconsistency in STMPE DT doc Date: Thu, 22 Nov 2012 12:24:24 +0000 Message-Id: <1353587064-10541-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQmEiJo7+Dm9CVQeGxq1PqIjwvaRLtrZAkwutTFBT7i7Y5096kidAO2g+Jj+3gdlJEdQH/hg Previously a generic binding 'i2c-client-wake' was created which enabled I2C devices to register themselves as wake-up devices. This binding was later over-thrown by 'wakeup-source'. The STMPE driver was fixed-up, but the document was neglected. This patch aims to rectify that. Cc: Samuel Ortiz Cc: devicetree-discuss@lists.ozlabs.org Signed-off-by: Lee Jones --- Documentation/devicetree/bindings/mfd/stmpe.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt index 8f0aeda..c984508 100644 --- a/Documentation/devicetree/bindings/mfd/stmpe.txt +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt @@ -8,7 +8,7 @@ Optional properties: - interrupts : The interrupt outputs from the controller - interrupt-controller : Marks the device node as an interrupt controller - interrupt-parent : Specifies which IRQ controller we're connected to - - i2c-client-wake : Marks the input device as wakable + - wakeup-source : Marks the input device as wakable - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 Example: @@ -20,6 +20,6 @@ Example: interrupt-parent = <&gpio6>; interrupt-controller; - i2c-client-wake; + wakeup-source; st,autosleep-timeout = <1024>; };