diff mbox

Input: atmel_mxt_ts - fix merge in DT documentation

Message ID 5411B73E.4040404@itdev.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Nick Dyer Sept. 11, 2014, 2:52 p.m. UTC 
On 15/08/14 17:13, Stephen Warren wrote:
>>> Any comments on this? I would really appreciate if you can expand on how
>>> this DT property is supposed to be used so I can re-spin the atmel support
>>> patch for Peach boards.
>>
>> The below patch improves the documentation for the gpio-property.
> 
> That patch makes sense, and is a nice description,
> Acked-by: Stephen Warren <swarren@nvidia.com>

Hi Dmitry-

Something went a bit wrong in merging f5940231a - there's a bit of repeated
text that's been introduced.

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
---
 Documentation/devicetree/bindings/input/atmel,maxtouch.txt | 4 ----
 1 file changed, 4 deletions(-)

Comments

Dmitry Torokhov Sept. 11, 2014, 5:32 p.m. UTC | #1 
On Thu, Sep 11, 2014 at 03:52:46PM +0100, Nick Dyer wrote:
> On 15/08/14 17:13, Stephen Warren wrote:
> >>> Any comments on this? I would really appreciate if you can expand on how
> >>> this DT property is supposed to be used so I can re-spin the atmel support
> >>> patch for Peach boards.
> >>
> >> The below patch improves the documentation for the gpio-property.
> > 
> > That patch makes sense, and is a nice description,
> > Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> Hi Dmitry-
> 
> Something went a bit wrong in merging f5940231a - there's a bit of repeated
> text that's been introduced.
> 
> Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>

Hmm, not sure how I messed this up, but I will queue the patch for the
next push.

Thanks.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 0ac23f2..1852906 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -11,10 +11,6 @@  Required properties:

 Optional properties for main touchpad device:

-- linux,gpio-keymap: An array of up to 4 entries indicating the Linux
-    keycode generated by each GPIO. Linux keycodes are defined in
-    <dt-bindings/input/input.h>.
-
 - linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages
     on GPIO bit changes. An array of up to 8 entries can be provided
     indicating the Linux keycode mapped to each bit of the status byte,