Skip to content
Commit 69835820 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.0' of...

Merge tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/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: default avatarArnd Bergmann <arnd@arndb.de>
parents f17b5f06 ba0f4560
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment