Commit 89555eeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c updates from Wolfram Sang:
 "Mostly fixes for DTs or DT handling this time. And a few driver
  bugfixes"

* tag 'i2c-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (28 commits)
  i2c: xiic: xiic_xfer(): Fix runtime PM leak on error path
  i2c: cadence: cdns_i2c_master_xfer(): Fix runtime PM leak on error path
  i2c: omap: Improve error reporting for problems during .remove()
  i2c: cadence: Add reset controller support
  dt-bindings: i2c: cadence: Document `resets` property
  i2c: mediatek: add support for MT7981 SoC
  dt-bindings: i2c: i2c-mt65xx: add MediaTek MT7981 SoC
  dt-bindings: i2c: Drop unneeded quotes
  i2c: brcmstb: use devm_platform_ioremap_resource_byname()
  i2c: cadence: Detect maximum transfer size
  i2c: cadence: Allow to specify the FIFO depth
  dt-bindings: i2c: cadence: Document `fifo-depth` property
  i2c: xiic: Use devm_platform_get_and_ioremap_resource()
  i2c: mpc: Use i2c-scl-clk-low-timeout-us i2c property
  i2c: mpc: Use of_property_read_u32 instead of of_get_property
  dt-bindings: i2c: mpc: Mark "fsl,timeout" as deprecated
  i2c: xiic: hide OF related data for COMPILE_TEST
  i2c: synquacer: mark OF related data as maybe unused
  dt-bindings: i2c: i2c-mt65xx: Add compatible for MT6795 Helio X10
  i2c: imx: Simplify using devm_clk_get_enabled()
  ...
parents d91f6a73 38c87827

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Amlogic Meson I2C Controller

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/i2c/apple,i2c.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/i2c/apple,i2c.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Apple/PASemi I2C controller

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ required: 
  - clocks



allOf:

  - $ref: "i2c-controller.yaml"

  - $ref: i2c-controller.yaml

  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml

+14 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Cadence I2C controller
@@ -24,6 +24,9 @@ properties: 
  clocks:

    minItems: 1



  resets:

    maxItems: 1



  interrupts:

    maxItems: 1
@@ -38,6 +41,13 @@ properties: 
    description: |

      Input clock name.



  fifo-depth:

    description:

      Size of the data FIFO in bytes.

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 16

    enum: [2, 4, 8, 16, 32, 64, 128, 256]



required:

  - compatible

  - reg
@@ -52,9 +62,11 @@ examples: 
    i2c@e0004000 {

        compatible = "cdns,i2c-r1p10";

        clocks = <&clkc 38>;

        resets = <&rstc 288>;

        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

        reg = <0xe0004000 0x1000>;

        clock-frequency = <400000>;

        #address-cells = <1>;

        #size-cells = <0>;

        fifo-depth = <8>;

    };

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

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 


  fsl,timeout:

    $ref: /schemas/types.yaml#/definitions/uint32

    deprecated: true

    description: |

      I2C bus timeout in microseconds
@@ -95,6 +96,6 @@ examples: 
        interrupts = <43 2>;

        interrupt-parent = <&mpic>;

        clock-frequency = <400000>;

        fsl,timeout = <10000>;

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

    };

...