Commit 115c93e5 authored May 14, 2018 by Olof Johansson

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

Merge tag 'imx-fixes-4.17' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>

parents 16145fff 6d3299ae

arch/arm/boot/dts/imx51-zii-rdu1.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -523,7 +523,7 @@
		};

		touchscreen@20 {
		compatible = "syna,rmi4_i2c";
		compatible = "syna,rmi4-i2c";
		reg = <0x20>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ts>;
		@@ -541,8 +541,8 @@

		rmi4-f11@11 {
		reg = <0x11>;
		touch-inverted-y;
		touch-swapped-x-y;
		touchscreen-inverted-y;
		touchscreen-swapped-x-y;
		syna,sensor-type = <1>;
		};
		};

arch/arm/boot/dts/imx7s.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -868,6 +868,7 @@

		crypto: caam@30900000 {
		compatible = "fsl,sec-v4.0";
		fsl,sec-era = <8>;
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x30900000 0x40000>;