diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-19 18:17:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-19 18:17:27 +0300 |
| commit | f9d6fa5d83325fd638e1f911ac9a109c8f2ca56d (patch) | |
| tree | 772ed66a0c1d724342a4c4393a337cbd4ae933c5 /arch/arm/boot/dts/sama5d35ek.dts | |
| parent | a203a2a9ec34936277fa22d6e07ca1f859165205 (diff) | |
| parent | 50cb2efaa63bdfd4a68b94acc55a12e68d9c33d4 (diff) | |
| download | linux-f9d6fa5d83325fd638e1f911ac9a109c8f2ca56d.tar.xz | |
Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Merge "First fixes for 4.4" from Nicolas Ferre:
- removal of a useless defconfig option
- removal of some legacy DT pieces
- use of the proper watchdog compatible string
- addition of some sama5d2 Xplained nodes now that the MFD include is in place
- update of the MAINTAINERS entries for some Atmel drivers
* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
MAINTAINERS: Atmel drivers: change NAND and ISI entries
ARM: at91/dt: sama5d2 Xplained: add several devices
ARM: at91/dt: remove bootargs
ARM: at91/dt: remove leftovers clock definition
ARM: at91/dt: replace gpio-key,wakeup with wakeup-source property
ARM: at91/dt: sama5d4: change watchdog compatible
ARM: at91/defconfig: remove CONFIG_SSB from Atmel defconfigs
Diffstat (limited to 'arch/arm/boot/dts/sama5d35ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/sama5d35ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d35ek.dts b/arch/arm/boot/dts/sama5d35ek.dts index d9a9aca1ccfd..e812f5c1bf70 100644 --- a/arch/arm/boot/dts/sama5d35ek.dts +++ b/arch/arm/boot/dts/sama5d35ek.dts @@ -49,7 +49,7 @@ label = "pb_user1"; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; }; }; |