Commit 91962feb authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-6.9' of... 

Merge tag 'i2c-host-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow

The i801 and designware drivers received most of the changes,
including refactorings and some additions.

Recovery changes for the iMX and iMX-LPI2C are now utilizing the
generic i2c support.

The Cadence driver now supports system suspend and resume.

The hisi, mpc, sh_mobile, and npcm drivers have undergone some
cleanups and improvements. Meanwhile, Uwe continues his work on
converting the "remove" callback to become a void function.

The pca954x mux driver now supports additional configurations,
such as isolating faulty channels and flushing stuck buses, among
others.

Support has been added for Renesas r8a779h0, i.MX95 LPI2C, and
Microchip sam9x7. Meanwhile, Geert lays the groundwork for the
upcoming R-Car Gen4.
parents 68a04aee 06d0cb6c

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ properties: 
              - atmel,sama5d2-i2c

              - microchip,sam9x60-i2c

      - items:

          - const: microchip,sama7g5-i2c

          - enum:

              - microchip,sama7g5-i2c

              - microchip,sam9x7-i2c

          - const: microchip,sam9x60-i2c



  reg:

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
              - fsl,imx8qm-lpi2c

              - fsl,imx8ulp-lpi2c

              - fsl,imx93-lpi2c

              - fsl,imx95-lpi2c

          - const: fsl,imx7ulp-lpi2c



  reg:

Documentation/devicetree/bindings/i2c/i2c-mpc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -96,6 +96,6 @@ examples: 
        interrupts = <43 2>;

        interrupt-parent = <&mpic>;

        clock-frequency = <400000>;

        i2c-scl-clk-low-timeout-us = <10000>;

        i2c-transfer-timeout-us = <10000>;

    };

...

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

+30 −0
Original line number Diff line number Diff line
@@ -71,6 +71,23 @@ properties: 
    description: A voltage regulator supplying power to the chip. On PCA9846

      the regulator supplies power to VDD2 (core logic) and optionally to VDD1.



  maxim,isolate-stuck-channel:

    type: boolean

    description: Allows to use non faulty channels while a stuck channel is

      isolated from the upstream bus. If not set all channels are isolated from

      the upstream bus until the fault is cleared.



  maxim,send-flush-out-sequence:

    type: boolean

    description: Send a flush-out sequence to stuck auxiliary buses

      automatically after a stuck channel is being detected.



  maxim,preconnection-wiggle-test-enable:

    type: boolean

    description: Send a STOP condition to the auxiliary buses when the switch

      register activates a channel to detect a stuck high fault. On fault the

      channel is isolated from the upstream bus.



required:

  - compatible

  - reg
@@ -95,6 +112,19 @@ allOf: 
        "#interrupt-cells": false

        interrupt-controller: false



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - maxim,max7357

    then:

      properties:

        maxim,isolate-stuck-channel: false

        maxim,send-flush-out-sequence: false

        maxim,preconnection-wiggle-test-enable: false



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/i2c/renesas,rcar-i2c.yaml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ properties: 
              - renesas,i2c-r8a779a0     # R-Car V3U

              - renesas,i2c-r8a779f0     # R-Car S4-8

              - renesas,i2c-r8a779g0     # R-Car V4H

              - renesas,i2c-r8a779h0     # R-Car V4M

          - const: renesas,rcar-gen4-i2c # R-Car Gen4



  reg: