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 /arch/arm/mach-iop13xx | |
| 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>
Diffstat (limited to 'arch/arm/mach-iop13xx')
0 files changed, 0 insertions, 0 deletions
