Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57dbde63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c updates from Wolfram Sang:
 "I2C has not so much stuff this time. Mostly driver enablement for new
  SoCs, some driver bugfixes, and some cleanups"

* 'i2c/for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (35 commits)
  MAINTAINERS: add maintainer for Renesas RIIC driver
  i2c: sh_mobile: Remove dummy runtime PM callbacks
  i2c: uniphier-f: fix race condition when IRQ is cleared
  i2c: uniphier-f: fix occasional timeout error
  i2c: uniphier-f: make driver robust against concurrency
  i2c: i2c-qcom-geni: Simplify irq handler
  i2c: i2c-qcom-geni: Simplify tx/rx functions
  i2c: designware: Set IRQF_NO_SUSPEND flag for all BYT and CHT controllers
  i2c: mux: mlxcpld: simplify code to reach the adapter
  i2c: mux: ltc4306: simplify code to reach the adapter
  i2c: mux: pca954x: simplify code to reach the adapter
  i2c: core: remove level of indentation in i2c_transfer
  i2c: core: remove outdated DEBUG output
  i2c: zx2967: use core to detect 'no zero length' quirk
  i2c: tegra: use core to detect 'no zero length' quirk
  i2c: qup: use core to detect 'no zero length' quirk
  i2c: omap: use core to detect 'no zero length' quirk
  i2c: Convert to using %pOFn instead of device_node.name
  i2c: brcmstb: Allow enabling the driver on DSL SoCs
  eeprom: at24: fix unexpected timeout under high load
  ...
parents 134bf98c 84de6e96

Documentation/devicetree/bindings/i2c/i2c-designware.txt

+6 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
Required properties :



 - compatible : should be "snps,designware-i2c"

                or "mscc,ocelot-i2c" with "snps,designware-i2c" for fallback

 - reg : Offset and length of the register set for the device

 - interrupts : <IRQ> where IRQ is the interrupt number.
@@ -11,8 +12,12 @@ Recommended properties : 
 - clock-frequency : desired I2C bus clock frequency in Hz.



Optional properties :

 - reg : for "mscc,ocelot-i2c", a second register set to configure the SDA hold

   time, named ICPU_CFG:TWI_DELAY in the datasheet.



 - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.

   This option is only supported in hardware blocks version 1.11a or newer.

   This option is only supported in hardware blocks version 1.11a or newer and

   on Microsemi SoCs ("mscc,ocelot-i2c" compatible).



 - i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds.

   This value which is by default 300ns is used to compute the tLOW period.

Documentation/devicetree/bindings/i2c/i2c-rcar.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ I2C for R-Car platforms 
Required properties:

- compatible:

	"renesas,i2c-r8a7743" if the device is a part of a R8A7743 SoC.

	"renesas,i2c-r8a7744" if the device is a part of a R8A7744 SoC.

	"renesas,i2c-r8a7745" if the device is a part of a R8A7745 SoC.

	"renesas,i2c-r8a77470" if the device is a part of a R8A77470 SoC.

	"renesas,i2c-r8a774a1" if the device is a part of a R8A774A1 SoC.

	"renesas,i2c-r8a7778" if the device is a part of a R8A7778 SoC.

	"renesas,i2c-r8a7779" if the device is a part of a R8A7779 SoC.

Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
			- "renesas,iic-r8a73a4" (R-Mobile APE6)

			- "renesas,iic-r8a7740" (R-Mobile A1)

			- "renesas,iic-r8a7743" (RZ/G1M)

			- "renesas,iic-r8a7744" (RZ/G1N)

			- "renesas,iic-r8a7745" (RZ/G1E)

			- "renesas,iic-r8a774a1" (RZ/G2M)

			- "renesas,iic-r8a7790" (R-Car H2)

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -12548,6 +12548,12 @@ S: Supported 
F:	drivers/i2c/busses/i2c-rcar.c

F:	drivers/i2c/busses/i2c-sh_mobile.c



RENESAS RIIC DRIVER

M:	Chris Brandt <chris.brandt@renesas.com>

S:	Supported

F:	Documentation/devicetree/bindings/i2c/i2c-riic.txt

F:	drivers/i2c/busses/i2c-riic.c



RENESAS USB PHY DRIVER

M:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

L:	linux-renesas-soc@vger.kernel.org

drivers/i2c/busses/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -432,12 +432,13 @@ config I2C_BCM_KONA 
	  If you do not need KONA I2C interface, say N.



config I2C_BRCMSTB

	tristate "BRCM Settop I2C controller"

	depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST

	tristate "BRCM Settop/DSL I2C controller"

	depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_63XX || \

		   COMPILE_TEST

	default y

	help

	  If you say yes to this option, support will be included for the

	  I2C interface on the Broadcom Settop SoCs.

	  I2C interface on the Broadcom Settop/DSL SoCs.



	  If you do not need I2C interface, say N.