diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-14 01:05:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-14 01:05:30 -0700 |
| commit | 115c93e5000b6ae6921348172e0124eb09f0a584 (patch) | |
| tree | 8b3ee47e4143522af0d6deebf5877fe23a5910a1 | |
| parent | 16145fff375011ac7e82930aeb4dfa3b23a52ebe (diff) | |
| parent | 6d3299aef7df7225ecff653feedafb5d1646998b (diff) | |
| download | blackbird-obmc-linux-115c93e5000b6ae6921348172e0124eb09f0a584.tar.gz blackbird-obmc-linux-115c93e5000b6ae6921348172e0124eb09f0a584.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7s.dtsi | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index 0c99ac04ad08..6464f2560e06 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -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>; }; }; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 4d42335c0dee..ce85b3ca1a55 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -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>; |
