From: Olof Johansson Date: Mon, 14 May 2018 08:05:30 +0000 (-0700) Subject: Merge tag 'imx-fixes-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=115c93e5000b6ae6921348172e0124eb09f0a584;p=linux.git Merge tag 'imx-fixes-4.17' of git://git./linux/kernel/git/shawnguo/linux into fixes i.MX fixes for 4.17: - Add missing 'fsl,sec-era' property for i.MX7S device tree CAAM node, as the era information is used in various places inside CAAM driver. - There are a few errors in imx51-zii-rdu1 device tree touchscreen node. Fix them to get touchscreen actually work. * tag 'imx-fixes-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx51-zii-rdu1: fix touchscreen bindings ARM: dts: imx7s: Pass the 'fsl,sec-era' property Signed-off-by: Olof Johansson --- 115c93e5000b6ae6921348172e0124eb09f0a584