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

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

Pull i2c updates from Wolfram Sang:

 - new drivers for Spreadtrum I2C, Intel Cherry Trail Whiskey Cove SMBUS

 - quite some driver updates

 - cleanups for the i2c-mux subsystem

 - some subsystem-wide constification

 - further cleanup of include/linux/i2c

* 'i2c/for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (50 commits)
  i2c: sprd: Fix undefined reference errors
  i2c: nomadik: constify amba_id
  i2c: versatile: Make i2c_algo_bit_data const
  i2c: busses: make i2c_adapter_quirks const
  i2c: busses: make i2c_adapter const
  i2c: busses: make i2c_algorithm const
  i2c: Add Spreadtrum I2C controller driver
  dt-bindings: i2c: Add Spreadtrum I2C controller documentation
  i2c-cht-wc: make cht_wc_i2c_adap_driver static
  MAINTAINERS: Add entry for drivers/i2c/busses/i2c-cht-wc.c
  i2c: aspeed: Retain delay/setup/hold values when configuring bus frequency
  dt-bindings: i2c: eeprom: Document vendor to be used and deprecated ones
  i2c: i801: Restore the presence state of P2SB PCI device after reading BAR
  MAINTAINERS: drop entry for Blackfin I2C and Sonic's email
  blackfin: merge the two TWI header files
  i2c: davinci: Preserve return value of devm_clk_get
  i2c: mediatek: Add i2c compatible for MediaTek MT7622
  dt-bindings: i2c: Add MediaTek MT7622 i2c binding
  dt-bindings: i2c: modify information formats
  i2c: mux: i2c-arb-gpio-challenge: allow compiling w/o OF support
  ...
parents ad9a19d0 8ce906c1

Documentation/devicetree/bindings/eeprom/eeprom.txt

+5 −1
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@ Required properties: 


	"renesas,r1ex24002"



	The following manufacturers values have been deprecated:

	"at", "at24"



	 If there is no specific driver for <manufacturer>, a generic

	 driver based on <type> is selected. Possible types are:

	 device with <type> and manufacturer "atmel" should be used.

	 Possible types are:

	 "24c00", "24c01", "24c02", "24c04", "24c08", "24c16", "24c32", "24c64",

	 "24c128", "24c256", "24c512", "24c1024", "spd"

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

+8 −7
Original line number Diff line number Diff line 
* Mediatek's I2C controller

* MediaTek's I2C controller



The Mediatek's I2C controller is used to interface with I2C devices.

The MediaTek's I2C controller is used to interface with I2C devices.



Required properties:

  - compatible: value should be either of the following.

      "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for Mediatek mt2701

      "mediatek,mt6577-i2c": for i2c compatible with mt6577.

      "mediatek,mt6589-i2c": for i2c compatible with mt6589.

      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for i2c compatible with mt7623.

      "mediatek,mt8173-i2c": for i2c compatible with mt8173.

      "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for MediaTek MT2701

      "mediatek,mt6577-i2c": for MediaTek MT6577

      "mediatek,mt6589-i2c": for MediaTek MT6589

      "mediatek,mt7622-i2c": for MediaTek MT7622

      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for MediaTek MT7623

      "mediatek,mt8173-i2c": for MediaTek MT8173

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

    mapped region.

  - interrupts: interrupt number to the cpu.

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

+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ I2C for R-Car platforms 


Required properties:

- compatible:

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

	"renesas,i2c-r8a7745" if the device is a part of a R8A7745 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.
@@ -12,7 +14,8 @@ Required properties: 
	"renesas,i2c-r8a7795" if the device is a part of a R8A7795 SoC.

	"renesas,i2c-r8a7796" if the device is a part of a R8A7796 SoC.

	"renesas,rcar-gen1-i2c" for a generic R-Car Gen1 compatible device.

	"renesas,rcar-gen2-i2c" for a generic R-Car Gen2 compatible device.

	"renesas,rcar-gen2-i2c" for a generic R-Car Gen2 or RZ/G1 compatible

				device.

	"renesas,rcar-gen3-i2c" for a generic R-Car Gen3 compatible device.

	"renesas,i2c-rcar" (deprecated)

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

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


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

 - compatible: should be one of the following:

   - "rockchip,rv1108-i2c": for rv1108

   - "rockchip,rk3066-i2c": for rk3066

   - "rockchip,rk3188-i2c": for rk3188

   - "rockchip,rk3228-i2c": for rk3228

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

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ Required properties: 
- compatible      :

			- "renesas,iic-r8a73a4" (R-Mobile APE6)

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

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

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

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

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

			- "renesas,iic-r8a7792" (R-Car V2H)
@@ -12,7 +14,8 @@ Required properties: 
			- "renesas,iic-r8a7795" (R-Car H3)

			- "renesas,iic-r8a7796" (R-Car M3-W)

			- "renesas,iic-sh73a0" (SH-Mobile AG5)

			- "renesas,rcar-gen2-iic" (generic R-Car Gen2 compatible device)

			- "renesas,rcar-gen2-iic" (generic R-Car Gen2 or RZ/G1

							compatible device)

			- "renesas,rcar-gen3-iic" (generic R-Car Gen3 compatible device)

			- "renesas,rmobile-iic" (generic device)

CRA Git | Maintained and supported by SUSTech CRA and CCSE