From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Sebastian Reichel <sre@kernel.org>
Cc: Tony Lindgren <tony@atomide.com>,
devicetree@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: [PATCH v2 2/7] dt-bindings: hsi: nokia-modem: convert to YAML
Date: Wed, 27 Mar 2024 20:11:33 +0100 [thread overview]
Message-ID: <20240327-hsi-dt-binding-v2-2-110fab4c32ae@collabora.com> (raw)
In-Reply-To: <20240327-hsi-dt-binding-v2-0-110fab4c32ae@collabora.com>
Convert the legacy txt binding to modern YAML.
No semantic change.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
.../devicetree/bindings/hsi/nokia,modem.yaml | 106 +++++++++++++++++++++
.../devicetree/bindings/hsi/nokia-modem.txt | 59 ------------
2 files changed, 106 insertions(+), 59 deletions(-)
diff --git a/Documentation/devicetree/bindings/hsi/nokia,modem.yaml b/Documentation/devicetree/bindings/hsi/nokia,modem.yaml
new file mode 100644
index 000000000000..f6d5e2c14329
--- /dev/null
+++ b/Documentation/devicetree/bindings/hsi/nokia,modem.yaml
@@ -0,0 +1,106 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/hsi/nokia,modem.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Nokia modem
+
+maintainers:
+ - Sebastian Reichel <sre@kernel.org>
+
+properties:
+ compatible:
+ enum:
+ - nokia,n900-modem
+ - nokia,n950-modem
+ - nokia,n9-modem
+
+ hsi-channel-ids:
+ $ref: /schemas/types.yaml#/definitions/uint32-array
+ minItems: 4
+ maxItems: 4
+
+ hsi-channel-names:
+ items:
+ - const: mcsaab-control
+ - const: speech-control
+ - const: speech-data
+ - const: mcsaab-data
+
+ interrupts:
+ items:
+ - description: modem reset indication
+
+ gpios:
+ minItems: 3
+ maxItems: 5
+
+ gpio-names:
+ items:
+ - const: cmt_apeslpx
+ - const: cmt_rst_rq
+ - const: cmt_en
+ - const: cmt_rst
+ - const: cmt_bsi
+ minItems: 3
+
+required:
+ - gpios
+ - gpio-names
+ - interrupts
+
+allOf:
+ - $ref: hsi-client.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - nokia,n950-modem
+ - nokia,n9-modem
+ then:
+ properties:
+ gpios:
+ maxItems: 3
+ gpio-names:
+ maxItems: 3
+ else:
+ properties:
+ gpios:
+ minItems: 5
+ gpio-names:
+ minItems: 5
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ modem {
+ compatible = "nokia,n900-modem";
+
+ hsi-channel-ids = <0>, <1>, <2>, <3>;
+ hsi-channel-names = "mcsaab-control",
+ "speech-control",
+ "speech-data",
+ "mcsaab-data";
+ hsi-speed-kbps = <55000>;
+ hsi-mode = "frame";
+ hsi-flow = "synchronized";
+ hsi-arb-mode = "round-robin";
+
+ interrupts-extended = <&gpio3 8 IRQ_TYPE_EDGE_FALLING>;
+
+ gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>,
+ <&gpio3 9 GPIO_ACTIVE_HIGH>,
+ <&gpio3 10 GPIO_ACTIVE_HIGH>,
+ <&gpio3 11 GPIO_ACTIVE_HIGH>,
+ <&gpio5 29 GPIO_ACTIVE_HIGH>;
+ gpio-names = "cmt_apeslpx",
+ "cmt_rst_rq",
+ "cmt_en",
+ "cmt_rst",
+ "cmt_bsi";
+ };
diff --git a/Documentation/devicetree/bindings/hsi/nokia-modem.txt b/Documentation/devicetree/bindings/hsi/nokia-modem.txt
deleted file mode 100644
index 53de1d9d0b95..000000000000
--- a/Documentation/devicetree/bindings/hsi/nokia-modem.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Nokia modem client bindings
-
-The Nokia modem HSI client follows the common HSI client binding
-and inherits all required properties. The following additional
-properties are needed by the Nokia modem HSI client:
-
-Required properties:
-- compatible: Should be one of
- "nokia,n900-modem"
- "nokia,n950-modem"
- "nokia,n9-modem"
-- hsi-channel-names: Should contain the following strings
- "mcsaab-control"
- "speech-control"
- "speech-data"
- "mcsaab-data"
-- gpios: Should provide a GPIO handler for each GPIO listed in
- gpio-names
-- gpio-names: Should contain the following strings
- "cmt_apeslpx" (for n900, n950, n9)
- "cmt_rst_rq" (for n900, n950, n9)
- "cmt_en" (for n900, n950, n9)
- "cmt_rst" (for n900)
- "cmt_bsi" (for n900)
-- interrupts: Should be IRQ handle for modem's reset indication
-
-Example:
-
-&ssi_port {
- modem: hsi-client {
- compatible = "nokia,n900-modem";
-
- pinctrl-names = "default";
- pinctrl-0 = <&modem_pins>;
-
- hsi-channel-ids = <0>, <1>, <2>, <3>;
- hsi-channel-names = "mcsaab-control",
- "speech-control",
- "speech-data",
- "mcsaab-data";
- hsi-speed-kbps = <55000>;
- hsi-mode = "frame";
- hsi-flow = "synchronized";
- hsi-arb-mode = "round-robin";
-
- interrupts-extended = <&gpio3 8 IRQ_TYPE_EDGE_FALLING>; /* 72 */
-
- gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>, /* 70 */
- <&gpio3 9 GPIO_ACTIVE_HIGH>, /* 73 */
- <&gpio3 10 GPIO_ACTIVE_HIGH>, /* 74 */
- <&gpio3 11 GPIO_ACTIVE_HIGH>, /* 75 */
- <&gpio5 29 GPIO_ACTIVE_HIGH>; /* 157 */
- gpio-names = "cmt_apeslpx",
- "cmt_rst_rq",
- "cmt_en",
- "cmt_rst",
- "cmt_bsi";
- };
-};
--
2.43.0
next prev parent reply other threads:[~2024-03-27 19:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 19:11 [PATCH v2 0/7] Convert MIPI HSI DT bindings to YAML Sebastian Reichel
2024-03-27 19:11 ` [PATCH v2 1/7] dt-bindings: hsi: hsi-client: convert " Sebastian Reichel
2024-03-28 9:27 ` Krzysztof Kozlowski
2024-03-27 19:11 ` Sebastian Reichel [this message]
2024-03-28 9:28 ` [PATCH v2 2/7] dt-bindings: hsi: nokia-modem: " Krzysztof Kozlowski
2024-03-27 19:11 ` [PATCH v2 3/7] dt-bindings: hsi: omap-ssi: " Sebastian Reichel
2024-03-28 9:30 ` Krzysztof Kozlowski
2024-03-27 19:11 ` [PATCH v2 4/7] ARM: dts: omap4: fix hsi-port node name Sebastian Reichel
2024-03-28 9:30 ` Krzysztof Kozlowski
2024-03-27 19:11 ` [PATCH v2 5/7] ARM: dts: omap3: fix ssi-port " Sebastian Reichel
2024-03-28 9:30 ` Krzysztof Kozlowski
2024-03-27 19:11 ` [PATCH v2 6/7] ARM: dts: omap3: fix ti,ssi-cawake-gpio property name Sebastian Reichel
2024-03-28 9:30 ` Krzysztof Kozlowski
2024-03-27 19:11 ` [PATCH v2 7/7] ARM: dts: omap3: use generic node name for hsi clients Sebastian Reichel
2024-03-28 9:31 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240327-hsi-dt-binding-v2-2-110fab4c32ae@collabora.com \
--to=sebastian.reichel@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox