I3C for 5.19
Subsystem: - yaml conversion of the DT bindings -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEBqsFVZXh8s/0O5JiY6TcMGxwOjIFAmKX0XMACgkQY6TcMGxw OjJeiQ//WCYp/BO1mteTmz+yubov4WxBLjXDtD5ED+qCQPHqxb7MOBXZtLUK7JNm EtUi/WIltWqXVnbwRvTVTfspvV960cxnLCG3XfAvw01YuUvPYqAxosko3dbHStKZ 88WpQ8YfjLQ891Yz3H68chyuNM8lsZaHD7prklpRp5GBDMtXwr5WNTI+JZdI6vRW KALBsIZDf0G77H90EHdwgPbZvZEWuuS/fSLEFOPak6JAZkvGqDAjLmFl0Zt898rt Jf04/seiYmhi8dQeL/Nf27rJHBN6a59wavIG0W7WaoEC5tTHWcBhDSCrcAJgkJGT AQ3B0d0IwhEwLi6r4e4r0q79Cywg92xCYxEbR90sbyv79u0yYA6XNNFb8sWYiU7+ 8N7q4ATVfK8j0x3ijm8Lw7quhtQpSVZ0JKYxakgKOW9/fjGCPZN2wz7Imd8HIibu wENqIO3okjRIq2HNOn8Ik51aN8hnxUC32JDvo0VuMDlsUgvn5ijiUnq07epfrtgc mYXNtUtDHWKLXp1060QZqX2EEHM8QBu4k1KPXDM/km9rXRdd/3U7bnRhEhWUjH49 KltqWmtBLRbFjTTjv4zyYmRJFvwshA7H6OBcw6O4zV+7/U70PIjMpFrZ5hmUAduH kEbb22wUE/EvpUnuu9368Mz5vxPmDeIIDa7rJibqTj4QE1Zhe94= =jlzF -----END PGP SIGNATURE----- Merge tag 'i3c/for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux Pull i3c updates from Alexandre Belloni: "Only clean ups and no functional change this cycle. A couple of yaml conversions of the DT bindings, and a couple of code cleanups" * tag 'i3c/for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: MAINTAINERS: rectify entries for some i3c drivers after dt conversion i3c: master: svc: fix returnvar.cocci warning i3c/master: simplify the return expression of i3c_hci_remove() dt-bindings: i3c: Convert snps,dw-i3c-master to DT schema dt-bindings: i3c: Convert cdns,i3c-master to DT schema
This commit is contained in:
Linus Torvalds
commit
55fe921790
|
|
@ -1,43 +0,0 @@
|
|||
Bindings for cadence I3C master block
|
||||
=====================================
|
||||
|
||||
Required properties:
|
||||
--------------------
|
||||
- compatible: shall be "cdns,i3c-master"
|
||||
- clocks: shall reference the pclk and sysclk
|
||||
- clock-names: shall contain "pclk" and "sysclk"
|
||||
- interrupts: the interrupt line connected to this I3C master
|
||||
- reg: I3C master registers
|
||||
|
||||
Mandatory properties defined by the generic binding (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details):
|
||||
|
||||
- #address-cells: shall be set to 1
|
||||
- #size-cells: shall be set to 0
|
||||
|
||||
Optional properties defined by the generic binding (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details):
|
||||
|
||||
- i2c-scl-hz
|
||||
- i3c-scl-hz
|
||||
|
||||
I3C device connected on the bus follow the generic description (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details).
|
||||
|
||||
Example:
|
||||
|
||||
i3c-master@0d040000 {
|
||||
compatible = "cdns,i3c-master";
|
||||
clocks = <&coreclock>, <&i3csysclock>;
|
||||
clock-names = "pclk", "sysclk";
|
||||
interrupts = <3 0>;
|
||||
reg = <0x0d040000 0x1000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
i2c-scl-hz = <100000>;
|
||||
|
||||
nunchuk: nunchuk@52 {
|
||||
compatible = "nintendo,nunchuk";
|
||||
reg = <0x52 0x0 0x10>;
|
||||
};
|
||||
};
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/i3c/cdns,i3c-master.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Cadence I3C master block
|
||||
|
||||
maintainers:
|
||||
- Boris Brezillon <bbrezillon@kernel.org>
|
||||
|
||||
allOf:
|
||||
- $ref: i3c.yaml#
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
const: cdns,i3c-master
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
maxItems: 2
|
||||
|
||||
clock-names:
|
||||
items:
|
||||
- const: pclk
|
||||
- const: sysclk
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- clocks
|
||||
- clock-names
|
||||
- interrupts
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
i3c-master@d040000 {
|
||||
compatible = "cdns,i3c-master";
|
||||
clocks = <&coreclock>, <&i3csysclock>;
|
||||
clock-names = "pclk", "sysclk";
|
||||
interrupts = <3 0>;
|
||||
reg = <0x0d040000 0x1000>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <0>;
|
||||
i2c-scl-hz = <100000>;
|
||||
|
||||
eeprom@57{
|
||||
compatible = "atmel,24c01";
|
||||
reg = <0x57 0x0 0x10>;
|
||||
pagesize = <0x8>;
|
||||
};
|
||||
};
|
||||
...
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
Bindings for Synopsys DesignWare I3C master block
|
||||
=================================================
|
||||
|
||||
Required properties:
|
||||
--------------------
|
||||
- compatible: shall be "snps,dw-i3c-master-1.00a"
|
||||
- clocks: shall reference the core_clk
|
||||
- interrupts: the interrupt line connected to this I3C master
|
||||
- reg: Offset and length of I3C master registers
|
||||
|
||||
Mandatory properties defined by the generic binding (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details):
|
||||
|
||||
- #address-cells: shall be set to 3
|
||||
- #size-cells: shall be set to 0
|
||||
|
||||
Optional properties defined by the generic binding (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details):
|
||||
|
||||
- i2c-scl-hz
|
||||
- i3c-scl-hz
|
||||
|
||||
I3C device connected on the bus follow the generic description (see
|
||||
Documentation/devicetree/bindings/i3c/i3c.yaml for more details).
|
||||
|
||||
Example:
|
||||
|
||||
i3c-master@2000 {
|
||||
compatible = "snps,dw-i3c-master-1.00a";
|
||||
#address-cells = <3>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x02000 0x1000>;
|
||||
interrupts = <0>;
|
||||
clocks = <&i3cclk>;
|
||||
|
||||
eeprom@57{
|
||||
compatible = "atmel,24c01";
|
||||
reg = <0x57 0x0 0x10>;
|
||||
pagesize = <0x8>;
|
||||
};
|
||||
};
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/i3c/snps,dw-i3c-master.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Synopsys DesignWare I3C master block
|
||||
|
||||
maintainers:
|
||||
- Alexandre Belloni <alexandre.belloni@bootlin.com>
|
||||
|
||||
allOf:
|
||||
- $ref: i3c.yaml#
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
const: snps,dw-i3c-master-1.00a
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
maxItems: 1
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- clocks
|
||||
- interrupts
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
i3c-master@2000 {
|
||||
compatible = "snps,dw-i3c-master-1.00a";
|
||||
#address-cells = <3>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x02000 0x1000>;
|
||||
interrupts = <0>;
|
||||
clocks = <&i3cclk>;
|
||||
|
||||
eeprom@57{
|
||||
compatible = "atmel,24c01";
|
||||
reg = <0x57 0x0 0x10>;
|
||||
pagesize = <0x8>;
|
||||
};
|
||||
};
|
||||
...
|
||||
|
|
@ -9319,13 +9319,13 @@ F: drivers/i2c/i2c-stub.c
|
|||
I3C DRIVER FOR CADENCE I3C MASTER IP
|
||||
M: Przemysław Gaj <pgaj@cadence.com>
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
|
||||
F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
|
||||
F: drivers/i3c/master/i3c-master-cdns.c
|
||||
|
||||
I3C DRIVER FOR SYNOPSYS DESIGNWARE
|
||||
M: Vitor Soares <vitor.soares@synopsys.com>
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
|
||||
F: Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
|
||||
F: drivers/i3c/master/dw*
|
||||
|
||||
I3C SUBSYSTEM
|
||||
|
|
|
|||
|
|
@ -768,13 +768,8 @@ static int i3c_hci_probe(struct platform_device *pdev)
|
|||
static int i3c_hci_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct i3c_hci *hci = platform_get_drvdata(pdev);
|
||||
int ret;
|
||||
|
||||
ret = i3c_master_unregister(&hci->master);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
return i3c_master_unregister(&hci->master);
|
||||
}
|
||||
|
||||
static const __maybe_unused struct of_device_id i3c_hci_of_match[] = {
|
||||
|
|
|
|||
|
|
@ -1597,12 +1597,11 @@ static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
|
|||
static int __maybe_unused svc_i3c_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct svc_i3c_master *master = dev_get_drvdata(dev);
|
||||
int ret = 0;
|
||||
|
||||
pinctrl_pm_select_default_state(dev);
|
||||
svc_i3c_master_prepare_clks(master);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops svc_i3c_pm_ops = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue