diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 11:49:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 11:49:13 +0100 |
| commit | 0fa85119cd480c1ded7a81ed64f723fe16a15355 (patch) | |
| tree | 8648434601c5112a1d9ab091ab11507fe88e0962 /arch/arm/boot/dts/at91-kizbox2.dts | |
| parent | d6ccc3ec95251d8d3276f2900b59cbc468dd74f4 (diff) | |
| parent | 1eab0e42450c6038e2bb17da438370fe639973f3 (diff) | |
Merge branch 'linus' into x86/cleanups
Pull in upstream changes so we can apply depending patches.
Diffstat (limited to 'arch/arm/boot/dts/at91-kizbox2.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-kizbox2.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/at91-kizbox2.dts b/arch/arm/boot/dts/at91-kizbox2.dts index f0b1563cb3f1..50a14568f094 100644 --- a/arch/arm/boot/dts/at91-kizbox2.dts +++ b/arch/arm/boot/dts/at91-kizbox2.dts @@ -171,21 +171,21 @@ label = "PB_PROG"; gpios = <&pioE 27 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioE 29 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; user { label = "PB_USER"; gpios = <&pioE 31 GPIO_ACTIVE_HIGH>; linux,code = <0x101>; - gpio-key,wakeup; + wakeup-source; }; }; |