On Wed, Aug 05, 2015 at 09:57:55PM +0800, Anson Huang wrote: > Commit(def56bb input: snvs_pwrkey: use "wakeup-source" > as deivce tree property name) replaces the property name > of "wakeup" with "wakeup-source", update this change > in i.MX6SX dtsi accordingly. > > Signed-off-by: Anson Huang <b20788@xxxxxxxxxxxxx> For arch/arm/ patches, please remember to copy linux-arm-kernel. Applied, thanks. > --- > arch/arm/boot/dts/imx6sx.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi > index e391d63..dc7eaae 100644 > --- a/arch/arm/boot/dts/imx6sx.dtsi > +++ b/arch/arm/boot/dts/imx6sx.dtsi > @@ -686,7 +686,7 @@ > regmap = <&snvs>; > interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; > linux,keycode = <KEY_POWER>; > - wakeup; > + wakeup-source; > }; > }; > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
