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 v2 7/8] dt-bindings: firmware: amlogic, scpi: Convert to json schema
Date: Tue, 1 Jun 2021 23:49:03 +0100 [thread overview]
Message-ID: <20210601224904.917990-8-sudeep.holla@arm.com> (raw)
In-Reply-To: <20210601224904.917990-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 | 32 +++++++++++++++++++
2 files changed, 32 insertions(+), 15 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 b44a5a7040fc..59eea4e0fbed 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: |
@@ -62,6 +66,10 @@ description: |
oneOf:
- const: arm,scpi-sensors
- const: arm,scpi-power-domains
+ - items:
+ - enum:
+ - amlogic,meson-gxbb-scpi-sensors
+ - const: arm,scpi-sensors
"^clocks(-[0-9a-f]+)?$":
type: object
@@ -282,4 +290,28 @@ description: |
};
};
+ - |
+ firmware {
+ scpi {
+ compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";
+ mboxes = <&mailbox 1 &mailbox 2>;
+ shmem = <&cpu_scp_lpri &cpu_scp_hpri>;
+
+ clocks {
+ compatible = "arm,scpi-clocks";
+
+ scpi_dvfs1: clocks-0 {
+ compatible = "arm,scpi-dvfs-clocks";
+ #clock-cells = <1>;
+ clock-indices = <0>;
+ clock-output-names = "vcpu";
+ };
+ };
+
+ 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-01 22:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 22:48 [PATCH v2 0/8] dt-bindings: firmware: Convert SCPI and SCMI to json schema Sudeep Holla
2021-06-01 22:48 ` [PATCH v2 1/8] dt-bindings: firmware: arm, scpi: Move arm, scp-shmem " Sudeep Holla
2021-06-02 15:41 ` [PATCH v2 1/8] dt-bindings: firmware: arm,scpi: Move arm,scp-shmem " Rob Herring
2021-06-01 22:48 ` [PATCH v2 2/8] dt-bindings: firmware: arm, scmi: Move arm, scmi-shmem " Sudeep Holla
2021-06-02 15:41 ` [PATCH v2 2/8] dt-bindings: firmware: arm,scmi: Move arm,scmi-shmem " Rob Herring
2021-06-01 22:48 ` [PATCH v2 3/8] dt-bindings: firmware: juno, scpi: Move to sram.yaml " Sudeep Holla
2021-06-02 15:42 ` [PATCH v2 3/8] dt-bindings: firmware: juno,scpi: " Rob Herring
2021-06-01 22:49 ` [PATCH v2 4/8] dt-bindings: firmware: amlogic, scpi: Move arm, scpi-shmem to " Sudeep Holla
2021-06-02 15:42 ` [PATCH v2 4/8] dt-bindings: firmware: amlogic,scpi: Move arm,scpi-shmem " Rob Herring
2021-06-01 22:49 ` [PATCH v2 5/8] dt-bindings: mailbox : arm, mhu: Fix arm, scpi example used here Sudeep Holla
2021-06-01 22:49 ` [PATCH v2 6/8] dt-bindings: firmware: arm, scpi: Convert to json schema Sudeep Holla
2021-06-02 15:58 ` [PATCH v2 6/8] dt-bindings: firmware: arm,scpi: " Rob Herring
2021-06-02 16:05 ` Sudeep Holla
2021-06-01 22:49 ` Sudeep Holla [this message]
2021-06-01 22:49 ` [PATCH v2 8/8] dt-bindings: firmware: arm, scmi: " Sudeep Holla
2021-06-02 16:16 ` [PATCH v2 8/8] dt-bindings: firmware: arm,scmi: " 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=20210601224904.917990-8-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).