linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] Documentation: Fix historical inconsistency in STMPE DT doc
@ 2012-11-22 12:24 Lee Jones
  2012-11-23 11:19 ` Samuel Ortiz
  0 siblings, 1 reply; 2+ messages in thread
From: Lee Jones @ 2012-11-22 12:24 UTC (permalink / raw)
  To: linux-kernel; +Cc: Lee Jones, Samuel Ortiz, devicetree-discuss

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 <sameo@linux.intel.com>
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 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>;
 	};
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] Documentation: Fix historical inconsistency in STMPE DT doc
  2012-11-22 12:24 [PATCH 1/1] Documentation: Fix historical inconsistency in STMPE DT doc Lee Jones
@ 2012-11-23 11:19 ` Samuel Ortiz
  0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2012-11-23 11:19 UTC (permalink / raw)
  To: Lee Jones; +Cc: linux-kernel, devicetree-discuss

Hi Lee,

On Thu, Nov 22, 2012 at 12:24:24PM +0000, Lee Jones wrote:
> 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 <sameo@linux.intel.com>
> Cc: devicetree-discuss@lists.ozlabs.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  Documentation/devicetree/bindings/mfd/stmpe.txt |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-23 11:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-22 12:24 [PATCH 1/1] Documentation: Fix historical inconsistency in STMPE DT doc Lee Jones
2012-11-23 11:19 ` Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).