Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare. Fix up trivial conflict in drivers/i2c/busses/i2c-gpio.c due to include file cleanup clashing with DT support addition (which did the same cleanup) * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-algo-bit: Don't resched on clock stretching i2c: Update the FSF address i2c: Convert drivers/i2c/muxes/* to use module_i2c_driver() i2c-i801: Use usleep_range to wait for command completion i2c-i801: Add device IDs for Intel Lynx Point i2c-isch: Decrease delay in command completion check loop i2c-gpio: Use linux/gpio.h rather than asm/gpio.h
Showing
- Documentation/i2c/busses/i2c-i801 1 addition, 0 deletionsDocumentation/i2c/busses/i2c-i801
- drivers/i2c/algos/i2c-algo-bit.c 3 additions, 2 deletionsdrivers/i2c/algos/i2c-algo-bit.c
- drivers/i2c/algos/i2c-algo-pca.c 2 additions, 1 deletiondrivers/i2c/algos/i2c-algo-pca.c
- drivers/i2c/algos/i2c-algo-pcf.c 2 additions, 1 deletiondrivers/i2c/algos/i2c-algo-pcf.c
- drivers/i2c/algos/i2c-algo-pcf.h 2 additions, 1 deletiondrivers/i2c/algos/i2c-algo-pcf.h
- drivers/i2c/busses/Kconfig 1 addition, 0 deletionsdrivers/i2c/busses/Kconfig
- drivers/i2c/busses/i2c-i801.c 15 additions, 12 deletionsdrivers/i2c/busses/i2c-i801.c
- drivers/i2c/busses/i2c-isch.c 5 additions, 5 deletionsdrivers/i2c/busses/i2c-isch.c
- drivers/i2c/i2c-boardinfo.c 2 additions, 1 deletiondrivers/i2c/i2c-boardinfo.c
- drivers/i2c/i2c-core.c 2 additions, 1 deletiondrivers/i2c/i2c-core.c
- drivers/i2c/i2c-core.h 2 additions, 1 deletiondrivers/i2c/i2c-core.h
- drivers/i2c/i2c-dev.c 2 additions, 1 deletiondrivers/i2c/i2c-dev.c
- drivers/i2c/i2c-smbus.c 2 additions, 1 deletiondrivers/i2c/i2c-smbus.c
- drivers/i2c/muxes/pca9541.c 1 addition, 12 deletionsdrivers/i2c/muxes/pca9541.c
- drivers/i2c/muxes/pca954x.c 1 addition, 12 deletionsdrivers/i2c/muxes/pca954x.c
- include/linux/i2c-algo-bit.h 2 additions, 1 deletioninclude/linux/i2c-algo-bit.h
- include/linux/i2c-algo-pcf.h 2 additions, 1 deletioninclude/linux/i2c-algo-pcf.h
- include/linux/i2c-dev.h 2 additions, 1 deletioninclude/linux/i2c-dev.h
- include/linux/i2c-mux.h 2 additions, 1 deletioninclude/linux/i2c-mux.h
- include/linux/i2c-smbus.h 2 additions, 1 deletioninclude/linux/i2c-smbus.h
Loading
Please register or sign in to comment