Merge tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Jan 2019 10:12:02 +0000 (11:12 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Jan 2019 10:12:16 +0000 (11:12 +0100)
commit69835820f1f35f1b87ba17ae1c9ec9a99040b54d
tree0e8e6ce9f37f6c2ee40877604d8ddfd72c56b517
parentf17b5f06cb92ef2250513a1e154c47b78df07d40
parentba0f4560526ba19300c07ed5a3c1df7592815dc6
Merge tag 'imx-fixes-5.0' of git://git./linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.0:
 - Fix spi_bus_bridge DTC warning by correcting '#address-cells' of
   dspi3 node on vf610-bk4 board, as it's being used a SPI slave
   controller there.
 - Replace deprecated gpio-key,wakeup property with wakeup-source for
   board imx6q-pistachio and imx6sll-evk, into which the deprecated
   property sneaked during the merge window.
 - Correct the backward compatible for i.MX6SX GPT device, as it's
   actually compatible with i.MX6DL GPT rather than i.MX31 one.

* tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6sx: correct backward compatible of gpt
  ARM: dts: imx: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: vf610-bk4: fix incorrect #address-cells for dspi3

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