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
|
||
|---|---|---|
| .. | ||
| ad7266.h | ||
| at91_adc.h | ||
| atmel-aes.h | ||
| atmel.h | ||
| clk-integrator.h | ||
| clk-nomadik.h | ||
| clk-u300.h | ||
| cpsw.h | ||
| dwc3-exynos.h | ||
| dwc3-omap.h | ||
| efm32-uart.h | ||
| ehci-sh.h | ||
| emif_plat.h | ||
| exynos4_tmu.h | ||
| fsa9480.h | ||
| gpio-em.h | ||
| i2c-nomadik.h | ||
| ina2xx.h | ||
| leds-lm3556.h | ||
| leds-renesas-tpu.h | ||
| macb.h | ||
| mmp_audio.h | ||
| msm_serial_hs.h | ||
| mv_usb.h | ||
| ntc_thermistor.h | ||
| omap4-keypad.h | ||
| omap_drm.h | ||
| omap-abe-twl6040.h | ||
| pxa_sdhci.h | ||
| s3c-hsotg.h | ||
| s3c-hsudc.h | ||
| tegra_emc.h | ||
| tegra_usb.h | ||
| uio_pruss.h | ||
| wiznet.h | ||