| Message ID | 1348782877-857-1-git-send-email-michael@walle.cc (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@1 { > label = "Function Button"; > - linux,code = <132>; > + linux,code = <357>; > gpios = <&gpio1 9 1>; > }; > button@2 { > label = "Power-on Switch"; > - linux,code = <116>; > + linux,code = <0>; > + linux,input-type = <5>; > gpios = <&gpio1 10 1>; > }; > button@3 { > label = "Power-auto Switch"; > - linux,code = <142>; > + linux,code = <1>; > + linux,input-type = <5>; > gpios = <&gpio1 11 1>; > }; > };
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.
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.
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@1 { label = "Function Button"; - linux,code = <132>; + linux,code = <357>; gpios = <&gpio1 9 1>; }; button@2 { label = "Power-on Switch"; - linux,code = <116>; + linux,code = <0>; + linux,input-type = <5>; gpios = <&gpio1 10 1>; }; button@3 { label = "Power-auto Switch"; - linux,code = <142>; + linux,code = <1>; + linux,input-type = <5>; gpios = <&gpio1 11 1>; }; };
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(-)