mirror of https://gitee.com/openkylin/linux.git
a410963ba4
Pull embedded i2c changes from Wolfram Sang:
"Changes for the "embedded" part of the I2C subsystem:
- lots of devicetree conversions of drivers (and preparations for
that)
- big cleanups for drivers for OMAP, Tegra, Nomadik, Blackfin
- Rafael's struct dev_pm_ops conversion patches for I2C
- usual driver cleanups and fixes
All patches have been in linux-next for an apropriate time and all
patches touching files outside of i2c-folders should have proper acks
from the maintainers."
* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (60 commits)
Revert "i2c: tegra: convert normal suspend/resume to *_noirq"
I2C: MV64XYZ: Add Device Tree support
i2c: stu300: use devm managed resources
i2c: i2c-ocores: support for 16bit and 32bit IO
V4L/DVB: mfd: use reg_shift instead of regstep
i2c: i2c-ocores: Use reg-shift property
i2c: i2c-ocores: DT bindings and minor fixes.
i2c: mv64xxxx: remove EXPERIMENTAL tag
i2c-s3c2410: Use plain pm_runtime_put()
i2c: s3c2410: Fix pointer type passed to of_match_node()
i2c: mxs: Set I2C timing registers for mxs-i2c
i2c: i2c-bfin-twi: Move blackfin TWI register access Macro to head file.
i2c: i2c-bfin-twi: Move TWI peripheral pin request array to platform data.
i2c:i2c-bfin-twi: include twi head file
i2c:i2c-bfin-twi: TWI fails to restart next transfer in high system load.
i2c: i2c-bfin-twi: Tighten condition when failing I2C transfer if MEN bit is reset unexpectedly.
i2c: i2c-bfin-twi: Break dead waiting loop if i2c device misbehaves.
i2c: i2c-bfin-twi: Improve the patch for bug "Illegal i2c bus lock upon certain transfer scenarios".
i2c: i2c-bfin-twi: Illegal i2c bus lock upon certain transfer scenarios.
i2c-mv64xxxx: allow more than one driver instance
...
Conflicts:
drivers/i2c/busses/i2c-nomadik.c
|
||
|---|---|---|
| .. | ||
| 3ds_debugboard.h | ||
| board-mx31lilly.h | ||
| board-mx31lite.h | ||
| board-mx31moboard.h | ||
| board-pcm038.h | ||
| clock.h | ||
| common.h | ||
| cpuidle.h | ||
| debug-macro.S | ||
| devices-common.h | ||
| dma.h | ||
| esdhc.h | ||
| eukrea-baseboards.h | ||
| gpio.h | ||
| hardware.h | ||
| i2c.h | ||
| iim.h | ||
| imx-uart.h | ||
| imxfb.h | ||
| iomux-mx1.h | ||
| iomux-mx2x.h | ||
| iomux-mx3.h | ||
| iomux-mx21.h | ||
| iomux-mx25.h | ||
| iomux-mx27.h | ||
| iomux-mx35.h | ||
| iomux-mx50.h | ||
| iomux-mx51.h | ||
| iomux-mx53.h | ||
| iomux-v1.h | ||
| iomux-v3.h | ||
| ipu.h | ||
| iram.h | ||
| irqs.h | ||
| mmc.h | ||
| mx1.h | ||
| mx1_camera.h | ||
| mx2_cam.h | ||
| mx2x.h | ||
| mx3_camera.h | ||
| mx3fb.h | ||
| mx3x.h | ||
| mx6q.h | ||
| mx21-usbhost.h | ||
| mx21.h | ||
| mx25.h | ||
| mx27.h | ||
| mx31.h | ||
| mx35.h | ||
| mx50.h | ||
| mx51.h | ||
| mx53.h | ||
| mxc.h | ||
| mxc_ehci.h | ||
| mxc_nand.h | ||
| sdma.h | ||
| spi.h | ||
| ssi.h | ||
| timex.h | ||
| ulpi.h | ||
| uncompress.h | ||
| usb.h | ||