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

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

Pull i2c fixes from Wolfram Sang:
 "Add missing DT bindings for STM32 and a resource leak fix for DaVinci"

* tag 'i2c-for-6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: davinci: fix PM disable depth imbalance in davinci_i2c_probe
  dt-bindings: i2c: st,stm32-i2c: Document wakeup-source property
  dt-bindings: i2c: st,stm32-i2c: Document interrupt-names property
parents febae48a e2062df7

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

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ properties: 
      - description: interrupt ID for I2C event

      - description: interrupt ID for I2C error



  interrupt-names:

    items:

      - const: event

      - const: error



  resets:

    maxItems: 1
@@ -92,6 +97,8 @@ properties: 
          - description: register offset within syscfg

          - description: register bitmask for FMP bit



  wakeup-source: true



required:

  - compatible

  - reg

drivers/i2c/busses/i2c-davinci.c

+2 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	r = pm_runtime_resume_and_get(dev->dev);

	if (r < 0) {

		dev_err(dev->dev, "failed to runtime_get device: %d\n", r);

		return r;

		goto err_pm;

	}



	i2c_davinci_init(dev);
@@ -882,6 +882,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
err_unuse_clocks:

	pm_runtime_dont_use_autosuspend(dev->dev);

	pm_runtime_put_sync(dev->dev);

err_pm:

	pm_runtime_disable(dev->dev);



	return r;