Message ID | 20120805203610.540496769@rtp-net.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sun, Aug 05, 2012 at 10:35:56PM +0200, Arnaud Patard wrote: > While converting, a led has been missed leading to wrong power blue led > definition. Add it back and fix the gpio used on the power blue led. Acked-by: Andrew Lunn <andrew@lunn.ch> Jason, please channel this towards t3.6-rc2 Andrew > > Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> > Index: alunn/arch/arm/boot/dts/kirkwood-iconnect.dts > =================================================================== > --- alunn.orig/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-20 09:14:45.000000000 +0200 > +++ alunn/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-25 23:46:51.039862074 +0200 > @@ -41,9 +41,13 @@ > }; > power-blue { > label = "power:blue"; > - gpios = <&gpio1 11 0>; > + gpios = <&gpio1 10 0>; > linux,default-trigger = "timer"; > }; > + power-red { > + label = "power:red"; > + gpios = <&gpio1 11 0>; > + }; > usb1 { > label = "usb1:blue"; > gpios = <&gpio1 12 0>; > >
On Sun, Aug 05, 2012 at 10:35:56PM +0200, Arnaud Patard wrote: > While converting, a led has been missed leading to wrong power blue led > definition. Add it back and fix the gpio used on the power blue led. > > Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> added Acked-By: from Andrew Lunn and applied to: git://git.infradead.org/users/jcooper/linux.git fixes-for-v3.6 thx, Jason.
Index: alunn/arch/arm/boot/dts/kirkwood-iconnect.dts =================================================================== --- alunn.orig/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-20 09:14:45.000000000 +0200 +++ alunn/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-25 23:46:51.039862074 +0200 @@ -41,9 +41,13 @@ }; power-blue { label = "power:blue"; - gpios = <&gpio1 11 0>; + gpios = <&gpio1 10 0>; linux,default-trigger = "timer"; }; + power-red { + label = "power:red"; + gpios = <&gpio1 11 0>; + }; usb1 { label = "usb1:blue"; gpios = <&gpio1 12 0>;
While converting, a led has been missed leading to wrong power blue led definition. Add it back and fix the gpio used on the power blue led. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>