Commit 11777ee8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:
 "i2c core:

   - huge improvements and refactorizations of the Linux I2C
     documentation (lots of thanks to Luca for doing it and Jean for the
     careful review)

   - subsystem wide API conversion to i2c_new_client_device()

   - remove obsolete parport-light driver

   - smaller core updates (removal of 'extern', enabling more compile
     testing, use more helper macros)

   - and quite a bunch of driver updates (new IDs, simplifications,
     better PM, support of atomic transfers and other improvements)

  i2c-mux:

   - The main feature is the idle-state rework of the pca954x driver
     from Biwen Li

  at24 driver:

   - minor maintenance: update the license tag, sort headers

   - move support for the write-protect pin into nvmem core

   - add a reference to the new wp-gpios property in nvmem to at25
     bindings

   - add support for regulator and pm_runtime control"

* 'i2c/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (91 commits)
  i2c: cros-ec-tunnel: Fix ACPI identifier
  i2c: cros-ec-tunnel: Fix slave device enumeration
  i2c: stm32f7: add PM_SLEEP suspend/resume support
  i2c: cadence: Fix wording in i2c-cadence driver
  i2c: cadence: Fix power management order of operations
  i2c: cadence: Fix error printing in case of defer
  i2c: cadence: Handle transfer_size rollover
  i2c: i801: Add support for Intel Comet Lake PCH-V
  docs: i2c: writing-clients: properly name the stop condition
  docs: i2c: i2c-protocol: use same wording as smbus-protocol
  docs: i2c: rename sections so the overall picture is clearer
  docs: i2c: old-module-parameters: use monospace instead of ""
  docs: i2c: old-module-parameters: clarify this is for obsolete kernels
  docs: i2c: old-module-parameters: fix internal hyperlink
  docs: i2c: instantiating-devices: use monospace for sysfs attributes
  docs: i2c: instantiating-devices: rearrange static instatiation
  docs: i2c: instantiating-devices: fix internal hyperlink
  docs: i2c: smbus-protocol: improve I2C Block transactions description
  docs: i2c: smbus-protocol: fix punctuation
  docs: i2c: smbus-protocol: fix typo
  ...
parents ed39ba0e b49f8e0e

Documentation/devicetree/bindings/eeprom/at24.yaml

+5 −4
Original line number Diff line number Diff line
@@ -145,10 +145,7 @@ properties: 
      over reads to the next slave address. Please consult the manual of

      your device.



  wp-gpios:

    description:

      GPIO to which the write-protect pin of the chip is connected.

    maxItems: 1

  wp-gpios: true



  address-width:

    allOf:
@@ -167,6 +164,10 @@ properties: 
    minimum: 1

    maximum: 8



  vcc-supply:

    description:

      phandle of the regulator that provides the supply voltage.



required:

  - compatible

  - reg

Documentation/devicetree/bindings/eeprom/at25.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Optional properties: 
- spi-cpha : SPI shifted clock phase, as per spi-bus bindings.

- spi-cpol : SPI inverse clock polarity, as per spi-bus bindings.

- read-only : this parameter-less property disables writes to the eeprom

- wp-gpios : GPIO to which the write-protect pin of the chip is connected



Obsolete legacy properties can be used in place of "size", "pagesize",

"address-width", and "read-only":
@@ -36,6 +37,7 @@ Example: 
		spi-max-frequency = <5000000>;

		spi-cpha;

		spi-cpol;

		wp-gpios = <&gpio1 3 0>;



		pagesize = <64>;

		size = <32768>;

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

+10 −4
Original line number Diff line number Diff line 
I2C for Atmel platforms



Required properties :

- compatible : Must be "atmel,at91rm9200-i2c", "atmel,at91sam9261-i2c",

     "atmel,at91sam9260-i2c", "atmel,at91sam9g20-i2c", "atmel,at91sam9g10-i2c",

     "atmel,at91sam9x5-i2c", "atmel,sama5d4-i2c", "atmel,sama5d2-i2c" or

     "microchip,sam9x60-i2c"

- compatible : Must be one of:

	"atmel,at91rm9200-i2c",

	"atmel,at91sam9261-i2c",

	"atmel,at91sam9260-i2c",

	"atmel,at91sam9g20-i2c",

	"atmel,at91sam9g10-i2c",

	"atmel,at91sam9x5-i2c",

	"atmel,sama5d4-i2c",

	"atmel,sama5d2-i2c",

	"microchip,sam9x60-i2c".

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

     region.

- interrupts: interrupt number to the cpu.

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

+3 −1
Original line number Diff line number Diff line 
* Ingenic JZ4780 I2C Bus controller



Required properties:

- compatible: should be "ingenic,jz4780-i2c"

- compatible: should be one of the following:

  - "ingenic,jz4780-i2c" for the JZ4780

  - "ingenic,x1000-i2c" for the X1000

- reg: Should contain the address & size of the I2C controller registers.

- interrupts: Should specify the interrupt provided by parent.

- clocks: Should contain a single clock specifier for the JZ4780 I2C clock.

Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ Required Properties: 
Optional Properties:



  - reset-gpios: Reference to the GPIO connected to the reset input.

  - idle-state: if present, overrides i2c-mux-idle-disconnect,

    Please refer to Documentation/devicetree/bindings/mux/mux-controller.txt

  - i2c-mux-idle-disconnect: Boolean; if defined, forces mux to disconnect all

    children in idle state. This is necessary for example, if there are several

    multiplexers on the bus and the devices behind them use same I2C addresses.

CRA Git | Maintained and supported by SUSTech CRA and CCSE