diff mbox series

[v6,3/3] dt-bindings: input: Fix the keymap for LOCK key

Message ID 20210115143555.v6.3.I96134907488f41f358d03f3c1b08194f9547e670@changeid
State Not Applicable, archived
Headers show
Series [v6,1/3] dt-bindings: input: Create macros for cros-ec keymap | expand

Checks

Context Check Description
robh/checkpatch success

Commit Message

Philip Chen Jan. 15, 2021, 10:36 p.m. UTC 
Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to
KEY_SLEEP action key code.

Signed-off-by: Philip Chen <philipchen@chromium.org>
---

Changes in v6:
- New patch in v6

 include/dt-bindings/input/cros-ec-keyboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Boyd Jan. 15, 2021, 10:39 p.m. UTC | #1 
Quoting Philip Chen (2021-01-15 14:36:17)
> Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to
> KEY_SLEEP action key code.
> 
> Signed-off-by: Philip Chen <philipchen@chromium.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Philip Chen Feb. 4, 2021, 11:59 p.m. UTC | #2 
Hi maintainers,

Friendly ping - can we actually land patch series v6?
Or do you expect any update from me?

On Fri, Jan 15, 2021 at 2:39 PM Stephen Boyd <swboyd@chromium.org> wrote:
>
> Quoting Philip Chen (2021-01-15 14:36:17)
> > Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to
> > KEY_SLEEP action key code.
> >
> > Signed-off-by: Philip Chen <philipchen@chromium.org>
> > ---
>
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Rob Herring Feb. 5, 2021, 9:13 p.m. UTC | #3 
On Fri, 15 Jan 2021 14:36:17 -0800, Philip Chen wrote:
> Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to
> KEY_SLEEP action key code.
> 
> Signed-off-by: Philip Chen <philipchen@chromium.org>
> ---
> 
> Changes in v6:
> - New patch in v6
> 
>  include/dt-bindings/input/cros-ec-keyboard.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>
Dmitry Torokhov Feb. 23, 2021, 5:39 a.m. UTC | #4 
On Fri, Jan 15, 2021 at 02:36:17PM -0800, Philip Chen wrote:
> Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to
> KEY_SLEEP action key code.
> 
> Signed-off-by: Philip Chen <philipchen@chromium.org>

Applied, thank you.
diff mbox series

Patch

diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h
index a37a8c5701219..f0ae03634a966 100644
--- a/include/dt-bindings/input/cros-ec-keyboard.h
+++ b/include/dt-bindings/input/cros-ec-keyboard.h
@@ -19,8 +19,7 @@ 
 	MATRIX_KEY(0x01, 0x04, KEY_F7)	\
 	MATRIX_KEY(0x02, 0x09, KEY_F8)	\
 	MATRIX_KEY(0x01, 0x09, KEY_F9)	\
-	MATRIX_KEY(0x00, 0x04, KEY_F10)	\
-	MATRIX_KEY(0x03, 0x09, KEY_F13)
+	MATRIX_KEY(0x00, 0x04, KEY_F10)
 
 #define CROS_STD_MAIN_KEYMAP	\
 	MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA)	\
@@ -50,6 +49,7 @@ 
 	MATRIX_KEY(0x03, 0x03, KEY_5)		\
 	MATRIX_KEY(0x03, 0x06, KEY_6)		\
 	MATRIX_KEY(0x03, 0x08, KEY_MINUS)	\
+	MATRIX_KEY(0x03, 0x09, KEY_SLEEP)	\
 	MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)	\
 	MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)	\
 						\