diff mbox series

ARM: dts: cros-ec-keyboard: Add alternate keymap for KEY_LEFTMETA

Message ID 20200925162604.2311841-1-swboyd@chromium.org (mailing list archive)
State New, archived
Headers show
Series ARM: dts: cros-ec-keyboard: Add alternate keymap for KEY_LEFTMETA | expand

Commit Message

Stephen Boyd Sept. 25, 2020, 4:26 p.m. UTC
On newer keyboards this key is in a different place. Add both options to
the keymap so that both new and old keyboards work.

Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
 1 file changed, 1 insertion(+)

Comments

Doug Anderson Sept. 25, 2020, 5:50 p.m. UTC | #1
Hi,

On Fri, Sep 25, 2020 at 9:26 AM Stephen Boyd <swboyd@chromium.org> wrote:
>
> On newer keyboards this key is in a different place. Add both options to
> the keymap so that both new and old keyboards work.
>
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
>  arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Enric Balletbo i Serra Sept. 29, 2020, 8:04 a.m. UTC | #2
Hi Stephen,

Thank you for your patch.

cc'ing Heiko and Matthias

On 25/9/20 18:26, Stephen Boyd wrote:
> On newer keyboards this key is in a different place. Add both options to
> the keymap so that both new and old keyboards work.
> 
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>

Usually the DT changes go through the Rockchip dts or Mediatek dts tree, this is
not a specific Rockchip/Mediatek change but for both. Are you fine If I pick the
patch through the chrome-platform tree? I don't think there is any conflict.

Thanks,
 Enric

> ---
>  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 4a0c1037fbc0..165c5bcd510e 100644
> --- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> +++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> @@ -46,6 +46,7 @@ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
>  			MATRIX_KEY(0x02, 0x09, KEY_F8)
>  			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
>  
> +			MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)
>  			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
>  			MATRIX_KEY(0x03, 0x02, KEY_F2)
>  			MATRIX_KEY(0x03, 0x03, KEY_5)
>
Heiko Stübner Sept. 29, 2020, 1:09 p.m. UTC | #3
Am Dienstag, 29. September 2020, 10:04:45 CEST schrieb Enric Balletbo i Serra:
> Hi Stephen,
> 
> Thank you for your patch.
> 
> cc'ing Heiko and Matthias
> 
> On 25/9/20 18:26, Stephen Boyd wrote:
> > On newer keyboards this key is in a different place. Add both options to
> > the keymap so that both new and old keyboards work.
> > 
> > Cc: Douglas Anderson <dianders@chromium.org>
> > Signed-off-by: Stephen Boyd <swboyd@chromium.org>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

> 
> Usually the DT changes go through the Rockchip dts or Mediatek dts tree, this is
> not a specific Rockchip/Mediatek change but for both. Are you fine If I pick the
> patch through the chrome-platform tree? I don't think there is any conflict.

So from me, sure go ahead with picking this patch :-)


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 4a0c1037fbc0..165c5bcd510e 100644
> > --- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> > +++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> > @@ -46,6 +46,7 @@ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
> >  			MATRIX_KEY(0x02, 0x09, KEY_F8)
> >  			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
> >  
> > +			MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)
> >  			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
> >  			MATRIX_KEY(0x03, 0x02, KEY_F2)
> >  			MATRIX_KEY(0x03, 0x03, KEY_5)
> > 
>
Matthias Brugger Sept. 30, 2020, 10:44 a.m. UTC | #4
On 29/09/2020 10:04, Enric Balletbo i Serra wrote:
> Hi Stephen,
> 
> Thank you for your patch.
> 
> cc'ing Heiko and Matthias
> 
> On 25/9/20 18:26, Stephen Boyd wrote:
>> On newer keyboards this key is in a different place. Add both options to
>> the keymap so that both new and old keyboards work.
>>
>> Cc: Douglas Anderson <dianders@chromium.org>
>> Signed-off-by: Stephen Boyd <swboyd@chromium.org>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>

> 
> Usually the DT changes go through the Rockchip dts or Mediatek dts tree, this is
> not a specific Rockchip/Mediatek change but for both. Are you fine If I pick the
> patch through the chrome-platform tree? I don't think there is any conflict.
> 

Please go ahead and take the patch through your tree.

Regards,
Matthias

> Thanks,
>   Enric
> 
>> ---
>>   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 4a0c1037fbc0..165c5bcd510e 100644
>> --- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
>> +++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
>> @@ -46,6 +46,7 @@ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
>>   			MATRIX_KEY(0x02, 0x09, KEY_F8)
>>   			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
>>   
>> +			MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)
>>   			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
>>   			MATRIX_KEY(0x03, 0x02, KEY_F2)
>>   			MATRIX_KEY(0x03, 0x03, KEY_5)
>>
Enric Balletbo i Serra Oct. 6, 2020, 2:35 p.m. UTC | #5
Hi Stephen,

On 25/9/20 18:26, Stephen Boyd wrote:
> On newer keyboards this key is in a different place. Add both options to
> the keymap so that both new and old keyboards work.
> 
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---

Queued for 5.10.

Thanks,
 Enric

>  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 4a0c1037fbc0..165c5bcd510e 100644
> --- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> +++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
> @@ -46,6 +46,7 @@ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
>  			MATRIX_KEY(0x02, 0x09, KEY_F8)
>  			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
>  
> +			MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)
>  			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
>  			MATRIX_KEY(0x03, 0x02, KEY_F2)
>  			MATRIX_KEY(0x03, 0x03, KEY_5)
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/cros-ec-keyboard.dtsi b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
index 4a0c1037fbc0..165c5bcd510e 100644
--- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
+++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
@@ -46,6 +46,7 @@  MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
 			MATRIX_KEY(0x02, 0x09, KEY_F8)
 			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
 
+			MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)
 			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
 			MATRIX_KEY(0x03, 0x02, KEY_F2)
 			MATRIX_KEY(0x03, 0x03, KEY_5)