From: Arnd Bergmann Date: Wed, 30 Jan 2019 10:12:02 +0000 (+0100) Subject: Merge tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5355^2~13 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=69835820f1f35f1b87ba17ae1c9ec9a99040b54d;p=linux.git 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 --- 69835820f1f35f1b87ba17ae1c9ec9a99040b54d