linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: kirkwood: fix buttons on lsxl boards
@ 2012-09-27 21:54 Michael Walle
  2012-10-16 17:21 ` Michael Walle
  2012-10-18 18:38 ` Jason Cooper
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Walle @ 2012-09-27 21:54 UTC (permalink / raw)
  To: linux-arm-kernel

Change event type to switch for the power and autopower switches.
Additionally, this patch aligns the keycodes with the other linkstation
boards already supported by linux.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm/boot/dts/kirkwood-lsxl.dtsi |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index a1dd36d..8fea375 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -48,17 +48,19 @@
 		#size-cells = <0>;
 		button at 1 {
 			label = "Function Button";
-			linux,code = <132>;
+			linux,code = <357>;
 			gpios = <&gpio1 9 1>;
 		};
 		button at 2 {
 			label = "Power-on Switch";
-			linux,code = <116>;
+			linux,code = <0>;
+			linux,input-type = <5>;
 			gpios = <&gpio1 10 1>;
 		};
 		button at 3 {
 			label = "Power-auto Switch";
-			linux,code = <142>;
+			linux,code = <1>;
+			linux,input-type = <5>;
 			gpios = <&gpio1 11 1>;
 		};
 	};
-- 
1.7.2.5

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

* [PATCH] ARM: kirkwood: fix buttons on lsxl boards
  2012-09-27 21:54 [PATCH] ARM: kirkwood: fix buttons on lsxl boards Michael Walle
@ 2012-10-16 17:21 ` Michael Walle
  2012-10-16 18:15   ` Jason Cooper
  2012-10-18 18:38 ` Jason Cooper
  1 sibling, 1 reply; 4+ messages in thread
From: Michael Walle @ 2012-10-16 17:21 UTC (permalink / raw)
  To: linux-arm-kernel


Hi Andrew,

Can you pick this patch?


Am Donnerstag 27 September 2012, 23:54:37 schrieb Michael Walle:
> Change event type to switch for the power and autopower switches.
> Additionally, this patch aligns the keycodes with the other linkstation
> boards already supported by linux.
> 
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index a1dd36d..8fea375 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -48,17 +48,19 @@
>  		#size-cells = <0>;
>  		button at 1 {
>  			label = "Function Button";
> -			linux,code = <132>;
> +			linux,code = <357>;
>  			gpios = <&gpio1 9 1>;
>  		};
>  		button at 2 {
>  			label = "Power-on Switch";
> -			linux,code = <116>;
> +			linux,code = <0>;
> +			linux,input-type = <5>;
>  			gpios = <&gpio1 10 1>;
>  		};
>  		button at 3 {
>  			label = "Power-auto Switch";
> -			linux,code = <142>;
> +			linux,code = <1>;
> +			linux,input-type = <5>;
>  			gpios = <&gpio1 11 1>;
>  		};
>  	};


-- 
Michael

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

* [PATCH] ARM: kirkwood: fix buttons on lsxl boards
  2012-10-16 17:21 ` Michael Walle
@ 2012-10-16 18:15   ` Jason Cooper
  0 siblings, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2012-10-16 18:15 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 16, 2012 at 07:21:27PM +0200, Michael Walle wrote:
> 
> Hi Andrew,
> 
> Can you pick this patch?

Michael,

Already in my queue.

thx,

Jason.

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

* [PATCH] ARM: kirkwood: fix buttons on lsxl boards
  2012-09-27 21:54 [PATCH] ARM: kirkwood: fix buttons on lsxl boards Michael Walle
  2012-10-16 17:21 ` Michael Walle
@ 2012-10-18 18:38 ` Jason Cooper
  1 sibling, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2012-10-18 18:38 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Sep 27, 2012 at 11:54:37PM +0200, Michael Walle wrote:
> Change event type to switch for the power and autopower switches.
> Additionally, this patch aligns the keycodes with the other linkstation
> boards already supported by linux.
> 
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)

Applied to:

git://git.infradead.org/users/jcooper/linux.git kirkwood/fixes

thx,

Jason.

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

end of thread, other threads:[~2012-10-18 18:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 21:54 [PATCH] ARM: kirkwood: fix buttons on lsxl boards Michael Walle
2012-10-16 17:21 ` Michael Walle
2012-10-16 18:15   ` Jason Cooper
2012-10-18 18:38 ` Jason Cooper

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).