* [PATCH 1/2] dt-bindings: i2c: sun6i-p2wi: Add YAML schemas
@ 2019-05-25 14:18 Maxime Ripard
2019-05-25 14:18 ` [PATCH 2/2] dt-bindings: i2c: mv64xxx: " Maxime Ripard
0 siblings, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2019-05-25 14:18 UTC (permalink / raw)
To: Wolfram Sang, Mark Rutland, Rob Herring, Frank Rowand,
Chen-Yu Tsai, Maxime Ripard
Cc: devicetree, linux-i2c, linux-arm-kernel
Switch the DT binding to a YAML schema to enable the DT validation.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
.../i2c/allwinner,sun6i-a31-p2wi.yaml | 71 +++++++++++++++++++
.../bindings/i2c/i2c-sun6i-p2wi.txt | 41 -----------
2 files changed, 71 insertions(+), 41 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml
delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt
diff --git a/Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml b/Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml
new file mode 100644
index 000000000000..780a33080140
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml
@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/i2c/allwinner,sun6i-a31-p2wi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A31 P2WI (Push/Pull 2 Wires Interface) Device Tree Bindings
+
+maintainers:
+ - Chen-Yu Tsai <wens@csie.org>
+ - Maxime Ripard <maxime.ripard@bootlin.com>
+
+allOf:
+ - $ref: /schemas/i2c/i2c-controller.yaml#
+
+properties:
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 0
+
+ compatible:
+ const: allwinner,sun6i-a31-p2wi
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ resets:
+ maxItems: 1
+
+ clock-frequency:
+ minimum: 1
+ maximum: 6000000
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+ - resets
+
+# FIXME: We should set it, but it would report all the generic
+# properties as additional properties.
+# additionalProperties: false
+
+examples:
+ - |
+ p2wi@1f03400 {
+ compatible = "allwinner,sun6i-a31-p2wi";
+ reg = <0x01f03400 0x400>;
+ interrupts = <0 39 4>;
+ clocks = <&apb0_gates 3>;
+ clock-frequency = <6000000>;
+ resets = <&apb0_rst 3>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ axp221: pmic@68 {
+ compatible = "x-powers,axp221";
+ reg = <0x68>;
+ };
+ };
+
+...
diff --git a/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt b/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt
deleted file mode 100644
index 49df0053347a..000000000000
--- a/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-
-* Allwinner P2WI (Push/Pull 2 Wire Interface) controller
-
-Required properties :
-
- - reg : Offset and length of the register set for the device.
- - compatible : Should one of the following:
- - "allwinner,sun6i-a31-p2wi"
- - interrupts : The interrupt line connected to the P2WI peripheral.
- - clocks : The gate clk connected to the P2WI peripheral.
- - resets : The reset line connected to the P2WI peripheral.
-
-Optional properties :
-
- - clock-frequency : Desired P2WI bus clock frequency in Hz. If not set the
-default frequency is 100kHz
-
-A P2WI may contain one child node encoding a P2WI slave device.
-
-Slave device properties:
- Required properties:
- - reg : the I2C slave address used during the initialization
- process to switch from I2C to P2WI mode
-
-Example:
-
- p2wi@1f03400 {
- compatible = "allwinner,sun6i-a31-p2wi";
- reg = <0x01f03400 0x400>;
- interrupts = <0 39 4>;
- clocks = <&apb0_gates 3>;
- clock-frequency = <6000000>;
- resets = <&apb0_rst 3>;
-
- axp221: pmic@68 {
- compatible = "x-powers,axp221";
- reg = <0x68>;
-
- /* ... */
- };
- };
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] dt-bindings: i2c: mv64xxx: Add YAML schemas
2019-05-25 14:18 [PATCH 1/2] dt-bindings: i2c: sun6i-p2wi: Add YAML schemas Maxime Ripard
@ 2019-05-25 14:18 ` Maxime Ripard
2019-06-03 14:56 ` Gregory CLEMENT
0 siblings, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2019-05-25 14:18 UTC (permalink / raw)
To: Wolfram Sang, Mark Rutland, Rob Herring, Frank Rowand,
Chen-Yu Tsai, Maxime Ripard
Cc: devicetree, linux-i2c, linux-arm-kernel
Switch the DT binding to a YAML schema to enable the DT validation.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
.../devicetree/bindings/i2c/i2c-mv64xxx.txt | 64 -----------
.../bindings/i2c/marvell,mv64xxx-i2c.yaml | 106 ++++++++++++++++++
2 files changed, 106 insertions(+), 64 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
create mode 100644 Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
deleted file mode 100644
index 0ffe65a316ae..000000000000
--- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-
-* Marvell MV64XXX I2C controller
-
-Required properties :
-
- - reg : Offset and length of the register set for the device
- - compatible : Should be either:
- - "allwinner,sun4i-a10-i2c"
- - "allwinner,sun6i-a31-i2c"
- - "marvell,mv64xxx-i2c"
- - "marvell,mv78230-i2c"
- - "marvell,mv78230-a0-i2c"
- * Note: Only use "marvell,mv78230-a0-i2c" for a
- very rare, initial version of the SoC which
- had broken offload support. Linux
- auto-detects this and sets it appropriately.
- - interrupts : The interrupt number
-
-Optional properties :
-
- - clock-frequency : Desired I2C bus clock frequency in Hz. If not set the
-default frequency is 100kHz
-
- - resets : phandle to the parent reset controller. Mandatory
- whenever you're using the "allwinner,sun6i-a31-i2c"
- compatible.
-
- - clocks: : pointers to the reference clocks for this device, the
- first one is the one used for the clock on the i2c bus,
- the second one is the clock used to acces the registers
- of the controller
-
- - clock-names : names of used clocks, mandatory if the second clock is
- used, the name must be "core", and "reg" (the latter is
- only for Armada 7K/8K).
-
-Examples:
-
- i2c@11000 {
- compatible = "marvell,mv64xxx-i2c";
- reg = <0x11000 0x20>;
- interrupts = <29>;
- clock-frequency = <100000>;
- };
-
-For the Armada XP:
-
- i2c@11000 {
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
- reg = <0x11000 0x100>;
- interrupts = <29>;
- clock-frequency = <100000>;
- };
-
-For the Armada 7040:
-
- i2c@701000 {
- compatible = "marvell,mv78230-i2c";
- reg = <0x701000 0x20>;
- interrupts = <29>;
- clock-frequency = <100000>;
- clock-names = "core", "reg";
- clocks = <&core_clock>, <®_clock>;
- };
diff --git a/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml b/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
new file mode 100644
index 000000000000..984c01dccc37
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
@@ -0,0 +1,106 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/i2c/marvell,mv64xxx-i2c.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Marvell MV64XXX I2C Controller Device Tree Bindings
+
+maintainers:
+ - Chen-Yu Tsai <wens@csie.org>
+ - Maxime Ripard <maxime.ripard@bootlin.com>
+
+properties:
+ compatible:
+ oneOf:
+ - const: allwinner,sun4i-a10-i2c
+ - items:
+ - const: allwinner,sun7i-a20-i2c
+ - const: allwinner,sun4i-a10-i2c
+ - const: allwinner,sun6i-a31-i2c
+ - items:
+ - const: allwinner,sun8i-a23-i2c
+ - const: allwinner,sun6i-a31-i2c
+ - items:
+ - const: allwinner,sun8i-a83t-i2c
+ - const: allwinner,sun6i-a31-i2c
+ - items:
+ - const: allwinner,sun50i-a64-i2c
+ - const: allwinner,sun6i-a31-i2c
+
+ - const: marvell,mv64xxx-i2c
+ - const: marvell,mv78230-i2c
+ - const: marvell,mv78230-a0-i2c
+
+ description:
+ Only use "marvell,mv78230-a0-i2c" for a very rare, initial
+ version of the SoC which had broken offload support. Linux
+ auto-detects this and sets it appropriately.
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ minItems: 1
+ maxItems: 2
+ items:
+ - description: Reference clock for the I2C bus
+ - description: Bus clock (Only for Armada 7K/8K)
+
+ clock-names:
+ minItems: 1
+ maxItems: 2
+ items:
+ - const: core
+ - const: reg
+ description:
+ Mandatory if two clocks are used (only for Armada 7k and 8k).
+
+ resets:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+allOf:
+ - $ref: /schemas/i2c/i2c-controller.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - allwinner,sun4i-a10-i2c
+ - allwinner,sun6i-a31-i2c
+
+ then:
+ required:
+ - clocks
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: allwinner,sun6i-a31-i2c
+
+ then:
+ required:
+ - resets
+
+# FIXME: We should set it, but it would report all the generic
+# properties as additional properties.
+# additionalProperties: false
+
+examples:
+ - |
+ timer {
+ compatible = "allwinner,sun4i-a10-timer";
+ reg = <0x01c20c00 0x400>;
+ interrupts = <22>;
+ clocks = <&osc>;
+ };
+...
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] dt-bindings: i2c: mv64xxx: Add YAML schemas
2019-05-25 14:18 ` [PATCH 2/2] dt-bindings: i2c: mv64xxx: " Maxime Ripard
@ 2019-06-03 14:56 ` Gregory CLEMENT
2019-06-05 12:11 ` Maxime Ripard
0 siblings, 1 reply; 4+ messages in thread
From: Gregory CLEMENT @ 2019-06-03 14:56 UTC (permalink / raw)
To: Maxime Ripard, Wolfram Sang, Mark Rutland, Rob Herring,
Frank Rowand, Chen-Yu Tsai
Cc: devicetree, linux-i2c, linux-arm-kernel
Hi,
> Switch the DT binding to a YAML schema to enable the DT validation.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 64 -----------
> .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 106 ++++++++++++++++++
> 2 files changed, 106 insertions(+), 64 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
> create mode 100644 Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
>
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
> deleted file mode 100644
> index 0ffe65a316ae..000000000000
> --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -
> -* Marvell MV64XXX I2C controller
> -
> -Required properties :
> -
> - - reg : Offset and length of the register set for the device
> - - compatible : Should be either:
> - - "allwinner,sun4i-a10-i2c"
> - - "allwinner,sun6i-a31-i2c"
> - - "marvell,mv64xxx-i2c"
> - - "marvell,mv78230-i2c"
> - - "marvell,mv78230-a0-i2c"
> - * Note: Only use "marvell,mv78230-a0-i2c" for a
> - very rare, initial version of the SoC which
> - had broken offload support. Linux
> - auto-detects this and sets it appropriately.
> - - interrupts : The interrupt number
> -
> -Optional properties :
> -
> - - clock-frequency : Desired I2C bus clock frequency in Hz. If not set the
> -default frequency is 100kHz
> -
> - - resets : phandle to the parent reset controller. Mandatory
> - whenever you're using the "allwinner,sun6i-a31-i2c"
> - compatible.
> -
> - - clocks: : pointers to the reference clocks for this device, the
> - first one is the one used for the clock on the i2c bus,
> - the second one is the clock used to acces the registers
> - of the controller
> -
> - - clock-names : names of used clocks, mandatory if the second clock is
> - used, the name must be "core", and "reg" (the latter is
> - only for Armada 7K/8K).
> -
> -Examples:
> -
> - i2c@11000 {
> - compatible = "marvell,mv64xxx-i2c";
> - reg = <0x11000 0x20>;
> - interrupts = <29>;
> - clock-frequency = <100000>;
> - };
> -
> -For the Armada XP:
> -
> - i2c@11000 {
> - compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
> - reg = <0x11000 0x100>;
> - interrupts = <29>;
> - clock-frequency = <100000>;
> - };
> -
> -For the Armada 7040:
> -
> - i2c@701000 {
> - compatible = "marvell,mv78230-i2c";
> - reg = <0x701000 0x20>;
> - interrupts = <29>;
> - clock-frequency = <100000>;
> - clock-names = "core", "reg";
> - clocks = <&core_clock>, <®_clock>;
> - };
> diff --git a/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml b/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
> new file mode 100644
> index 000000000000..984c01dccc37
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
> @@ -0,0 +1,106 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/i2c/marvell,mv64xxx-i2c.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Marvell MV64XXX I2C Controller Device Tree Bindings
> +
> +maintainers:
> + - Chen-Yu Tsai <wens@csie.org>
> + - Maxime Ripard <maxime.ripard@bootlin.com>
If you take over the maintenanceship and became maintainer for this
driver, then update the MAINTAINERS files too. For now it was assigned
to me, but I don't mind letting this for both of you.
Actually I gave my acked-by to a patch from Wolfram adding the
Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt file to the "I2C
MV64XXX MARVELL AND ALLWINNER DRIVER" entry "MAINTAINERS: add DT
bindings to i2c-mv64xxx" so I guess this patch have to be discarded or
at least updated.
Gregory
> +
> +properties:
> + compatible:
> + oneOf:
> + - const: allwinner,sun4i-a10-i2c
> + - items:
> + - const: allwinner,sun7i-a20-i2c
> + - const: allwinner,sun4i-a10-i2c
> + - const: allwinner,sun6i-a31-i2c
> + - items:
> + - const: allwinner,sun8i-a23-i2c
> + - const: allwinner,sun6i-a31-i2c
> + - items:
> + - const: allwinner,sun8i-a83t-i2c
> + - const: allwinner,sun6i-a31-i2c
> + - items:
> + - const: allwinner,sun50i-a64-i2c
> + - const: allwinner,sun6i-a31-i2c
> +
> + - const: marvell,mv64xxx-i2c
> + - const: marvell,mv78230-i2c
> + - const: marvell,mv78230-a0-i2c
> +
> + description:
> + Only use "marvell,mv78230-a0-i2c" for a very rare, initial
> + version of the SoC which had broken offload support. Linux
> + auto-detects this and sets it appropriately.
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + minItems: 1
> + maxItems: 2
> + items:
> + - description: Reference clock for the I2C bus
> + - description: Bus clock (Only for Armada 7K/8K)
> +
> + clock-names:
> + minItems: 1
> + maxItems: 2
> + items:
> + - const: core
> + - const: reg
> + description:
> + Mandatory if two clocks are used (only for Armada 7k and 8k).
> +
> + resets:
> + maxItems: 1
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +allOf:
> + - $ref: /schemas/i2c/i2c-controller.yaml#
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - allwinner,sun4i-a10-i2c
> + - allwinner,sun6i-a31-i2c
> +
> + then:
> + required:
> + - clocks
> +
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: allwinner,sun6i-a31-i2c
> +
> + then:
> + required:
> + - resets
> +
> +# FIXME: We should set it, but it would report all the generic
> +# properties as additional properties.
> +# additionalProperties: false
> +
> +examples:
> + - |
> + timer {
> + compatible = "allwinner,sun4i-a10-timer";
> + reg = <0x01c20c00 0x400>;
> + interrupts = <22>;
> + clocks = <&osc>;
> + };
> +...
> --
> 2.21.0
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] dt-bindings: i2c: mv64xxx: Add YAML schemas
2019-06-03 14:56 ` Gregory CLEMENT
@ 2019-06-05 12:11 ` Maxime Ripard
0 siblings, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2019-06-05 12:11 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: Mark Rutland, devicetree, Wolfram Sang, Chen-Yu Tsai, Rob Herring,
linux-i2c, Frank Rowand, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1218 bytes --]
Hi,
On Mon, Jun 03, 2019 at 04:56:48PM +0200, Gregory CLEMENT wrote:
> > +++ b/Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
> > @@ -0,0 +1,106 @@
> > +# SPDX-License-Identifier: GPL-2.0
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/i2c/marvell,mv64xxx-i2c.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Marvell MV64XXX I2C Controller Device Tree Bindings
> > +
> > +maintainers:
> > + - Chen-Yu Tsai <wens@csie.org>
> > + - Maxime Ripard <maxime.ripard@bootlin.com>
>
> If you take over the maintenanceship and became maintainer for this
> driver, then update the MAINTAINERS files too. For now it was assigned
> to me, but I don't mind letting this for both of you.
>
> Actually I gave my acked-by to a patch from Wolfram adding the
> Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt file to the "I2C
> MV64XXX MARVELL AND ALLWINNER DRIVER" entry "MAINTAINERS: add DT
> bindings to i2c-mv64xxx" so I guess this patch have to be discarded or
> at least updated.
Sorry for that, it's definitely not intentional. I'll fix it and resend.
Thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-05 12:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-25 14:18 [PATCH 1/2] dt-bindings: i2c: sun6i-p2wi: Add YAML schemas Maxime Ripard
2019-05-25 14:18 ` [PATCH 2/2] dt-bindings: i2c: mv64xxx: " Maxime Ripard
2019-06-03 14:56 ` Gregory CLEMENT
2019-06-05 12:11 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).