diff options
author | Olof Johansson <olof@lixom.net> | 2017-12-03 02:01:40 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-12-03 02:01:40 +0100 |
commit | 8d810a4029c6f0d9b19da3d96e1c29ed5930656a (patch) | |
tree | 57fab51ab4298ab78060610bb975f1d5731ba17a /arch/um | |
parent | Merge tag 'uniphier-fixes-v4.15' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Revert "ARM: dts: imx53: add srtc node" (diff) | |
download | linux-8d810a4029c6f0d9b19da3d96e1c29ed5930656a.tar.xz linux-8d810a4029c6f0d9b19da3d96e1c29ed5930656a.zip |
Merge tag 'imx-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.15:
- A fix for vf610-zii-dev-rev-c board which correct the unit-address
of I2C EEPROM node to match the 'reg' property.
- We thought the RTC block on i.MX53 is compatible with the one found
on i.MX25, and added the device for i.MX53 device tree. But it turns
out that's not the case, and we have to revert the change.
* tag 'imx-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
Revert "ARM: dts: imx53: add srtc node"
ARM: dts: vf610-zii-dev-rev-c: Fix the I2C EEPROM address
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions