diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:17:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:17:46 +0100 |
| commit | ad040d8df6eb3a6d4b85ef69448d370d0065843c (patch) | |
| tree | f9cb9ad413958c288d5efebf7ecf5bc4d5c4c520 /Documentation/i2c/fault-codes | |
| parent | fcf14b8889d5da38bac9b1fb9718f98706d90e59 (diff) | |
| parent | 116dad7d4339d0965169df8a864fc829f684794d (diff) | |
Merge tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "i.MX fixes for 4.10" from Shawn Guo:
- A format fix for vf610-zii-dev-rev-b.dts, which has a very odd line
due to misses a newline.
- A fix to imx-weim bus error seen on board which doesn't actually use
the bus.
- A fix for imx6qdl-nitrogen6x board which has conflicting usage of
pad NANDF_CS2.
- A cleanup on i.MX1 machine to remove .map_io callback, which also
fixes a compiling error for NOMMU build.
- Fix AVIC base address in i.MX31 device tree source. The problem was
shadowed by the AVIC driver, which takes the correct base address
from a SoC specific header file.
* tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6: Disable "weim" node in the dtsi files
ARM: i.MX: remove map_io callback
ARM: dts: vf610-zii-dev-rev-b: Add missing newline
ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
ARM: dts: imx31: fix AVIC base address
Diffstat (limited to 'Documentation/i2c/fault-codes')
0 files changed, 0 insertions, 0 deletions