Commit 3d05e493 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:
 "I2C has largely driver updates for 6.7, i.e. feature additions (like
  adding transfers while in atomic mode), using new helpers (like
  devm_clk_get_enabled), new IDs, documentation fixes and additions...
  you name it.

  The core got a memleak fix and better support for nested muxes"

* tag 'i2c-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (53 commits)
  i2c: s3c2410: make i2c_s3c_irq_nextbyte() void
  i2c: qcom-geni: add ACPI device id for sc8180x
  Documentation: i2c: add fault code for not supporting 10 bit addresses
  i2c: sun6i-p2wi: Prevent potential division by zero
  i2c: mux: demux-pinctrl: Convert to use sysfs_emit_at() API
  i2c: i801: Use new helper acpi_use_parent_companion
  ACPI: Add helper acpi_use_parent_companion
  MAINTAINERS: add YAML file for i2c-demux-pinctrl
  i2c: core: fix lockdep warning for sparsely nested adapter chain
  i2c: axxia: eliminate kernel-doc warnings
  dt-bindings: i2c: i2c-demux-pinctrl: Convert to json-schema
  i2c: stm32f7: Use devm_clk_get_enabled()
  i2c: stm32f4: Use devm_clk_get_enabled()
  i2c: stm32f7: add description of atomic in struct stm32f7_i2c_dev
  i2c: fix memleak in i2c_new_client_device()
  i2c: exynos5: Calculate t_scl_l, t_scl_h according to i2c spec
  i2c: i801: Simplify class-based client device instantiation
  i2c: exynos5: add support for atomic transfers
  i2c: at91-core: Use devm_clk_get_enabled()
  eeprom: at24: add ST M24C64-D Additional Write lockable page support
  ...
parents 2153fc3d 10e806d3

Documentation/devicetree/bindings/eeprom/at24.yaml

+4 −0
Original line number Diff line number Diff line
@@ -68,10 +68,14 @@ properties: 
                  pattern: cs16$

              - items:

                  pattern: c32$

              - items:

                  pattern: c32d-wl$

              - items:

                  pattern: cs32$

              - items:

                  pattern: c64$

              - items:

                  pattern: c64d-wl$

              - items:

                  pattern: cs64$

              - items:

Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt

deleted100644 → 0
+0 −135
Original line number Diff line number Diff line 
Pinctrl-based I2C Bus DeMux



This binding describes an I2C bus demultiplexer that uses pin multiplexing to

route the I2C signals, and represents the pin multiplexing configuration using

the pinctrl device tree bindings. This may be used to select one I2C IP core at

runtime which may have a better feature set for a given task than another I2C

IP core on the SoC. The most simple example is to fall back to GPIO bitbanging

if your current runtime configuration hits an errata of the internal IP core.



    +-------------------------------+

    | SoC                           |

    |                               |   +-----+  +-----+

    |   +------------+              |   | dev |  | dev |

    |   |I2C IP Core1|--\           |   +-----+  +-----+

    |   +------------+   \-------+  |      |        |

    |                    |Pinctrl|--|------+--------+

    |   +------------+   +-------+  |

    |   |I2C IP Core2|--/           |

    |   +------------+              |

    |                               |

    +-------------------------------+



Required properties:

- compatible: "i2c-demux-pinctrl"

- i2c-parent: List of phandles of I2C masters available for selection. The first

	      one will be used as default.

- i2c-bus-name: The name of this bus. Also needed as pinctrl-name for the I2C

		parents.



Furthermore, I2C mux properties and child nodes. See i2c-mux.yaml in this

directory.



Example:



Here is a snipplet for a bus to be demuxed. It contains various i2c clients for

HDMI, so the bus is named "i2c-hdmi":



	i2chdmi: i2c@8 {



		compatible = "i2c-demux-pinctrl";

		i2c-parent = <&gpioi2c>, <&iic2>, <&i2c2>;

		i2c-bus-name = "i2c-hdmi";

		#address-cells = <1>;

		#size-cells = <0>;



		ak4643: sound-codec@12 {

			compatible = "asahi-kasei,ak4643";



			#sound-dai-cells = <0>;

			reg = <0x12>;

		};



		composite-in@20 {

			compatible = "adi,adv7180";

			reg = <0x20>;

			remote = <&vin1>;



			port {

				adv7180: endpoint {

					bus-width = <8>;

					remote-endpoint = <&vin1ep0>;

				};

			};

		};



		hdmi@39 {

			compatible = "adi,adv7511w";

			reg = <0x39>;

			interrupt-parent = <&gpio1>;

			interrupts = <15 IRQ_TYPE_LEVEL_LOW>;



			adi,input-depth = <8>;

			adi,input-colorspace = "rgb";

			adi,input-clock = "1x";

			adi,input-style = <1>;

			adi,input-justification = "evenly";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					adv7511_in: endpoint {

						remote-endpoint = <&du_out_lvds0>;

					};

				};



				port@1 {

					reg = <1>;

					adv7511_out: endpoint {

						remote-endpoint = <&hdmi_con>;

					};

				};

			};

		};

	};



And for clarification, here are the snipplets for the i2c-parents:



	gpioi2c: i2c@9 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <&gpio5 6 GPIO_ACTIVE_HIGH /* sda */

			 &gpio5 5 GPIO_ACTIVE_HIGH /* scl */

			>;

		i2c-gpio,delay-us = <5>;

	};



...



&i2c2	{

	pinctrl-0 = <&i2c2_pins>;

	pinctrl-names = "i2c-hdmi";



	clock-frequency = <100000>;

};



...



&iic2	{

	pinctrl-0 = <&iic2_pins>;

	pinctrl-names = "i2c-hdmi";



	clock-frequency = <100000>;

};



Please note:



- pinctrl properties for the parent I2C controllers need a pinctrl state

  with the same name as i2c-bus-name, not "default"!



- the i2c masters must have their status "disabled". This driver will

  enable them at runtime when needed.

Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml

0 → 100644
+172 −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/i2c-demux-pinctrl.yaml#

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



title: Pinctrl-based I2C Bus Demultiplexer



maintainers:

  - Wolfram Sang <wsa+renesas@sang-engineering.com>



description: |

  This binding describes an I2C bus demultiplexer that uses pin multiplexing to

  route the I2C signals, and represents the pin multiplexing configuration

  using the pinctrl device tree bindings.  This may be used to select one I2C

  IP core at runtime which may have a better feature set for a given task than

  another I2C IP core on the SoC.  The most simple example is to fall back to

  GPIO bitbanging if your current runtime configuration hits an errata of the

  internal IP core.



      +-------------------------------+

      | SoC                           |

      |                               |   +-----+  +-----+

      |   +------------+              |   | dev |  | dev |

      |   |I2C IP Core1|--\           |   +-----+  +-----+

      |   +------------+   \-------+  |      |        |

      |                    |Pinctrl|--|------+--------+

      |   +------------+   +-------+  |

      |   |I2C IP Core2|--/           |

      |   +------------+              |

      |                               |

      +-------------------------------+



allOf:

  - $ref: i2c-mux.yaml

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



properties:

  compatible:

    const: i2c-demux-pinctrl



  i2c-parent:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description:

      List of phandles of I2C masters available for selection.  The first one

      will be used as default.



  i2c-bus-name:

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

    description:

      The name of this bus.  Also needed as pinctrl-name for the I2C parents.



required:

  - compatible

  - i2c-parent

  - i2c-bus-name



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/irq.h>



    gpioi2c2: i2c-9 {

        #address-cells = <1>;

        #size-cells = <0>;

        compatible = "i2c-gpio";

        scl-gpios = <&gpio5 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

        sda-gpios = <&gpio5 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

        i2c-gpio,delay-us = <5>;



        // The I2C controller must have its status "disabled".  The I2C bus

        // demultiplexer will enable it at runtime when needed.

        status = "disabled";

    };



    iic2: i2c@e6520000 {

        reg = <0xe6520000 0x425>;

        pinctrl-0 = <&iic2_pins>;

        // The pinctrl property for the parent I2C controller needs a pinctrl

        // state with the same name as i2c-bus-name in the I2C bus demultiplexer

        // node, not "default"!

        pinctrl-names = "i2c-hdmi";



        clock-frequency = <100000>;



        // The I2C controller must have its status "disabled".  The I2C bus

        // demultiplexer will enable it at runtime when needed.

        status = "disabled";

    };



    i2c2: i2c@e6530000 {

        reg = <0 0xe6530000 0 0x40>;

        pinctrl-0 = <&i2c2_pins>;

        // The pinctrl property for the parent I2C controller needs a pinctrl

        // state with the same name as i2c-bus-name in the I2C bus demultiplexer

        // node, not "default"!

        pinctrl-names = "i2c-hdmi";



        clock-frequency = <100000>;



        // The I2C controller must have its status "disabled".  The I2C bus

        // demultiplexer will enable it at runtime when needed.

        status = "disabled";

    };



    // Example for a bus to be demuxed.  It contains various I2C clients for

    // HDMI, so the bus is named "i2c-hdmi":

    i2chdmi: i2c-mux3 {

            compatible = "i2c-demux-pinctrl";

            i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;

            i2c-bus-name = "i2c-hdmi";

            #address-cells = <1>;

            #size-cells = <0>;



            ak4643: codec@12 {

                    compatible = "asahi-kasei,ak4643";

                    #sound-dai-cells = <0>;

                    reg = <0x12>;

            };



            composite-in@20 {

                    compatible = "adi,adv7180";

                    reg = <0x20>;



                    port {

                            adv7180: endpoint {

                                    bus-width = <8>;

                                    remote-endpoint = <&vin1ep0>;

                            };

                    };

            };



            hdmi@39 {

                    compatible = "adi,adv7511w";

                    reg = <0x39>;

                    interrupt-parent = <&gpio1>;

                    interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

                    clocks = <&cec_clock>;

                    clock-names = "cec";



                    avdd-supply = <&fixedregulator1v8>;

                    dvdd-supply = <&fixedregulator1v8>;

                    pvdd-supply = <&fixedregulator1v8>;

                    dvdd-3v-supply = <&fixedregulator3v3>;

                    bgvdd-supply = <&fixedregulator1v8>;



                    adi,input-depth = <8>;

                    adi,input-colorspace = "rgb";

                    adi,input-clock = "1x";



                    ports {

                            #address-cells = <1>;

                            #size-cells = <0>;



                            port@0 {

                                    reg = <0>;

                                    adv7511_in: endpoint {

                                            remote-endpoint = <&lvds0_out>;

                                    };

                            };



                            port@1 {

                                    reg = <1>;

                                    adv7511_out: endpoint {

                                            remote-endpoint = <&hdmi_con_out>;

                                    };

                            };

                    };

            };

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 


      - items:

          - enum:

              - qcom,sc7280-cci

              - qcom,sdm845-cci

              - qcom,sm6350-cci

              - qcom,sm8250-cci
@@ -159,6 +160,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sc7280-cci

              - qcom,sm8250-cci

              - qcom,sm8450-cci

    then:

Documentation/i2c/busses/i2c-i801.rst

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ Supported adapters: 
  * Intel Alder Lake (PCH)

  * Intel Raptor Lake (PCH)

  * Intel Meteor Lake (SOC and PCH)

  * Intel Birch Stream (SOC)



   Datasheets: Publicly available at the Intel website