Merge tag 'at91-5.1-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 15:13:31 +0000 (16:13 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 15:14:00 +0000 (16:14 +0100)
commit75ed0b2d2d961171f764a3902fa78a8147c4b7d7
tree34b2e63f8c4a27db6531236593fc4707f4f47ff5
parente1a38b75042852abaa642eb2d7f2345c5904a548
parent31f031f73a01fb83fd6f4abfff04a79b360219e1
Merge tag 'at91-5.1-dt' of git://git./linux/kernel/git/at91/linux into arm/dt

AT91 DT for 5.1

 - Enable QSPI NOR on sama5d2 SoM1
 - replace deprecated gpio-key,wakeup property

* tag 'at91-5.1-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: at91: at91-sama5d27_som1_ek: enable qspi1 memory
  ARM: dts: at91: at91-sama5d27_som1: add QSPI1 + SPI NOR memory nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>