From: Sudeep Holla <sudeep.holla@arm.com>
To: devicetree@vger.kernel.org
Cc: Sudeep Holla <sudeep.holla@arm.com>,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>,
Cristian Marussi <cristian.marussi@arm.com>,
Kevin Hilman <khilman@baylibre.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>
Subject: [PATCH v3 3/6] dt-bindings: firmware: amlogic, scpi: Convert to json schema
Date: Fri, 4 Jun 2021 21:57:07 +0100 [thread overview]
Message-ID: <20210604205710.1944363-4-sudeep.holla@arm.com> (raw)
In-Reply-To: <20210604205710.1944363-1-sudeep.holla@arm.com>
Convert/merge the existing text format SCPI binding additions for
amlogic,scpi into the common arm,scpi json scheme.
Couple of things to note:
"amlogic,meson-gxbb-scpi" is always used with "arm,scpi-pre-1.0" and
"amlogic,meson-gxbb-scpi-sensors" is used always with "arm,scpi-sensors"
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
.../devicetree/bindings/arm/amlogic,scpi.txt | 15 ------------
.../bindings/firmware/arm,scpi.yaml | 24 ++++++++++++++++++-
2 files changed, 23 insertions(+), 16 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/amlogic,scpi.txt
diff --git a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt
deleted file mode 100644
index ebfe302fb747..000000000000
--- a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-System Control and Power Interface (SCPI) Message Protocol
-(in addition to the standard binding in [0])
-----------------------------------------------------------
-Required properties
-
-- compatible : should be "amlogic,meson-gxbb-scpi"
-
-Sensor bindings for the sensors based on SCPI Message Protocol
---------------------------------------------------------------
-SCPI provides an API to access the various sensors on the SoC.
-
-Required properties:
-- compatible : should be "amlogic,meson-gxbb-scpi-sensors".
-
-[0] Documentation/devicetree/bindings/arm/arm,scpi.txt
diff --git a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml
index 6cb70e2008fc..ce429cf2bdc0 100644
--- a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml
+++ b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml
@@ -32,6 +32,10 @@ description: |
oneOf:
- const: arm,scpi # SCPI v1.0 and above
- const: arm,scpi-pre-1.0 # Unversioned SCPI before v1.0
+ - items:
+ - enum:
+ - amlogic,meson-gxbb-scpi
+ - const: arm,scpi-pre-1.0
mboxes:
description: |
@@ -84,7 +88,12 @@ additionalProperties: false
properties:
compatible:
- const: arm,scpi-sensors
+ oneOf:
+ - const: arm,scpi-sensors
+ - items:
+ - enum:
+ - amlogic,meson-gxbb-scpi-sensors
+ - const: arm,scpi-sensors
'#thermal-sensor-cells':
const: 1
@@ -224,4 +233,17 @@ additionalProperties: false
};
};
+ - |
+ firmware {
+ scpi {
+ compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";
+ mboxes = <&mailbox 1 &mailbox 2>;
+ shmem = <&cpu_scp_lpri &cpu_scp_hpri>;
+
+ scpi_sensors1: sensors {
+ compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors";
+ #thermal-sensor-cells = <1>;
+ };
+ };
+ };
...
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-04 20:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 20:57 [PATCH v3 0/6] dt-bindings: firmware: Convert SCPI and SCMI to json schema Sudeep Holla
2021-06-04 20:57 ` [PATCH v3 1/6] dt-bindings: mailbox : arm, mhu: Fix arm, scpi example used here Sudeep Holla
2021-06-04 21:59 ` [PATCH v3 1/6] dt-bindings: mailbox : arm,mhu: Fix arm,scpi " Rob Herring
2021-06-04 20:57 ` [PATCH v3 2/6] dt-bindings: firmware: arm, scpi: Convert to json schema Sudeep Holla
2021-06-04 22:11 ` [PATCH v3 2/6] dt-bindings: firmware: arm,scpi: " Rob Herring
2021-06-04 20:57 ` Sudeep Holla [this message]
2021-06-04 22:11 ` [PATCH v3 3/6] dt-bindings: firmware: amlogic,scpi: " Rob Herring
2021-06-04 20:57 ` [PATCH v3 4/6] dt-bindings: firmware: arm, scmi: " Sudeep Holla
2021-06-04 22:12 ` [PATCH v3 4/6] dt-bindings: firmware: arm,scmi: " Rob Herring
2021-06-04 20:57 ` [PATCH v3 5/6] dt-bindings: mailbox : arm, mhu: Use examples with matching schema Sudeep Holla
2021-06-04 22:25 ` Rob Herring
2021-06-04 20:57 ` [PATCH v3 6/6] dt-bindings: mailbox : arm, mhuv2: Use example " Sudeep Holla
2021-06-04 22:26 ` [PATCH v3 6/6] dt-bindings: mailbox : arm,mhuv2: " Rob Herring
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=20210604205710.1944363-4-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=cristian.marussi@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=narmstrong@baylibre.com \
--cc=robh+dt@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).