Changes since v3:
- Add missing patch version in mail subject
- No change to patches.
Changes since v2:
- Add compatible for mt8192
- Convert mtk,scp.txt to mtk,scp.yaml
- Refine clock checking method
Changes since v1:
- Fix missing 'compatible' line in binding document
Tinghan Shen (4):
dt-bindings: remoteproc: mediatek: Add binding for mt8195 scp
dt-bindings: remoteproc: mediatek: Add binding for mt8192 scp
dt-bindings: remoteproc: mediatek: Convert mtk,scp to json-schema
remoteproc: mediatek: Support mt8195 scp
.../bindings/remoteproc/mtk,scp.txt | 36 --------
.../bindings/remoteproc/mtk,scp.yaml | 85 +++++++++++++++++++
drivers/remoteproc/mtk_scp.c | 3 +-
3 files changed, 87 insertions(+), 37 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
--
2.18.0
Convert the mtk,scp binding to DT schema format using json-schema.
Signed-off-by: Tinghan Shen <[email protected]>
---
.../bindings/remoteproc/mtk,scp.txt | 41 ---------
.../bindings/remoteproc/mtk,scp.yaml | 85 +++++++++++++++++++
2 files changed, 85 insertions(+), 41 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
deleted file mode 100644
index 88f37dee7bca..000000000000
--- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Mediatek SCP Bindings
-----------------------------------------
-
-This binding provides support for ARM Cortex M4 Co-processor found on some
-Mediatek SoCs.
-
-Required properties:
-- compatible Should be one of:
- "mediatek,mt8183-scp"
- "mediatek,mt8192-scp"
- "mediatek,mt8195-scp"
-- reg Should contain the address ranges for memory regions:
- SRAM, CFG, and L1TCM.
-- reg-names Contains the corresponding names for the memory regions:
- "sram", "cfg", and "l1tcm".
-- clocks Required by mt8183 and mt8192. Clock for co-processor
- (See: ../clock/clock-bindings.txt)
-- clock-names Required by mt8183 and mt8192. Contains the
- corresponding name for the clock. This should be
- named "main".
-
-Subnodes
---------
-
-Subnodes of the SCP represent rpmsg devices. The names of the devices are not
-important. The properties of these nodes are defined by the individual bindings
-for the rpmsg devices - but must contain the following property:
-
-- mtk,rpmsg-name Contains the name for the rpmsg device. Used to match
- the subnode to rpmsg device announced by SCP.
-
-Example:
-
- scp: scp@10500000 {
- compatible = "mediatek,mt8183-scp";
- reg = <0 0x10500000 0 0x80000>,
- <0 0x105c0000 0 0x5000>;
- reg-names = "sram", "cfg";
- clocks = <&infracfg CLK_INFRA_SCPSYS>;
- clock-names = "main";
- };
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
new file mode 100644
index 000000000000..dc5fcbe65dae
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
@@ -0,0 +1,85 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/remoteproc/mtk,scp.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Mediatek SCP Bindings
+
+maintainers:
+ - Tinghan Shen <[email protected]>
+
+description:
+ This binding provides support for ARM Cortex M4 Co-processor found on some
+ Mediatek SoCs.
+
+properties:
+ compatible:
+ enum:
+ - mediatek,mt8183-scp
+ - mediatek,mt8192-scp
+ - mediatek,mt8195-scp
+
+ reg:
+ description: |
+ Should contain the address ranges for memory regions SRAM and CFG,
+ maxItems: 2
+
+ reg-names:
+ description: |
+ Contains the corresponding names for the two memory regions. These
+ should be named "sram", "cfg".
+
+ clocks:
+ description: |
+ Clock for co-processor (see ../clock/clock-bindings.txt).
+ Required by mt8183 and mt8192.
+ maxItems: 1
+
+ clock-names:
+ description: |
+ Contains the corresponding name for the clock. This should be
+ named "main". Required by mt8183 and mt8192.
+
+required:
+ - compatible
+ - reg
+ - reg-names
+
+patternProperties:
+ ".*":
+ if:
+ type: object
+ then:
+ description:
+ Subnodes of the SCP represent rpmsg devices. The names of the devices
+ are not important. The properties of these nodes are defined by the
+ individual bindings for the rpmsg devices.
+
+ properties:
+ mtk,rpmsg-name:
+ description:
+ Contains the name for the rpmsg device. Used to match
+ the subnode to rpmsg device announced by SCP.
+
+ required:
+ - mtk,rpmsg-name
+
+additionalProperties: true
+
+examples:
+ - |
+ #include <dt-bindings/clock/mt8183-clk.h>
+
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ scp: scp@10500000 {
+ compatible = "mediatek,mt8183-scp";
+ reg = <0 0x10500000 0 0x80000>,
+ <0 0x105c0000 0 0x5000>;
+ reg-names = "sram", "cfg";
+ clocks = <&infracfg CLK_INFRA_SCPSYS>;
+ clock-names = "main";
+ };
+ };
--
2.18.0
Add mt8195 compatible to binding document. The description of required
properties are also modified to reflect the hardware change between
mt8183 and mt8195. The mt8195 doesn't have to control the scp clock on
kernel side.
Signed-off-by: Tinghan Shen <[email protected]>
---
Documentation/devicetree/bindings/remoteproc/mtk,scp.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
index 3f5f78764b60..d64466eefbe3 100644
--- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
+++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
@@ -5,13 +5,15 @@ This binding provides support for ARM Cortex M4 Co-processor found on some
Mediatek SoCs.
Required properties:
-- compatible Should be "mediatek,mt8183-scp"
+- compatible Should be one of:
+ "mediatek,mt8183-scp"
+ "mediatek,mt8195-scp"
- reg Should contain the address ranges for memory regions:
SRAM, CFG, and L1TCM.
- reg-names Contains the corresponding names for the memory regions:
"sram", "cfg", and "l1tcm".
-- clocks Clock for co-processor (See: ../clock/clock-bindings.txt)
-- clock-names Contains the corresponding name for the clock. This
+- clocks Required by mt8183. Clock for co-processor (See: ../clock/clock-bindings.txt)
+- clock-names Required by mt8183. Contains the corresponding name for the clock. This
should be named "main".
Subnodes
--
2.18.0
The SCP clock design is changed on mt8195 that doesn't need to control
SCP clock on kernel side.
Signed-off-by: Tinghan Shen <[email protected]>
---
drivers/remoteproc/mtk_scp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 9679cc26895e..250cb946ea37 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -785,7 +785,7 @@ static int scp_probe(struct platform_device *pdev)
if (ret)
goto destroy_mutex;
- scp->clk = devm_clk_get(dev, "main");
+ scp->clk = devm_clk_get_optional(dev, "main");
if (IS_ERR(scp->clk)) {
dev_err(dev, "Failed to get clock\n");
ret = PTR_ERR(scp->clk);
@@ -877,6 +877,7 @@ static const struct mtk_scp_of_data mt8192_of_data = {
static const struct of_device_id mtk_scp_of_match[] = {
{ .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data },
{ .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
+ { .compatible = "mediatek,mt8195-scp", .data = &mt8192_of_data },
{},
};
MODULE_DEVICE_TABLE(of, mtk_scp_of_match);
--
2.18.0
On Wed, Jul 28, 2021 at 11:58:59AM +0800, Tinghan Shen wrote:
> The SCP clock design is changed on mt8195 that doesn't need to control
> SCP clock on kernel side.
>
> Signed-off-by: Tinghan Shen <[email protected]>
Reviewed-by: Tzung-Bi Shih <[email protected]>
On Tue 27 Jul 22:58 CDT 2021, Tinghan Shen wrote:
> The SCP clock design is changed on mt8195 that doesn't need to control
> SCP clock on kernel side.
>
> Signed-off-by: Tinghan Shen <[email protected]>
> ---
> drivers/remoteproc/mtk_scp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 9679cc26895e..250cb946ea37 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -785,7 +785,7 @@ static int scp_probe(struct platform_device *pdev)
> if (ret)
> goto destroy_mutex;
>
> - scp->clk = devm_clk_get(dev, "main");
> + scp->clk = devm_clk_get_optional(dev, "main");
This makes the clock optional for mt8183 and mt8192 as well.
How about using mtk_scp_of_data to denote if the clock should be
acquired?
Regards,
Bjorn
> if (IS_ERR(scp->clk)) {
> dev_err(dev, "Failed to get clock\n");
> ret = PTR_ERR(scp->clk);
> @@ -877,6 +877,7 @@ static const struct mtk_scp_of_data mt8192_of_data = {
> static const struct of_device_id mtk_scp_of_match[] = {
> { .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data },
> { .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
> + { .compatible = "mediatek,mt8195-scp", .data = &mt8192_of_data },
> {},
> };
> MODULE_DEVICE_TABLE(of, mtk_scp_of_match);
> --
> 2.18.0
>
On Tue 27 Jul 22:58 CDT 2021, Tinghan Shen wrote:
> Convert the mtk,scp binding to DT schema format using json-schema.
>
> Signed-off-by: Tinghan Shen <[email protected]>
> ---
> .../bindings/remoteproc/mtk,scp.txt | 41 ---------
> .../bindings/remoteproc/mtk,scp.yaml | 85 +++++++++++++++++++
> 2 files changed, 85 insertions(+), 41 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
>
> diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> deleted file mode 100644
> index 88f37dee7bca..000000000000
> --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -Mediatek SCP Bindings
> -----------------------------------------
> -
> -This binding provides support for ARM Cortex M4 Co-processor found on some
> -Mediatek SoCs.
> -
> -Required properties:
> -- compatible Should be one of:
> - "mediatek,mt8183-scp"
> - "mediatek,mt8192-scp"
> - "mediatek,mt8195-scp"
> -- reg Should contain the address ranges for memory regions:
> - SRAM, CFG, and L1TCM.
> -- reg-names Contains the corresponding names for the memory regions:
> - "sram", "cfg", and "l1tcm".
> -- clocks Required by mt8183 and mt8192. Clock for co-processor
> - (See: ../clock/clock-bindings.txt)
> -- clock-names Required by mt8183 and mt8192. Contains the
> - corresponding name for the clock. This should be
> - named "main".
> -
> -Subnodes
> ---------
> -
> -Subnodes of the SCP represent rpmsg devices. The names of the devices are not
> -important. The properties of these nodes are defined by the individual bindings
> -for the rpmsg devices - but must contain the following property:
> -
> -- mtk,rpmsg-name Contains the name for the rpmsg device. Used to match
> - the subnode to rpmsg device announced by SCP.
> -
> -Example:
> -
> - scp: scp@10500000 {
> - compatible = "mediatek,mt8183-scp";
> - reg = <0 0x10500000 0 0x80000>,
> - <0 0x105c0000 0 0x5000>;
> - reg-names = "sram", "cfg";
> - clocks = <&infracfg CLK_INFRA_SCPSYS>;
> - clock-names = "main";
> - };
> diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
> new file mode 100644
> index 000000000000..dc5fcbe65dae
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
> @@ -0,0 +1,85 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/remoteproc/mtk,scp.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Mediatek SCP Bindings
> +
> +maintainers:
> + - Tinghan Shen <[email protected]>
> +
> +description:
> + This binding provides support for ARM Cortex M4 Co-processor found on some
> + Mediatek SoCs.
> +
> +properties:
> + compatible:
> + enum:
> + - mediatek,mt8183-scp
> + - mediatek,mt8192-scp
> + - mediatek,mt8195-scp
> +
> + reg:
> + description: |
The '|' means that you want to preserve the formatting of the text
segment, there's no need for that.
> + Should contain the address ranges for memory regions SRAM and CFG,
> + maxItems: 2
> +
> + reg-names:
> + description: |
> + Contains the corresponding names for the two memory regions. These
> + should be named "sram", "cfg".
reg-names:
items:
- sram
- cfg
> +
> + clocks:
> + description: |
> + Clock for co-processor (see ../clock/clock-bindings.txt).
> + Required by mt8183 and mt8192.
> + maxItems: 1
> +
> + clock-names:
> + description: |
> + Contains the corresponding name for the clock. This should be
> + named "main". Required by mt8183 and mt8192.
clock-names:
const: main
> +
> +required:
> + - compatible
> + - reg
> + - reg-names
The old binding, and the comment about clocks above, says that clocks
and clock-names are required for mt8183 and mt8192.
> +
> +patternProperties:
> + ".*":
> + if:
> + type: object
> + then:
> + description:
> + Subnodes of the SCP represent rpmsg devices. The names of the devices
> + are not important. The properties of these nodes are defined by the
> + individual bindings for the rpmsg devices.
> +
> + properties:
> + mtk,rpmsg-name:
> + description:
> + Contains the name for the rpmsg device. Used to match
> + the subnode to rpmsg device announced by SCP.
> +
> + required:
> + - mtk,rpmsg-name
> +
> +additionalProperties: true
What additional properties do you expect?
> +
> +examples:
> + - |
> + #include <dt-bindings/clock/mt8183-clk.h>
> +
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
Skip soc and the two #-cells, and rewrite the reg to only use 1 address
and size-cell.
> + scp: scp@10500000 {
The label doesn't add value in the example, please skip this.
> + compatible = "mediatek,mt8183-scp";
> + reg = <0 0x10500000 0 0x80000>,
> + <0 0x105c0000 0 0x5000>;
> + reg-names = "sram", "cfg";
> + clocks = <&infracfg CLK_INFRA_SCPSYS>;
> + clock-names = "main";
Can you please also add a subnode, to capture that part of the binding
as well?
Regards,
Bjorn
> + };
> + };
> --
> 2.18.0
>
On Wed, 28 Jul 2021 11:58:56 +0800, Tinghan Shen wrote:
> Add mt8195 compatible to binding document. The description of required
> properties are also modified to reflect the hardware change between
> mt8183 and mt8195. The mt8195 doesn't have to control the scp clock on
> kernel side.
>
> Signed-off-by: Tinghan Shen <[email protected]>
> ---
> Documentation/devicetree/bindings/remoteproc/mtk,scp.txt | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
Acked-by: Rob Herring <[email protected]>
On Wed, Jul 28, 2021 at 11:58:58AM +0800, Tinghan Shen wrote:
> Convert the mtk,scp binding to DT schema format using json-schema.
>
> Signed-off-by: Tinghan Shen <[email protected]>
> ---
> .../bindings/remoteproc/mtk,scp.txt | 41 ---------
> .../bindings/remoteproc/mtk,scp.yaml | 85 +++++++++++++++++++
> 2 files changed, 85 insertions(+), 41 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
>
> diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> deleted file mode 100644
> index 88f37dee7bca..000000000000
> --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -Mediatek SCP Bindings
> -----------------------------------------
> -
> -This binding provides support for ARM Cortex M4 Co-processor found on some
> -Mediatek SoCs.
> -
> -Required properties:
> -- compatible Should be one of:
> - "mediatek,mt8183-scp"
> - "mediatek,mt8192-scp"
> - "mediatek,mt8195-scp"
> -- reg Should contain the address ranges for memory regions:
> - SRAM, CFG, and L1TCM.
> -- reg-names Contains the corresponding names for the memory regions:
> - "sram", "cfg", and "l1tcm".
> -- clocks Required by mt8183 and mt8192. Clock for co-processor
> - (See: ../clock/clock-bindings.txt)
> -- clock-names Required by mt8183 and mt8192. Contains the
> - corresponding name for the clock. This should be
> - named "main".
> -
> -Subnodes
> ---------
> -
> -Subnodes of the SCP represent rpmsg devices. The names of the devices are not
> -important. The properties of these nodes are defined by the individual bindings
> -for the rpmsg devices - but must contain the following property:
> -
> -- mtk,rpmsg-name Contains the name for the rpmsg device. Used to match
> - the subnode to rpmsg device announced by SCP.
> -
> -Example:
> -
> - scp: scp@10500000 {
> - compatible = "mediatek,mt8183-scp";
> - reg = <0 0x10500000 0 0x80000>,
> - <0 0x105c0000 0 0x5000>;
> - reg-names = "sram", "cfg";
> - clocks = <&infracfg CLK_INFRA_SCPSYS>;
> - clock-names = "main";
> - };
> diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
> new file mode 100644
> index 000000000000..dc5fcbe65dae
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
> @@ -0,0 +1,85 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/remoteproc/mtk,scp.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Mediatek SCP Bindings
> +
> +maintainers:
> + - Tinghan Shen <[email protected]>
> +
> +description:
> + This binding provides support for ARM Cortex M4 Co-processor found on some
> + Mediatek SoCs.
> +
> +properties:
> + compatible:
> + enum:
> + - mediatek,mt8183-scp
> + - mediatek,mt8192-scp
> + - mediatek,mt8195-scp
> +
> + reg:
> + description: |
> + Should contain the address ranges for memory regions SRAM and CFG,
> + maxItems: 2
> +
> + reg-names:
> + description: |
> + Contains the corresponding names for the two memory regions. These
> + should be named "sram", "cfg".
> +
> + clocks:
> + description: |
> + Clock for co-processor (see ../clock/clock-bindings.txt).
> + Required by mt8183 and mt8192.
> + maxItems: 1
> +
> + clock-names:
> + description: |
> + Contains the corresponding name for the clock. This should be
> + named "main". Required by mt8183 and mt8192.
> +
> +required:
> + - compatible
> + - reg
> + - reg-names
> +
> +patternProperties:
> + ".*":
> + if:
> + type: object
> + then:
This can be replaced with:
additionalProperties:
type: object
... and the rest below here:
> + description:
> + Subnodes of the SCP represent rpmsg devices. The names of the devices
> + are not important. The properties of these nodes are defined by the
> + individual bindings for the rpmsg devices.
> +
> + properties:
> + mtk,rpmsg-name:
> + description:
> + Contains the name for the rpmsg device. Used to match
> + the subnode to rpmsg device announced by SCP.
> +
> + required:
> + - mtk,rpmsg-name
> +
> +additionalProperties: true
> +
> +examples:
> + - |
> + #include <dt-bindings/clock/mt8183-clk.h>
> +
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + scp: scp@10500000 {
Drop unused labels.
> + compatible = "mediatek,mt8183-scp";
> + reg = <0 0x10500000 0 0x80000>,
> + <0 0x105c0000 0 0x5000>;
> + reg-names = "sram", "cfg";
> + clocks = <&infracfg CLK_INFRA_SCPSYS>;
> + clock-names = "main";
> + };
> + };
> --
> 2.18.0
>
>