diff mbox

ARM: dts: cros-ec-keyboard: Add LOCK key to keyboard matrix

Message ID 1454121504-12683-1-git-send-email-djkurtz@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Kurtz Jan. 30, 2016, 2:38 a.m. UTC
From: James Chao <james_chao@asus.com>

The LOCK key is at KSO9/KSI3 for Chromebook Flip and other devices
that use the Chrome OS EC keyboard matrix.

Signed-off-by: James Chao <james_chao@asus.com>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: YH Huang <yh.huang@mediatek.com>
---
 arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
 1 file changed, 1 insertion(+)

Comments

Heiko Stuebner Feb. 1, 2016, 5:16 p.m. UTC | #1
Hi Daniel,

Am Samstag, 30. Januar 2016, 10:38:24 schrieb Daniel Kurtz:
> From: James Chao <james_chao@asus.com>
> 
> The LOCK key is at KSO9/KSI3 for Chromebook Flip and other devices
> that use the Chrome OS EC keyboard matrix.
> 
> Signed-off-by: James Chao <james_chao@asus.com>
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: YH Huang <yh.huang@mediatek.com>

that should probably be a 
	Reviewed-by: YH Huang <yh.huang@mediatek.com>
As I don't see any actual patch handling step by him/her.

Also, you might've included Olof as the keeper of all things ChromeOS when 
sending.

@Olof: this seems to be pretty Veyron-specific for the moment, so I'm inclined 
to pick that up. Please holler if you disagree and want to pick it up yourself 
;-)


Thanks
Heiko

> ---
>  arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> b/arch/arm/boot/dts/cros-ec-keyboard.dtsi index 4e42f30c..c045105 100644
> --- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> +++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> @@ -55,6 +55,7 @@
>  			MATRIX_KEY(0x03, 0x04, KEY_F5)
>  			MATRIX_KEY(0x03, 0x06, KEY_6)
>  			MATRIX_KEY(0x03, 0x08, KEY_MINUS)
> +			MATRIX_KEY(0x03, 0x09, KEY_F13)
>  			MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
>  			MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)
Doug Anderson Feb. 1, 2016, 5:19 p.m. UTC | #2
Dan,

On Fri, Jan 29, 2016 at 6:38 PM, Daniel Kurtz <djkurtz@chromium.org> wrote:
> From: James Chao <james_chao@asus.com>
>
> The LOCK key is at KSO9/KSI3 for Chromebook Flip and other devices
> that use the Chrome OS EC keyboard matrix.
>
> Signed-off-by: James Chao <james_chao@asus.com>
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: YH Huang <yh.huang@mediatek.com>
> ---
>  arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
>  1 file changed, 1 insertion(+)

Feel free to add:

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Olof Johansson Feb. 2, 2016, 12:52 a.m. UTC | #3
On Mon, Feb 1, 2016 at 9:16 AM, Heiko Stübner <heiko@sntech.de> wrote:
> Hi Daniel,
>
> Am Samstag, 30. Januar 2016, 10:38:24 schrieb Daniel Kurtz:
>> From: James Chao <james_chao@asus.com>
>>
>> The LOCK key is at KSO9/KSI3 for Chromebook Flip and other devices
>> that use the Chrome OS EC keyboard matrix.
>>
>> Signed-off-by: James Chao <james_chao@asus.com>
>> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
>> Signed-off-by: YH Huang <yh.huang@mediatek.com>
>
> that should probably be a
>         Reviewed-by: YH Huang <yh.huang@mediatek.com>
> As I don't see any actual patch handling step by him/her.
>
> Also, you might've included Olof as the keeper of all things ChromeOS when
> sending.
>
> @Olof: this seems to be pretty Veyron-specific for the moment, so I'm inclined
> to pick that up. Please holler if you disagree and want to pick it up yourself
> ;-)

Go ahead, we can take it as a fix for 4.5 at this time if you want.


-Olof
Heiko Stuebner Feb. 11, 2016, 12:53 p.m. UTC | #4
Am Samstag, 30. Januar 2016, 10:38:24 schrieb Daniel Kurtz:
> From: James Chao <james_chao@asus.com>
> 
> The LOCK key is at KSO9/KSI3 for Chromebook Flip and other devices
> that use the Chrome OS EC keyboard matrix.
> 
> Signed-off-by: James Chao <james_chao@asus.com>
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: YH Huang <yh.huang@mediatek.com>

applied to my dts32 branch for 4.6
diff mbox

Patch

diff --git a/arch/arm/boot/dts/cros-ec-keyboard.dtsi b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
index 4e42f30c..c045105 100644
--- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
+++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
@@ -55,6 +55,7 @@ 
 			MATRIX_KEY(0x03, 0x04, KEY_F5)
 			MATRIX_KEY(0x03, 0x06, KEY_6)
 			MATRIX_KEY(0x03, 0x08, KEY_MINUS)
+			MATRIX_KEY(0x03, 0x09, KEY_F13)
 			MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
 			MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)