Commit ed8d8453 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:
 "This removes the currently unused CLASS_DDC support (controllers set
  the flag, but there is no client to use it).

  Also, CLASS_SPD support gets simplified to prepare removal in the
  future. Class based instantiation is not recommended these days
  anyhow.

  Furthermore, I2C core now creates a debugfs directory per I2C adapter.
  Current bus driver users were converted to use it.

  Finally, quite some driver updates. Standing out are patches for the
  wmt-driver which is refactored to support more variants.

  This is the rebased pull request where a large series for the
  designware driver was dropped"

* tag 'i2c-for-6.8-rc1-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
  MAINTAINERS: use proper email for my I2C work
  i2c: stm32f7: add support for stm32mp25 soc
  i2c: stm32f7: perform I2C_ISR read once at beginning of event isr
  dt-bindings: i2c: document st,stm32mp25-i2c compatible
  i2c: stm32f7: simplify status messages in case of errors
  i2c: stm32f7: perform most of irq job in threaded handler
  i2c: stm32f7: use dev_err_probe upon calls of devm_request_irq
  i2c: i801: Add lis3lv02d for Dell XPS 15 7590
  i2c: i801: Add lis3lv02d for Dell Precision 3540
  i2c: wmt: Reduce redundant: REG_CR setting
  i2c: wmt: Reduce redundant: function parameter
  i2c: wmt: Reduce redundant: clock mode setting
  i2c: wmt: Reduce redundant: wait event complete
  i2c: wmt: Reduce redundant: bus busy check
  i2c: mux: reg: Remove class-based device auto-detection support
  i2c: make i2c_bus_type const
  dt-bindings: at24: add ROHM BR24G04
  eeprom: at24: use of_match_ptr()
  i2c: cpm: Remove linux,i2c-index conversion from be32
  i2c: imx: Make SDA actually optional for bus recovering
  ...
parents 378de6df 4503538d

Documentation/devicetree/bindings/eeprom/at24.yaml

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ properties: 
          - enum:

              - onnn,cat24c04

              - onnn,cat24c05

              - rohm,br24g04

          - const: atmel,24c04

      - items:

          - const: renesas,r1ex24016

Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml

+28 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ allOf: 
              - st,stm32f7-i2c

              - st,stm32mp13-i2c

              - st,stm32mp15-i2c

              - st,stm32mp25-i2c

    then:

      properties:

        i2c-scl-rising-time-ns:
@@ -41,6 +42,30 @@ allOf: 
        clock-frequency:

          enum: [100000, 400000]



  - if:

      properties:

        compatible:

          contains:

            enum:

              - st,stm32f4-i2c

              - st,stm32f7-i2c

              - st,stm32mp13-i2c

              - st,stm32mp15-i2c

    then:

      properties:

        interrupts:

          minItems: 2



        interrupt-names:

          minItems: 2

    else:

      properties:

        interrupts:

          maxItems: 1



        interrupt-names:

          maxItems: 1



properties:

  compatible:

    enum:
@@ -48,6 +73,7 @@ properties: 
      - st,stm32f7-i2c

      - st,stm32mp13-i2c

      - st,stm32mp15-i2c

      - st,stm32mp25-i2c



  reg:

    maxItems: 1
@@ -56,11 +82,13 @@ properties: 
    items:

      - description: interrupt ID for I2C event

      - description: interrupt ID for I2C error

    minItems: 1



  interrupt-names:

    items:

      - const: event

      - const: error

    minItems: 1



  resets:

    maxItems: 1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10061,7 +10061,7 @@ F: Documentation/i2c/busses/i2c-parport.rst 
F:	drivers/i2c/busses/i2c-parport.c









I2C SUBSYSTEM









M:	Wolfram Sang <wsa@kernel.org>









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









L:	linux-i2c@vger.kernel.org









S:	Maintained









W:	https://i2c.wiki.kernel.org/
































drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -175,7 +175,6 @@ struct amdgpu_i2c_chan *amdgpu_i2c_create(struct drm_device *dev,

















	i2c->rec = *rec;









	i2c->adapter.owner = THIS_MODULE;









	i2c->adapter.class = I2C_CLASS_DDC;









	i2c->adapter.dev.parent = dev->dev;









	i2c->dev = dev;









	i2c_set_adapdata(&i2c->adapter, i2c);
































drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -7615,7 +7615,6 @@ create_i2c(struct ddc_service *ddc_service,







	if (!i2c)









		return NULL;









	i2c->base.owner = THIS_MODULE;









	i2c->base.class = I2C_CLASS_DDC;









	i2c->base.dev.parent = &adev->pdev->dev;









	i2c->base.algo = &amdgpu_dm_i2c_algo;









	snprintf(i2c->base.name, sizeof(i2c->base.name), "AMDGPU DM i2c hw bus %d", link_index);