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

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

Pull i2c updates from Wolfram Sang:

 - bus recovery can now be given a pinctrl handle and the I2C core will
   do all the steps to switch to/from GPIO which can save quite some
   boilerplate code from drivers

 - "fallthrough" conversion

 - driver updates, mostly ID additions

* 'i2c/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (32 commits)
  i2c: iproc: fix race between client unreg and isr
  i2c: eg20t: use generic power management
  i2c: eg20t: Drop PCI wakeup calls from .suspend/.resume
  i2c: mediatek: Fix i2c_spec_values description
  i2c: mediatek: Add i2c compatible for MediaTek MT8192
  dt-bindings: i2c: update bindings for MT8192 SoC
  i2c: mediatek: Add access to more than 8GB dram in i2c driver
  i2c: mediatek: Add apdma sync in i2c driver
  i2c: i801: Add support for Intel Tiger Lake PCH-H
  i2c: i801: Add support for Intel Emmitsburg PCH
  i2c: bcm2835: Replace HTTP links with HTTPS ones
  Documentation: i2c: dev: 'block process call' is supported
  i2c: at91: Move to generic GPIO bus recovery
  i2c: core: treat EPROBE_DEFER when acquiring SCL/SDA GPIOs
  i2c: core: add generic I2C GPIO recovery
  dt-bindings: i2c: add generic properties for GPIO bus recovery
  i2c: rcar: avoid race when unregistering slave
  i2c: tegra: Avoid tegra_i2c_init_dma() for Tegra210 vi i2c
  i2c: tegra: Fix runtime resume to re-init VI I2C
  i2c: tegra: Fix the error path in tegra_i2c_runtime_resume
  ...
parents dddcbc13 b1eef236

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
      "mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629

      "mediatek,mt8173-i2c": for MediaTek MT8173

      "mediatek,mt8183-i2c": for MediaTek MT8183

      "mediatek,mt8192-i2c": for MediaTek MT8192

      "mediatek,mt8516-i2c", "mediatek,mt2712-i2c": for MediaTek MT8516

  - reg: physical base address of the controller and dma base, length of memory

    mapped region.

Documentation/devicetree/bindings/i2c/i2c.txt

+10 −0
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ wants to support one of the below features, it should adapt these bindings. 
	this information to adapt power management to keep the arbitration awake

	all the time, for example. Can not be combined with 'single-master'.



- pinctrl

	add extra pinctrl to configure SCL/SDA pins to GPIO function for bus

	recovery, call it "gpio" or "recovery" (deprecated) state



- scl-gpios

	specify the gpio related to SCL pin. Used for GPIO bus recovery.



- sda-gpios

	specify the gpio related to SDA pin. Optional for GPIO bus recovery.



- single-master

	states that there is no other master active on this bus. The OS can use

	this information to detect a stalled bus more reliably, for example.

Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ properties: 
      - items:

          - const: allwinner,sun50i-a64-i2c

          - const: allwinner,sun6i-a31-i2c

      - items:

          - const: allwinner,sun50i-a100-i2c

          - const: allwinner,sun6i-a31-i2c

      - items:

          - const: allwinner,sun50i-h6-i2c

          - const: allwinner,sun6i-a31-i2c

Documentation/devicetree/bindings/i2c/renesas,i2c.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
	"renesas,i2c-r8a774a1" if the device is a part of a R8A774A1 SoC.

	"renesas,i2c-r8a774b1" if the device is a part of a R8A774B1 SoC.

	"renesas,i2c-r8a774c0" if the device is a part of a R8A774C0 SoC.

	"renesas,i2c-r8a774e1" if the device is a part of a R8A774E1 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.

	"renesas,i2c-r8a7790" if the device is a part of a R8A7790 SoC.

Documentation/devicetree/bindings/i2c/renesas,iic.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
			- "renesas,iic-r8a774a1" (RZ/G2M)

			- "renesas,iic-r8a774b1" (RZ/G2N)

			- "renesas,iic-r8a774c0" (RZ/G2E)

			- "renesas,iic-r8a774e1" (RZ/G2H)

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

			- "renesas,iic-r8a7791" (R-Car M2-W)

			- "renesas,iic-r8a7792" (R-Car V2H)

CRA Git | Maintained and supported by SUSTech CRA and CCSE