Document the component used to boot SoCCP on Kaanapali SoC and add
compatible for Glymur SoCCP which could fallback to Kaanapali. Extend
the "qcom,smem-states" and "qcom,smem-state-names" properties and
add conditions for the "interrupts" and "interrupt-names" properties
in the pas-common.
Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
---
.../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++
.../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++----
2 files changed, 194 insertions(+), 23 deletions(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
new file mode 100644
index 000000000000..6b53121eede1
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
@@ -0,0 +1,134 @@
+# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/remoteproc/qcom,kaanapali-soccp-pas.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Kaanapali SoCCP Peripheral Authentication Service
+
+maintainers:
+ - Jingyi Wang <jingyi.wang@oss.qualcomm.com>
+
+description:
+ The SoC Control Processor (SoCCP) is small RISC-V MCU that controls USB
+ Type-C, battery charging and various other functions on Qualcomm SoCs, somewhat
+ analogous to traditional PC Embedded Controllers. This document describes
+ the Peripheral Authentication Service loads and boots firmware for SoCCP.
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - qcom,glymur-soccp-pas
+ - const: qcom,kaanapali-soccp-pas
+ - enum:
+ - qcom,kaanapali-soccp-pas
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ items:
+ - description: XO clock
+
+ clock-names:
+ items:
+ - const: xo
+
+ power-domains:
+ items:
+ - description: CX power domain
+ - description: MX power domain
+
+ power-domain-names:
+ items:
+ - const: cx
+ - const: mx
+
+ firmware-name:
+ $ref: /schemas/types.yaml#/definitions/string-array
+ items:
+ - description: Firmware name of the Hexagon core
+ - description: Firmware name of the Hexagon Devicetree
+
+ memory-region:
+ items:
+ - description: Memory region for main Firmware authentication
+ - description: Memory region for Devicetree Firmware authentication
+
+required:
+ - compatible
+ - reg
+ - memory-region
+ - power-domains
+ - power-domain-names
+
+allOf:
+ - $ref: /schemas/remoteproc/qcom,pas-common.yaml#
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/qcom,rpmh.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/mailbox/qcom-ipcc.h>
+ #include <dt-bindings/power/qcom-rpmpd.h>
+
+ remoteproc@d00000 {
+ compatible = "qcom,kaanapali-soccp-pas";
+ reg = <0x00d00000 0x200000>;
+
+ clocks = <&rpmhcc RPMH_CXO_CLK>;
+ clock-names = "xo";
+
+ interrupts-extended = <&intc GIC_SPI 167 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 9 IRQ_TYPE_EDGE_RISING>,
+ <&soccp_smp2p_in 10 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "wdog",
+ "fatal",
+ "ready",
+ "handover",
+ "stop-ack",
+ "pong",
+ "wake-ack";
+
+ memory-region = <&soccp_mem>,
+ <&soccp_dtb_mem_mem>;
+
+ firmware-name = "qcom/kaanapali/soccp.mbn",
+ "qcom/kaanapali/soccp_dtb.mbn";
+
+ power-domains = <&rpmhpd RPMHPD_CX>,
+ <&rpmhpd RPMHPD_MX>;
+ power-domain-names = "cx",
+ "mx";
+
+ qcom,smem-states = <&soccp_smp2p_out 0>,
+ <&soccp_smp2p_out 10>,
+ <&soccp_smp2p_out 9>,
+ <&soccp_smp2p_out 8>;
+ qcom,smem-state-names = "stop",
+ "wakeup",
+ "sleep",
+ "ping";
+
+ glink-edge {
+ interrupts-extended = <&ipcc IPCC_MPROC_SOCCP
+ IPCC_MPROC_SIGNAL_GLINK_QMP
+ IRQ_TYPE_EDGE_RISING>;
+ mboxes = <&ipcc IPCC_MPROC_SOCCP
+ IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+ label = "soccp";
+ qcom,remote-pid = <19>;
+
+ /* ... */
+ };
+ };
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
index 63a82e7a8bf8..f81d088c2bad 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
@@ -24,26 +24,6 @@ properties:
interconnects:
maxItems: 1
- interrupts:
- minItems: 5
- items:
- - description: Watchdog interrupt
- - description: Fatal interrupt
- - description: Ready interrupt
- - description: Handover interrupt
- - description: Stop acknowledge interrupt
- - description: Shutdown acknowledge interrupt
-
- interrupt-names:
- minItems: 5
- items:
- - const: wdog
- - const: fatal
- - const: ready
- - const: handover
- - const: stop-ack
- - const: shutdown-ack
-
power-domains:
minItems: 1
maxItems: 3
@@ -55,13 +35,21 @@ properties:
qcom,smem-states:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: States used by the AP to signal the Hexagon core
+ minItems: 1
items:
- - description: Stop the modem
+ - description: Stop the remoteproc
+ - description: Wake up the remoteproc
+ - description: Make the remoteproc sleep
+ - description: Ping the remoteproc
qcom,smem-state-names:
description: The names of the state bits used for SMP2P output
+ minItems: 1
items:
- const: stop
+ - const: wakeup
+ - const: sleep
+ - const: ping
smd-edge:
$ref: /schemas/remoteproc/qcom,smd-edge.yaml#
@@ -80,9 +68,58 @@ properties:
required:
- clocks
- clock-names
- - interrupts
- - interrupt-names
- qcom,smem-states
- qcom,smem-state-names
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,kaanapali-soccp-pas
+ then:
+ properties:
+ interrupts:
+ items:
+ - description: Watchdog interrupt
+ - description: Fatal interrupt
+ - description: Ready interrupt
+ - description: Handover interrupt
+ - description: Stop acknowledge interrupt
+ - description: Pong interrupt
+ - description: Wake acknowledge interrupt
+
+ interrupt-names:
+ items:
+ - const: wdog
+ - const: fatal
+ - const: ready
+ - const: handover
+ - const: stop-ack
+ - const: pong
+ - const: wake-ack
+
+ else:
+ properties:
+ interrupts:
+ minItems: 5
+ items:
+ - description: Watchdog interrupt
+ - description: Fatal interrupt
+ - description: Ready interrupt
+ - description: Handover interrupt
+ - description: Stop acknowledge interrupt
+ - description: Shutdown acknowledge interrupt
+
+ interrupt-names:
+ minItems: 5
+ items:
+ - const: wdog
+ - const: fatal
+ - const: ready
+ - const: handover
+ - const: stop-ack
+ - const: shutdown-ack
+
additionalProperties: true
--
2.25.1On Wed, Oct 29, 2025 at 01:05:41AM -0700, Jingyi Wang wrote: > Document the component used to boot SoCCP on Kaanapali SoC and add > compatible for Glymur SoCCP which could fallback to Kaanapali. Extend > the "qcom,smem-states" and "qcom,smem-state-names" properties and > add conditions for the "interrupts" and "interrupt-names" properties > in the pas-common. "extend" and "add conditions" but your patch: > - interrupts: > - minItems: 5 > - items: > - - description: Watchdog interrupt > - - description: Fatal interrupt > - - description: Ready interrupt > - - description: Handover interrupt > - - description: Stop acknowledge interrupt > - - description: Shutdown acknowledge interrupt > - > - interrupt-names: > - minItems: 5 > - items: > - - const: wdog > - - const: fatal > - - const: ready > - - const: handover > - - const: stop-ack > - - const: shutdown-ack ...removes them. So no interrupts anymore :/ That looks surprising if not wrong. You cannot remove properties when you want to add grow them. See writing schema as well. Best regards, Krzysztof
On 10/30/2025 2:27 PM, Krzysztof Kozlowski wrote:
> On Wed, Oct 29, 2025 at 01:05:41AM -0700, Jingyi Wang wrote:
>> Document the component used to boot SoCCP on Kaanapali SoC and add
>> compatible for Glymur SoCCP which could fallback to Kaanapali. Extend
>> the "qcom,smem-states" and "qcom,smem-state-names" properties and
>> add conditions for the "interrupts" and "interrupt-names" properties
>> in the pas-common.
>
> "extend" and "add conditions" but your patch:
>
>
>> - interrupts:
>> - minItems: 5
>> - items:
>> - - description: Watchdog interrupt
>> - - description: Fatal interrupt
>> - - description: Ready interrupt
>> - - description: Handover interrupt
>> - - description: Stop acknowledge interrupt
>> - - description: Shutdown acknowledge interrupt
>> -
>> - interrupt-names:
>> - minItems: 5
>> - items:
>> - - const: wdog
>> - - const: fatal
>> - - const: ready
>> - - const: handover
>> - - const: stop-ack
>> - - const: shutdown-ack
>
> ...removes them. So no interrupts anymore :/
>
> That looks surprising if not wrong. You cannot remove properties when
> you want to add grow them. See writing schema as well.
>
> Best regards,
> Krzysztof
>
There might be some misunderstanding on your comments for v1, so I removed
it to allOf part and add "if-else".
If it is changed here, we need to release the constraints like:
interrupts:
minItems: 5
items:
- description: Watchdog interrupt
- description: Fatal interrupt
- description: Ready interrupt
- description: Handover interrupt
- description: Stop acknowledge interrupt
- description: Shutdown acknowledge interrupt
- description: Pong interrupt
- description: Wake acknowledge interrupt
interrupt-names:
minItems: 5
maxItems: 7
items:
enum:
- wdog
- fatal
- ready
- handover
- stop-ack
- shutdown-ack
- pong
- wake-ack
Thanks,
Jingyi
On Wed, Oct 29, 2025 at 01:05:41AM -0700, Jingyi Wang wrote:
> Document the component used to boot SoCCP on Kaanapali SoC and add
> compatible for Glymur SoCCP which could fallback to Kaanapali. Extend
> the "qcom,smem-states" and "qcom,smem-state-names" properties and
> add conditions for the "interrupts" and "interrupt-names" properties
> in the pas-common.
>
> Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
> Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
> ---
> .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++
> .../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++----
> 2 files changed, 194 insertions(+), 23 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
> new file mode 100644
> index 000000000000..6b53121eede1
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
> @@ -0,0 +1,134 @@
> +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/remoteproc/qcom,kaanapali-soccp-pas.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm Kaanapali SoCCP Peripheral Authentication Service
> +
> +maintainers:
> + - Jingyi Wang <jingyi.wang@oss.qualcomm.com>
> +
> +description:
> + The SoC Control Processor (SoCCP) is small RISC-V MCU that controls USB
> + Type-C, battery charging and various other functions on Qualcomm SoCs, somewhat
> + analogous to traditional PC Embedded Controllers. This document describes
> + the Peripheral Authentication Service loads and boots firmware for SoCCP.
> +
> +properties:
> + compatible:
> + oneOf:
> + - items:
> + - enum:
> + - qcom,glymur-soccp-pas
> + - const: qcom,kaanapali-soccp-pas
> + - enum:
> + - qcom,kaanapali-soccp-pas
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + items:
> + - description: XO clock
> +
> + clock-names:
> + items:
> + - const: xo
> +
> + power-domains:
> + items:
> + - description: CX power domain
> + - description: MX power domain
> +
> + power-domain-names:
> + items:
> + - const: cx
> + - const: mx
> +
> + firmware-name:
> + $ref: /schemas/types.yaml#/definitions/string-array
Already has a type. Drop.
> + items:
> + - description: Firmware name of the Hexagon core
> + - description: Firmware name of the Hexagon Devicetree
> +
> + memory-region:
> + items:
> + - description: Memory region for main Firmware authentication
> + - description: Memory region for Devicetree Firmware authentication
> +
> +required:
> + - compatible
> + - reg
> + - memory-region
> + - power-domains
> + - power-domain-names
> +
> +allOf:
> + - $ref: /schemas/remoteproc/qcom,pas-common.yaml#
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/clock/qcom,rpmh.h>
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/mailbox/qcom-ipcc.h>
> + #include <dt-bindings/power/qcom-rpmpd.h>
> +
> + remoteproc@d00000 {
> + compatible = "qcom,kaanapali-soccp-pas";
> + reg = <0x00d00000 0x200000>;
> +
> + clocks = <&rpmhcc RPMH_CXO_CLK>;
> + clock-names = "xo";
> +
> + interrupts-extended = <&intc GIC_SPI 167 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 9 IRQ_TYPE_EDGE_RISING>,
> + <&soccp_smp2p_in 10 IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "wdog",
> + "fatal",
> + "ready",
> + "handover",
> + "stop-ack",
> + "pong",
> + "wake-ack";
> +
> + memory-region = <&soccp_mem>,
> + <&soccp_dtb_mem_mem>;
> +
> + firmware-name = "qcom/kaanapali/soccp.mbn",
> + "qcom/kaanapali/soccp_dtb.mbn";
> +
> + power-domains = <&rpmhpd RPMHPD_CX>,
> + <&rpmhpd RPMHPD_MX>;
> + power-domain-names = "cx",
> + "mx";
> +
> + qcom,smem-states = <&soccp_smp2p_out 0>,
> + <&soccp_smp2p_out 10>,
> + <&soccp_smp2p_out 9>,
> + <&soccp_smp2p_out 8>;
> + qcom,smem-state-names = "stop",
> + "wakeup",
> + "sleep",
> + "ping";
> +
> + glink-edge {
> + interrupts-extended = <&ipcc IPCC_MPROC_SOCCP
> + IPCC_MPROC_SIGNAL_GLINK_QMP
> + IRQ_TYPE_EDGE_RISING>;
> + mboxes = <&ipcc IPCC_MPROC_SOCCP
> + IPCC_MPROC_SIGNAL_GLINK_QMP>;
> +
> + label = "soccp";
> + qcom,remote-pid = <19>;
> +
> + /* ... */
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
> index 63a82e7a8bf8..f81d088c2bad 100644
> --- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
> @@ -24,26 +24,6 @@ properties:
> interconnects:
> maxItems: 1
>
> - interrupts:
> - minItems: 5
> - items:
> - - description: Watchdog interrupt
> - - description: Fatal interrupt
> - - description: Ready interrupt
> - - description: Handover interrupt
> - - description: Stop acknowledge interrupt
> - - description: Shutdown acknowledge interrupt
> -
> - interrupt-names:
> - minItems: 5
> - items:
> - - const: wdog
> - - const: fatal
> - - const: ready
> - - const: handover
> - - const: stop-ack
> - - const: shutdown-ack
> -
> power-domains:
> minItems: 1
> maxItems: 3
> @@ -55,13 +35,21 @@ properties:
> qcom,smem-states:
> $ref: /schemas/types.yaml#/definitions/phandle-array
> description: States used by the AP to signal the Hexagon core
> + minItems: 1
> items:
> - - description: Stop the modem
> + - description: Stop the remoteproc
> + - description: Wake up the remoteproc
> + - description: Make the remoteproc sleep
> + - description: Ping the remoteproc
>
> qcom,smem-state-names:
> description: The names of the state bits used for SMP2P output
> + minItems: 1
> items:
> - const: stop
> + - const: wakeup
> + - const: sleep
> + - const: ping
>
> smd-edge:
> $ref: /schemas/remoteproc/qcom,smd-edge.yaml#
> @@ -80,9 +68,58 @@ properties:
> required:
> - clocks
> - clock-names
> - - interrupts
> - - interrupt-names
> - qcom,smem-states
> - qcom,smem-state-names
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - qcom,kaanapali-soccp-pas
The point of common schemas is to not have if/then/else schemas. If
interrupts is now variable, then it is no longer common and should be
moved out of the common schema. Or just have the widest constraints that
covers all cases ({minItems: 5, maxItems: 7}).
> + then:
> + properties:
> + interrupts:
> + items:
> + - description: Watchdog interrupt
> + - description: Fatal interrupt
> + - description: Ready interrupt
> + - description: Handover interrupt
> + - description: Stop acknowledge interrupt
> + - description: Pong interrupt
> + - description: Wake acknowledge interrupt
> +
> + interrupt-names:
> + items:
> + - const: wdog
> + - const: fatal
> + - const: ready
> + - const: handover
> + - const: stop-ack
> + - const: pong
> + - const: wake-ack
> +
> + else:
> + properties:
> + interrupts:
> + minItems: 5
> + items:
> + - description: Watchdog interrupt
> + - description: Fatal interrupt
> + - description: Ready interrupt
> + - description: Handover interrupt
> + - description: Stop acknowledge interrupt
> + - description: Shutdown acknowledge interrupt
> +
> + interrupt-names:
> + minItems: 5
> + items:
> + - const: wdog
> + - const: fatal
> + - const: ready
> + - const: handover
> + - const: stop-ack
> + - const: shutdown-ack
> +
> additionalProperties: true
>
> --
> 2.25.1
>
On 10/29/2025 9:22 PM, Rob Herring wrote:
> On Wed, Oct 29, 2025 at 01:05:41AM -0700, Jingyi Wang wrote:
>> Document the component used to boot SoCCP on Kaanapali SoC and add
>> compatible for Glymur SoCCP which could fallback to Kaanapali. Extend
>> the "qcom,smem-states" and "qcom,smem-state-names" properties and
>> add conditions for the "interrupts" and "interrupt-names" properties
>> in the pas-common.
>>
>> Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
>> Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>
>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
>> ---
>> .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++
>> .../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++----
>> 2 files changed, 194 insertions(+), 23 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
>> new file mode 100644
>> index 000000000000..6b53121eede1
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
>> @@ -0,0 +1,134 @@
>> +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/remoteproc/qcom,kaanapali-soccp-pas.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Qualcomm Kaanapali SoCCP Peripheral Authentication Service
>> +
>> +maintainers:
>> + - Jingyi Wang <jingyi.wang@oss.qualcomm.com>
>> +
>> +description:
>> + The SoC Control Processor (SoCCP) is small RISC-V MCU that controls USB
>> + Type-C, battery charging and various other functions on Qualcomm SoCs, somewhat
>> + analogous to traditional PC Embedded Controllers. This document describes
>> + the Peripheral Authentication Service loads and boots firmware for SoCCP.
>> +
>> +properties:
>> + compatible:
>> + oneOf:
>> + - items:
>> + - enum:
>> + - qcom,glymur-soccp-pas
>> + - const: qcom,kaanapali-soccp-pas
>> + - enum:
>> + - qcom,kaanapali-soccp-pas
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + clocks:
>> + items:
>> + - description: XO clock
>> +
>> + clock-names:
>> + items:
>> + - const: xo
>> +
>> + power-domains:
>> + items:
>> + - description: CX power domain
>> + - description: MX power domain
>> +
>> + power-domain-names:
>> + items:
>> + - const: cx
>> + - const: mx
>> +
>> + firmware-name:
>> + $ref: /schemas/types.yaml#/definitions/string-array
>
> Already has a type. Drop.
>
well noted
>> + items:
>> + - description: Firmware name of the Hexagon core
>> + - description: Firmware name of the Hexagon Devicetree
>> +
>> + memory-region:
>> + items:
>> + - description: Memory region for main Firmware authentication
>> + - description: Memory region for Devicetree Firmware authentication
>> +
>> +required:
>> + - compatible
>> + - reg
>> + - memory-region
>> + - power-domains
>> + - power-domain-names
>> +
>> +allOf:
>> + - $ref: /schemas/remoteproc/qcom,pas-common.yaml#
>> +
>> +unevaluatedProperties: false
>> +
>> +examples:
>> + - |
>> + #include <dt-bindings/clock/qcom,rpmh.h>
>> + #include <dt-bindings/interrupt-controller/arm-gic.h>
>> + #include <dt-bindings/interrupt-controller/irq.h>
>> + #include <dt-bindings/mailbox/qcom-ipcc.h>
>> + #include <dt-bindings/power/qcom-rpmpd.h>
>> +
>> + remoteproc@d00000 {
>> + compatible = "qcom,kaanapali-soccp-pas";
>> + reg = <0x00d00000 0x200000>;
>> +
>> + clocks = <&rpmhcc RPMH_CXO_CLK>;
>> + clock-names = "xo";
>> +
>> + interrupts-extended = <&intc GIC_SPI 167 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 9 IRQ_TYPE_EDGE_RISING>,
>> + <&soccp_smp2p_in 10 IRQ_TYPE_EDGE_RISING>;
>> + interrupt-names = "wdog",
>> + "fatal",
>> + "ready",
>> + "handover",
>> + "stop-ack",
>> + "pong",
>> + "wake-ack";
>> +
>> + memory-region = <&soccp_mem>,
>> + <&soccp_dtb_mem_mem>;
>> +
>> + firmware-name = "qcom/kaanapali/soccp.mbn",
>> + "qcom/kaanapali/soccp_dtb.mbn";
>> +
>> + power-domains = <&rpmhpd RPMHPD_CX>,
>> + <&rpmhpd RPMHPD_MX>;
>> + power-domain-names = "cx",
>> + "mx";
>> +
>> + qcom,smem-states = <&soccp_smp2p_out 0>,
>> + <&soccp_smp2p_out 10>,
>> + <&soccp_smp2p_out 9>,
>> + <&soccp_smp2p_out 8>;
>> + qcom,smem-state-names = "stop",
>> + "wakeup",
>> + "sleep",
>> + "ping";
>> +
>> + glink-edge {
>> + interrupts-extended = <&ipcc IPCC_MPROC_SOCCP
>> + IPCC_MPROC_SIGNAL_GLINK_QMP
>> + IRQ_TYPE_EDGE_RISING>;
>> + mboxes = <&ipcc IPCC_MPROC_SOCCP
>> + IPCC_MPROC_SIGNAL_GLINK_QMP>;
>> +
>> + label = "soccp";
>> + qcom,remote-pid = <19>;
>> +
>> + /* ... */
>> + };
>> + };
>> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
>> index 63a82e7a8bf8..f81d088c2bad 100644
>> --- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
>> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
>> @@ -24,26 +24,6 @@ properties:
>> interconnects:
>> maxItems: 1
>>
>> - interrupts:
>> - minItems: 5
>> - items:
>> - - description: Watchdog interrupt
>> - - description: Fatal interrupt
>> - - description: Ready interrupt
>> - - description: Handover interrupt
>> - - description: Stop acknowledge interrupt
>> - - description: Shutdown acknowledge interrupt
>> -
>> - interrupt-names:
>> - minItems: 5
>> - items:
>> - - const: wdog
>> - - const: fatal
>> - - const: ready
>> - - const: handover
>> - - const: stop-ack
>> - - const: shutdown-ack
>> -
>> power-domains:
>> minItems: 1
>> maxItems: 3
>> @@ -55,13 +35,21 @@ properties:
>> qcom,smem-states:
>> $ref: /schemas/types.yaml#/definitions/phandle-array
>> description: States used by the AP to signal the Hexagon core
>> + minItems: 1
>> items:
>> - - description: Stop the modem
>> + - description: Stop the remoteproc
>> + - description: Wake up the remoteproc
>> + - description: Make the remoteproc sleep
>> + - description: Ping the remoteproc
>>
>> qcom,smem-state-names:
>> description: The names of the state bits used for SMP2P output
>> + minItems: 1
>> items:
>> - const: stop
>> + - const: wakeup
>> + - const: sleep
>> + - const: ping
>>
>> smd-edge:
>> $ref: /schemas/remoteproc/qcom,smd-edge.yaml#
>> @@ -80,9 +68,58 @@ properties:
>> required:
>> - clocks
>> - clock-names
>> - - interrupts
>> - - interrupt-names
>> - qcom,smem-states
>> - qcom,smem-state-names
>>
>> +allOf:
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + enum:
>> + - qcom,kaanapali-soccp-pas
>
> The point of common schemas is to not have if/then/else schemas. If
> interrupts is now variable, then it is no longer common and should be
> moved out of the common schema. Or just have the widest constraints that
> covers all cases ({minItems: 5, maxItems: 7}).
>
>
Thanks for clarify, if we use the comman schema, we need to change the
constraint from "const" to "enum" like:
interrupts:
minItems: 5
items:
- description: Watchdog interrupt
- description: Fatal interrupt
- description: Ready interrupt
- description: Handover interrupt
- description: Stop acknowledge interrupt
- description: Shutdown acknowledge interrupt
- description: Pong interrupt
- description: Wake acknowledge interrupt
(define "maxItems: 7" will cause err:
hint: "maxItems" is not needed with an "items" list)
interrupt-names:
minItems: 5
maxItems: 7
items:
enum:
- wdog
- fatal
- ready
- handover
- stop-ack
- shutdown-ack
- pong
- wake-ack
is this okay?
Thanks,
Jingyi
>> + then:
>> + properties:
>> + interrupts:
>> + items:
>> + - description: Watchdog interrupt
>> + - description: Fatal interrupt
>> + - description: Ready interrupt
>> + - description: Handover interrupt
>> + - description: Stop acknowledge interrupt
>> + - description: Pong interrupt
>> + - description: Wake acknowledge interrupt
>> +
>> + interrupt-names:
>> + items:
>> + - const: wdog
>> + - const: fatal
>> + - const: ready
>> + - const: handover
>> + - const: stop-ack
>> + - const: pong
>> + - const: wake-ack
>> +
>> + else:
>> + properties:
>> + interrupts:
>> + minItems: 5
>> + items:
>> + - description: Watchdog interrupt
>> + - description: Fatal interrupt
>> + - description: Ready interrupt
>> + - description: Handover interrupt
>> + - description: Stop acknowledge interrupt
>> + - description: Shutdown acknowledge interrupt
>> +
>> + interrupt-names:
>> + minItems: 5
>> + items:
>> + - const: wdog
>> + - const: fatal
>> + - const: ready
>> + - const: handover
>> + - const: stop-ack
>> + - const: shutdown-ack
>> +
>> additionalProperties: true
>>
>> --
>> 2.25.1
>>
On Wed, 29 Oct 2025 01:05:41 -0700, Jingyi Wang wrote: > Document the component used to boot SoCCP on Kaanapali SoC and add > compatible for Glymur SoCCP which could fallback to Kaanapali. Extend > the "qcom,smem-states" and "qcom,smem-state-names" properties and > add conditions for the "interrupts" and "interrupt-names" properties > in the pas-common. > > Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> > Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> > Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> > --- > .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++ > .../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++---- > 2 files changed, 194 insertions(+), 23 deletions(-) > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: dtschema/dtc warnings/errors: Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:67.46-62 Unexpected 'IPCC_MPROC_SOCCP' Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:70.33-49 Unexpected 'IPCC_MPROC_SOCCP' FATAL ERROR: Syntax error parsing input tree make[2]: *** [scripts/Makefile.dtbs:132: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/builds/robherring/dt-review-ci/linux/Makefile:1547: dt_binding_check] Error 2 make: *** [Makefile:248: __sub-make] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20251029-knp-remoteproc-v2-3-6c81993b52ea@oss.qualcomm.com The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
On 10/29/2025 7:28 PM, Rob Herring (Arm) wrote: > > On Wed, 29 Oct 2025 01:05:41 -0700, Jingyi Wang wrote: >> Document the component used to boot SoCCP on Kaanapali SoC and add >> compatible for Glymur SoCCP which could fallback to Kaanapali. Extend >> the "qcom,smem-states" and "qcom,smem-state-names" properties and >> add conditions for the "interrupts" and "interrupt-names" properties >> in the pas-common. >> >> Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> >> Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> >> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> >> --- >> .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++ >> .../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++---- >> 2 files changed, 194 insertions(+), 23 deletions(-) >> > > My bot found errors running 'make dt_binding_check' on your patch: > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:67.46-62 Unexpected 'IPCC_MPROC_SOCCP' > Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:70.33-49 Unexpected 'IPCC_MPROC_SOCCP' > FATAL ERROR: Syntax error parsing input tree > make[2]: *** [scripts/Makefile.dtbs:132: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dtb] Error 1 > make[2]: *** Waiting for unfinished jobs.... > make[1]: *** [/builds/robherring/dt-review-ci/linux/Makefile:1547: dt_binding_check] Error 2 > make: *** [Makefile:248: __sub-make] Error 2 > > doc reference errors (make refcheckdocs): > > See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20251029-knp-remoteproc-v2-3-6c81993b52ea@oss.qualcomm.com > > The base for the series is generally the latest rc1. A different dependency > should be noted in *this* patch. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit after running the above command yourself. Note > that DT_SCHEMA_FILES can be set to your schema file to speed up checking > your schema. However, it must be unset to test all examples with your schema. > Will add dependency in next version for the include files in example. Thanks, Jingyi
On Thu, Oct 30, 2025 at 10:10:55AM +0800, Jingyi Wang wrote: > > > On 10/29/2025 7:28 PM, Rob Herring (Arm) wrote: > > > > On Wed, 29 Oct 2025 01:05:41 -0700, Jingyi Wang wrote: > >> Document the component used to boot SoCCP on Kaanapali SoC and add > >> compatible for Glymur SoCCP which could fallback to Kaanapali. Extend > >> the "qcom,smem-states" and "qcom,smem-state-names" properties and > >> add conditions for the "interrupts" and "interrupt-names" properties > >> in the pas-common. > >> > >> Co-developed-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> > >> Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com> > >> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> > >> --- > >> .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 134 +++++++++++++++++++++ > >> .../bindings/remoteproc/qcom,pas-common.yaml | 83 +++++++++---- > >> 2 files changed, 194 insertions(+), 23 deletions(-) > >> > > > > My bot found errors running 'make dt_binding_check' on your patch: > > > > yamllint warnings/errors: > > > > dtschema/dtc warnings/errors: > > Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:67.46-62 Unexpected 'IPCC_MPROC_SOCCP' > > Lexical error: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dts:70.33-49 Unexpected 'IPCC_MPROC_SOCCP' > > FATAL ERROR: Syntax error parsing input tree > > make[2]: *** [scripts/Makefile.dtbs:132: Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.example.dtb] Error 1 > > make[2]: *** Waiting for unfinished jobs.... > > make[1]: *** [/builds/robherring/dt-review-ci/linux/Makefile:1547: dt_binding_check] Error 2 > > make: *** [Makefile:248: __sub-make] Error 2 > > > > doc reference errors (make refcheckdocs): > > > > See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20251029-knp-remoteproc-v2-3-6c81993b52ea@oss.qualcomm.com > > > > The base for the series is generally the latest rc1. A different dependency > > should be noted in *this* patch. > > > > If you already ran 'make dt_binding_check' and didn't see the above > > error(s), then make sure 'yamllint' is installed and dt-schema is up to > > date: > > > > pip3 install dtschema --upgrade > > > > Please check and re-submit after running the above command yourself. Note > > that DT_SCHEMA_FILES can be set to your schema file to speed up checking > > your schema. However, it must be unset to test all examples with your schema. > > > > Will add dependency in next version for the include files in example. Which would make it impossible to merge. Please read internal guideline because this problem happened multiple times and was already explained that many times, so for sure it is documented internally. Best regards, Krzysztof
© 2016 - 2025 Red Hat, Inc.