[PATCH] ASoC: dt-bindings: cs35l45: Tidy up BPE changes

From: Ricardo Rivera-Matos

Date: Wed Nov 18 2026 - 11:33:16 EST


Addresses two outstanding comments from the introduction of the BPE
properties:

- Moves allOf block to above additional/unevaluatedProps
- Drops unneeded '|' from property descriptions

Fixes: b6dda4b7698e ("ASoC: cs35l45: Adds support for brownout prevention engines")

Signed-off-by: Ricardo Rivera-Matos <rriveram@xxxxxxxxxxxxxxxxxxxxx>
---
.../devicetree/bindings/sound/cirrus,cs35l45.yaml | 244 ++++++++++-----------
1 file changed, 122 insertions(+), 122 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml b/Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
index 9373ce4bc3a8..b85fd1bfeac7 100644
--- a/Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
+++ b/Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
@@ -14,123 +14,6 @@ description: |
CS35L45 is a Boosted Mono Class D Amplifier with DSP
Speaker Protection and Adaptive Battery Management.

-allOf:
- - $ref: dai-common.yaml#
- - if:
- required:
- - cirrus,amplifier-bpe-enable
- then:
- required:
- - cirrus,amplifier-bpe-response-mode
- - cirrus,amplifier-bpe-thresholds-microvolt
- - cirrus,amplifier-bpe-attack-rates
- - cirrus,amplifier-bpe-hold-times-us
- - cirrus,amplifier-bpe-release-rates
- else:
- properties:
- cirrus,amplifier-bpe-response-mode: false
- cirrus,amplifier-bpe-thresholds-microvolt: false
- cirrus,amplifier-bpe-attenuation-levels-db: false
- cirrus,amplifier-bpe-attenuation-levels-microvolt: false
- cirrus,amplifier-bpe-attenuation-levels-microwatt: false
- cirrus,amplifier-bpe-attack-rates: false
- cirrus,amplifier-bpe-hold-times-us: false
- cirrus,amplifier-bpe-release-rates: false
- - if:
- properties:
- cirrus,amplifier-bpe-response-mode:
- const: 0
- required:
- - cirrus,amplifier-bpe-response-mode
- then:
- required:
- - cirrus,amplifier-bpe-attenuation-levels-db
- properties:
- cirrus,amplifier-bpe-attenuation-levels-microvolt: false
- cirrus,amplifier-bpe-attenuation-levels-microwatt: false
- - if:
- properties:
- cirrus,amplifier-bpe-response-mode:
- const: 1
- required:
- - cirrus,amplifier-bpe-response-mode
- then:
- required:
- - cirrus,amplifier-bpe-attenuation-levels-microvolt
- properties:
- cirrus,amplifier-bpe-attenuation-levels-db: false
- cirrus,amplifier-bpe-attenuation-levels-microwatt: false
- - if:
- properties:
- cirrus,amplifier-bpe-response-mode:
- const: 2
- required:
- - cirrus,amplifier-bpe-response-mode
- then:
- required:
- - cirrus,amplifier-bpe-attenuation-levels-microwatt
- properties:
- cirrus,amplifier-bpe-attenuation-levels-db: false
- cirrus,amplifier-bpe-attenuation-levels-microvolt: false
-
- - if:
- required:
- - cirrus,boost-bpe-enable
- then:
- required:
- - cirrus,boost-bpe-output-operating-mode
- - cirrus,boost-bpe-output-attack-rate
- - cirrus,boost-bpe-output-release-rate
- - cirrus,boost-bpe-battery-limits-microamp
- - cirrus,boost-bpe-battery-thresholds-microvolt
- - cirrus,boost-bpe-battery-attack-rates
- - cirrus,boost-bpe-battery-hold-times-us
- - cirrus,boost-bpe-battery-release-rates
- else:
- properties:
- cirrus,boost-bpe-output-operating-mode: false
- cirrus,boost-bpe-output-attack-rate: false
- cirrus,boost-bpe-output-release-rate: false
- cirrus,boost-bpe-battery-limits-microamp: false
- cirrus,boost-bpe-battery-thresholds-microvolt: false
- cirrus,boost-bpe-battery-attack-rates: false
- cirrus,boost-bpe-battery-hold-times-us: false
- cirrus,boost-bpe-battery-release-rates: false
- cirrus,boost-bpe-inductor-release-mode: false
- cirrus,boost-bpe-inductor-threshold-microamp: false
- cirrus,boost-bpe-inductor-threshold-deltas-microamp: false
- cirrus,boost-bpe-inductor-threshold-hysteresis-microamp: false
- cirrus,boost-bpe-inductor-delay-hysteresis-us: false
- cirrus,boost-bpe-inductor-delays-ms: false
- cirrus,boost-bpe-inductor-attack-rates: false
- cirrus,boost-bpe-inductor-release-rates: false
- - if:
- properties:
- cirrus,boost-bpe-output-operating-mode:
- const: 0
- required:
- - cirrus,boost-bpe-output-operating-mode
- then:
- required:
- - cirrus,boost-bpe-inductor-release-mode
- - cirrus,boost-bpe-inductor-threshold-microamp
- - cirrus,boost-bpe-inductor-threshold-deltas-microamp
- - cirrus,boost-bpe-inductor-threshold-hysteresis-microamp
- - cirrus,boost-bpe-inductor-delay-hysteresis-us
- - cirrus,boost-bpe-inductor-delays-ms
- - cirrus,boost-bpe-inductor-attack-rates
- - cirrus,boost-bpe-inductor-release-rates
- else:
- properties:
- cirrus,boost-bpe-inductor-release-mode: false
- cirrus,boost-bpe-inductor-threshold-microamp: false
- cirrus,boost-bpe-inductor-threshold-deltas-microamp: false
- cirrus,boost-bpe-inductor-threshold-hysteresis-microamp: false
- cirrus,boost-bpe-inductor-delay-hysteresis-us: false
- cirrus,boost-bpe-inductor-delays-ms: false
- cirrus,boost-bpe-inductor-attack-rates: false
- cirrus,boost-bpe-inductor-release-rates: false
-
properties:
compatible:
enum:
@@ -434,7 +317,7 @@ properties:
maximum: 15

cirrus,amplifier-bpe-attenuation-levels-microvolt:
- description: |
+ description:
Amplifier BPE linear voltage audio output attenuation for levels L3,
L2, L1, L0.
minItems: 4
@@ -445,7 +328,7 @@ properties:
multipleOf: 31250

cirrus,amplifier-bpe-attenuation-levels-microwatt:
- description: |
+ description:
Amplifier BPE linear power audio output attenuation for levels L3,
L2, L1, L0.
$ref: /schemas/types.yaml#/definitions/uint32-array
@@ -457,7 +340,7 @@ properties:
multipleOf: 31250

cirrus,amplifier-bpe-attack-rates:
- description: |
+ description:
Amplifier BPE attack rate register codes for levels L3, L2, L1, L0.
Code 0 is instantaneous; codes 1 through 8 select progressively
slower rates. The physical rate depends on the response mode.
@@ -471,7 +354,7 @@ properties:
maximum: 8

cirrus,amplifier-bpe-hold-times-us:
- description: |
+ description:
Amplifier BPE hold times for levels L3, L2, L1, L0. Infinite hold is
unsupported.
minItems: 4
@@ -481,7 +364,7 @@ properties:
100000, 250000, 500000, 1000000, 2500000, 5000000, 10000000]

cirrus,amplifier-bpe-release-rates:
- description: |
+ description:
Amplifier BPE release rate register codes for levels L3, L2, L1, L0.
Code 0 is instantaneous; codes 1 through 14 select progressively
slower rates. The physical rate depends on the response mode.
@@ -591,6 +474,123 @@ required:
- reg
- "#sound-dai-cells"

+allOf:
+ - $ref: dai-common.yaml#
+ - if:
+ required:
+ - cirrus,amplifier-bpe-enable
+ then:
+ required:
+ - cirrus,amplifier-bpe-response-mode
+ - cirrus,amplifier-bpe-thresholds-microvolt
+ - cirrus,amplifier-bpe-attack-rates
+ - cirrus,amplifier-bpe-hold-times-us
+ - cirrus,amplifier-bpe-release-rates
+ else:
+ properties:
+ cirrus,amplifier-bpe-response-mode: false
+ cirrus,amplifier-bpe-thresholds-microvolt: false
+ cirrus,amplifier-bpe-attenuation-levels-db: false
+ cirrus,amplifier-bpe-attenuation-levels-microvolt: false
+ cirrus,amplifier-bpe-attenuation-levels-microwatt: false
+ cirrus,amplifier-bpe-attack-rates: false
+ cirrus,amplifier-bpe-hold-times-us: false
+ cirrus,amplifier-bpe-release-rates: false
+ - if:
+ properties:
+ cirrus,amplifier-bpe-response-mode:
+ const: 0
+ required:
+ - cirrus,amplifier-bpe-response-mode
+ then:
+ required:
+ - cirrus,amplifier-bpe-attenuation-levels-db
+ properties:
+ cirrus,amplifier-bpe-attenuation-levels-microvolt: false
+ cirrus,amplifier-bpe-attenuation-levels-microwatt: false
+ - if:
+ properties:
+ cirrus,amplifier-bpe-response-mode:
+ const: 1
+ required:
+ - cirrus,amplifier-bpe-response-mode
+ then:
+ required:
+ - cirrus,amplifier-bpe-attenuation-levels-microvolt
+ properties:
+ cirrus,amplifier-bpe-attenuation-levels-db: false
+ cirrus,amplifier-bpe-attenuation-levels-microwatt: false
+ - if:
+ properties:
+ cirrus,amplifier-bpe-response-mode:
+ const: 2
+ required:
+ - cirrus,amplifier-bpe-response-mode
+ then:
+ required:
+ - cirrus,amplifier-bpe-attenuation-levels-microwatt
+ properties:
+ cirrus,amplifier-bpe-attenuation-levels-db: false
+ cirrus,amplifier-bpe-attenuation-levels-microvolt: false
+
+ - if:
+ required:
+ - cirrus,boost-bpe-enable
+ then:
+ required:
+ - cirrus,boost-bpe-output-operating-mode
+ - cirrus,boost-bpe-output-attack-rate
+ - cirrus,boost-bpe-output-release-rate
+ - cirrus,boost-bpe-battery-limits-microamp
+ - cirrus,boost-bpe-battery-thresholds-microvolt
+ - cirrus,boost-bpe-battery-attack-rates
+ - cirrus,boost-bpe-battery-hold-times-us
+ - cirrus,boost-bpe-battery-release-rates
+ else:
+ properties:
+ cirrus,boost-bpe-output-operating-mode: false
+ cirrus,boost-bpe-output-attack-rate: false
+ cirrus,boost-bpe-output-release-rate: false
+ cirrus,boost-bpe-battery-limits-microamp: false
+ cirrus,boost-bpe-battery-thresholds-microvolt: false
+ cirrus,boost-bpe-battery-attack-rates: false
+ cirrus,boost-bpe-battery-hold-times-us: false
+ cirrus,boost-bpe-battery-release-rates: false
+ cirrus,boost-bpe-inductor-release-mode: false
+ cirrus,boost-bpe-inductor-threshold-microamp: false
+ cirrus,boost-bpe-inductor-threshold-deltas-microamp: false
+ cirrus,boost-bpe-inductor-threshold-hysteresis-microamp: false
+ cirrus,boost-bpe-inductor-delay-hysteresis-us: false
+ cirrus,boost-bpe-inductor-delays-ms: false
+ cirrus,boost-bpe-inductor-attack-rates: false
+ cirrus,boost-bpe-inductor-release-rates: false
+ - if:
+ properties:
+ cirrus,boost-bpe-output-operating-mode:
+ const: 0
+ required:
+ - cirrus,boost-bpe-output-operating-mode
+ then:
+ required:
+ - cirrus,boost-bpe-inductor-release-mode
+ - cirrus,boost-bpe-inductor-threshold-microamp
+ - cirrus,boost-bpe-inductor-threshold-deltas-microamp
+ - cirrus,boost-bpe-inductor-threshold-hysteresis-microamp
+ - cirrus,boost-bpe-inductor-delay-hysteresis-us
+ - cirrus,boost-bpe-inductor-delays-ms
+ - cirrus,boost-bpe-inductor-attack-rates
+ - cirrus,boost-bpe-inductor-release-rates
+ else:
+ properties:
+ cirrus,boost-bpe-inductor-release-mode: false
+ cirrus,boost-bpe-inductor-threshold-microamp: false
+ cirrus,boost-bpe-inductor-threshold-deltas-microamp: false
+ cirrus,boost-bpe-inductor-threshold-hysteresis-microamp: false
+ cirrus,boost-bpe-inductor-delay-hysteresis-us: false
+ cirrus,boost-bpe-inductor-delays-ms: false
+ cirrus,boost-bpe-inductor-attack-rates: false
+ cirrus,boost-bpe-inductor-release-rates: false
+
unevaluatedProperties: false

examples:

---
base-commit: e2aee84df35aeadadfbcdb750a3921a0cab03e46
change-id: 20261118-bpe-dt-cleanup-b2e360fdc90f

Best regards,
--
Ricardo Rivera-Matos <rriveram@xxxxxxxxxxxxxxxxxxxxx>