Commit 0a07e090 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:
 "i2c core removes an argument from the i2c_mux_add_adapter() call to
  further deprecate class based I2C device instantiation. All users are
  converted, too.

  Other that that, Andi collected a number if I2C host driver patches.
  Those merges have their own description"

* tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (72 commits)
  power: supply: sbs-manager: Remove class argument from i2c_mux_add_adapter()
  i2c: mux: Remove class argument from i2c_mux_add_adapter()
  i2c: synquacer: Fix an error handling path in synquacer_i2c_probe()
  i2c: acpi: Unbind mux adapters before delete
  i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE()
  i2c: pxa: use 'time_left' variable with wait_event_timeout()
  i2c: s3c2410: use 'time_left' variable with wait_event_timeout()
  i2c: rk3x: use 'time_left' variable with wait_event_timeout()
  i2c: qcom-geni: use 'time_left' variable with wait_for_completion_timeout()
  i2c: jz4780: use 'time_left' variable with wait_for_completion_timeout()
  i2c: synquacer: use 'time_left' variable with wait_for_completion_timeout()
  i2c: stm32f7: use 'time_left' variable with wait_for_completion_timeout()
  i2c: stm32f4: use 'time_left' variable with wait_for_completion_timeout()
  i2c: st: use 'time_left' variable with wait_for_completion_timeout()
  i2c: omap: use 'time_left' variable with wait_for_completion_timeout()
  i2c: imx-lpi2c: use 'time_left' variable with wait_for_completion_timeout()
  i2c: hix5hd2: use 'time_left' variable with wait_for_completion_timeout()
  i2c: exynos5: use 'time_left' variable with wait_for_completion_timeout()
  i2c: digicolor: use 'time_left' variable with wait_for_completion_timeout()
  i2c: amd-mp2-plat: use 'time_left' variable with wait_for_completion_timeout()
  ...
parents 2de68638 068a95ef

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

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
* NXP PNX I2C Controller



Required properties:



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

 - compatible: should be "nxp,pnx-i2c"

 - interrupts: configure one interrupt line

 - #address-cells: always 1 (for i2c addresses)

 - #size-cells: always 0



Optional properties:



 - clock-frequency: desired I2C bus clock frequency in Hz, Default: 100000 Hz



Examples:



	i2c1: i2c@400a0000 {

		compatible = "nxp,pnx-i2c";

		reg = <0x400a0000 0x100>;

		interrupt-parent = <&mic>;

		interrupts = <51 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	i2c2: i2c@400a8000 {

		compatible = "nxp,pnx-i2c";

		reg = <0x400a8000 0x100>;

		interrupt-parent = <&mic>;

		interrupts = <50 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-frequency = <100000>;

	};

Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/i2c/nxp,pnx-i2c.yaml#

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



title: NXP PNX I2C Controller



maintainers:

  - Animesh Agarwal <animeshagarwal28@gmail.com>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#



properties:

  compatible:

    const: nxp,pnx-i2c



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clock-frequency:

    default: 100000



required:

  - compatible

  - reg

  - interrupts

  - "#address-cells"

  - "#size-cells"



unevaluatedProperties: false



examples:

  - |

    i2c@400a0000 {

        compatible = "nxp,pnx-i2c";

        reg = <0x400a0000 0x100>;

        interrupt-parent = <&mic>;

        interrupts = <51 0>;

        #address-cells = <1>;

        #size-cells = <0>;

    };

Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

+19 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - items:

          - enum:

              - qcom,sc7280-cci

              - qcom,sc8280xp-cci

              - qcom,sdm845-cci

              - qcom,sm6350-cci

              - qcom,sm8250-cci
@@ -176,6 +177,24 @@ allOf: 
            - const: cci

            - const: cci_src



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc8280xp-cci

    then:

      properties:

        clocks:

          minItems: 4

          maxItems: 4

        clock-names:

          items:

            - const: camnoc_axi

            - const: slow_ahb_src

            - const: cpas_ahb

            - const: cci



additionalProperties: false



examples:

Documentation/devicetree/bindings/i2c/renesas,riic.yaml

+11 −8
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ allOf: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - renesas,riic-r7s72100   # RZ/A1H

              - renesas,riic-r7s9210    # RZ/A2M
@@ -24,6 +25,8 @@ properties: 
              - renesas,riic-r9a07g054  # RZ/V2L

          - const: renesas,riic-rz      # RZ/A or RZ/G2L



      - const: renesas,riic-r9a09g057   # RZ/V2H(P)



  reg:

    maxItems: 1

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -2362,7 +2362,7 @@ M: Vladimir Zapolskiy <vz@mleia.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://github.com/vzapolskiy/linux-lpc32xx.git

F:	Documentation/devicetree/bindings/i2c/i2c-pnx.txt

F:	Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml

F:	arch/arm/boot/dts/nxp/lpc/lpc32*

F:	arch/arm/mach-lpc32xx/

F:	drivers/i2c/busses/i2c-pnx.c
@@ -3082,7 +3082,7 @@ S: Orphan 
F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt

F:	arch/arm/mach-vt8500/

F:	drivers/clocksource/timer-vt8500.c

F:	drivers/i2c/busses/i2c-wmt.c

F:	drivers/i2c/busses/i2c-viai2c-wmt.c

F:	drivers/mmc/host/wmt-sdmmc.c

F:	drivers/pwm/pwm-vt8500.c

F:	drivers/rtc/rtc-vt8500.c
@@ -10400,6 +10400,14 @@ L: linux-i2c@vger.kernel.org 
F:	Documentation/i2c/busses/i2c-ismt.rst

F:	drivers/i2c/busses/i2c-ismt.c









I2C/SMBUS ZHAOXIN DRIVER









M:	Hans Hu <hanshu@zhaoxin.com>









L:	linux-i2c@vger.kernel.org









S:	Maintained









W:	https://www.zhaoxin.com









F:	drivers/i2c/busses/i2c-viai2c-common.c









F:	drivers/i2c/busses/i2c-viai2c-zhaoxin.c

















I2C/SMBUS STUB DRIVER









M:	Jean Delvare <jdelvare@suse.com>









L:	linux-i2c@vger.kernel.org