Commit 389dfd9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:

 - PM cleanup after all prerequisites are merged with rc1

 - usbio: missing addition after all dependencies are in

 - slimpro: DT binding schema conversion

* tag 'i2c-for-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  dt-bindings: i2c: Convert apm,xgene-slimpro-i2c to DT schema
  i2c: usbio: Add ACPI device-id for MTL-CVF devices
  i2c: Remove redundant pm_runtime_mark_last_busy() calls
parents 98ac9cc4 86753709

Documentation/devicetree/bindings/i2c/apm,xgene-slimpro-i2c.yaml

0 → 100644
+36 −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/apm,xgene-slimpro-i2c.yaml#

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



title: APM X-Gene SLIMpro Mailbox I2C



maintainers:

  - Khuong Dinh <khuong@os.amperecomputing.com>



description:

  An I2C controller accessed over the "SLIMpro" mailbox.



allOf:

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



properties:

  compatible:

    const: apm,xgene-slimpro-i2c



  mboxes:

    maxItems: 1



required:

  - compatible

  - mboxes



unevaluatedProperties: false



examples:

  - |

    i2c {

        compatible = "apm,xgene-slimpro-i2c";

        mboxes = <&mailbox 0>;

    };

Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
APM X-Gene SLIMpro Mailbox I2C Driver



An I2C controller accessed over the "SLIMpro" mailbox.



Required properties :



 - compatible : should be "apm,xgene-slimpro-i2c"

 - mboxes : use the label reference for the mailbox as the first parameter.

	    The second parameter is the channel number.



Example :

	i2cslimpro {

		compatible = "apm,xgene-slimpro-i2c";

		mboxes = <&mailbox 0>;

	};

drivers/i2c/busses/i2c-amd-mp2.h

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static inline void amd_mp2_pm_runtime_get(struct amd_mp2_dev *mp2_dev) 


static inline void amd_mp2_pm_runtime_put(struct amd_mp2_dev *mp2_dev)

{

	pm_runtime_mark_last_busy(&mp2_dev->pci_dev->dev);

	pm_runtime_put_autosuspend(&mp2_dev->pci_dev->dev);

}

drivers/i2c/busses/i2c-at91-core.c

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ static int __maybe_unused at91_twi_resume_noirq(struct device *dev) 
			return ret;

	}



	pm_runtime_mark_last_busy(dev);

	pm_request_autosuspend(dev);



	at91_init_twi_bus(twi_dev);

drivers/i2c/busses/i2c-at91-master.c

+0 −1
Original line number Diff line number Diff line
@@ -717,7 +717,6 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) 


	ret = (ret < 0) ? ret : num;

out:

	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return ret;