Commit f0cc7c00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "I2C driver bugfixes for mlxbf and imx, a few documentation fixes after
  the rework this cycle, and one hardening for the i2c-mux core"

* tag 'i2c-for-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mux: harden i2c_mux_alloc() against integer overflows
  i2c: mlxbf: Fix frequency calculation
  i2c: mlxbf: prevent stack overflow in mlxbf_i2c_smbus_start_transaction()
  i2c: mlxbf: incorrect base address passed during io write
  Documentation: i2c: fix references to other documents
  MAINTAINERS: remove Nehal Shah from AMD MP2 I2C DRIVER
  i2c: imx: If pm_runtime_get_sync() returned 1 device access is possible
parents 105a36f3 b7af938f

Documentation/i2c/dev-interface.rst

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ You can do plain I2C transactions by using read(2) and write(2) calls. 
You do not need to pass the address byte; instead, set it through

ioctl I2C_SLAVE before you try to access the device.



You can do SMBus level transactions (see documentation file smbus-protocol

You can do SMBus level transactions (see documentation file smbus-protocol.rst

for details) through the following functions::



  __s32 i2c_smbus_write_quick(int file, __u8 value);

Documentation/i2c/slave-interface.rst

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ User manual 
===========



I2C slave backends behave like standard I2C clients. So, you can instantiate

them as described in the document 'instantiating-devices'. The only difference

is that i2c slave backends have their own address space. So, you have to add

0x1000 to the address you would originally request. An example for

them as described in the document instantiating-devices.rst. The only

difference is that i2c slave backends have their own address space. So, you

have to add 0x1000 to the address you would originally request. An example for

instantiating the slave-eeprom driver from userspace at the 7 bit address 0x64

on bus 1::

Documentation/i2c/writing-clients.rst

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ stop condition is issued between transaction. The i2c_msg structure 
contains for each message the client address, the number of bytes of the

message and the message data itself.



You can read the file ``i2c-protocol`` for more information about the

You can read the file i2c-protocol.rst for more information about the

actual I2C protocol.
@@ -414,7 +414,7 @@ transactions return 0 on success; the 'read' transactions return the read 
value, except for block transactions, which return the number of values

read. The block buffers need not be longer than 32 bytes.



You can read the file ``smbus-protocol`` for more information about the

You can read the file smbus-protocol.rst for more information about the

actual SMBus protocol.

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,6 @@ F: drivers/spi/spi-amd.c 








AMD MP2 I2C DRIVER









M:	Elie Morisse <syniurge@gmail.com>









M:	Nehal Shah <nehal-bakulchandra.shah@amd.com>









M:	Shyam Sundar S K <shyam-sundar.s-k@amd.com>









L:	linux-i2c@vger.kernel.org









S:	Maintained
































drivers/i2c/busses/i2c-imx.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1583,7 +1583,7 @@ static int i2c_imx_remove(struct platform_device *pdev)







	if (i2c_imx->dma)









		i2c_imx_dma_free(i2c_imx);



















	if (ret == 0) {









	if (ret >= 0) {









		/* setup chip registers to defaults */









		imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IADR);









		imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IFDR);