diff mbox series

[v2,1/9] ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants

Message ID 20230313075445.17160-1-krzysztof.kozlowski@linaro.org
State Superseded
Headers show
Series [v2,1/9] ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants | expand

Commit Message

Krzysztof Kozlowski March 13, 2023, 7:54 a.m. UTC
Currently the Qualcomm RX macro codec binding allows two different clock
setups - with (for ADSP) and without macro/dcodec entries (for ADSP
bypassed).  With more devices coming soon, this will keep growing, thus
rework the clocks/clock-names to be specific for each binding.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/sound/qcom,lpass-rx-macro.yaml   | 58 ++++++++++++++-----
 1 file changed, 44 insertions(+), 14 deletions(-)

Comments

Rob Herring (Arm) March 17, 2023, 4:36 p.m. UTC | #1
On Mon, 13 Mar 2023 08:54:37 +0100, Krzysztof Kozlowski wrote:
> Currently the Qualcomm RX macro codec binding allows two different clock
> setups - with (for ADSP) and without macro/dcodec entries (for ADSP
> bypassed).  With more devices coming soon, this will keep growing, thus
> rework the clocks/clock-names to be specific for each binding.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/sound/qcom,lpass-rx-macro.yaml   | 58 ++++++++++++++-----
>  1 file changed, 44 insertions(+), 14 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Rob Herring (Arm) March 17, 2023, 4:39 p.m. UTC | #2
On Mon, 13 Mar 2023 08:54:41 +0100, Krzysztof Kozlowski wrote:
> Add the TX macro codec on Qualcomm SM8550, which comes without NPL clock
> exposed.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/sound/qcom,lpass-tx-macro.yaml    | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Rob Herring (Arm) March 17, 2023, 4:40 p.m. UTC | #3
On Mon, 13 Mar 2023 08:54:43 +0100, Krzysztof Kozlowski wrote:
> Add the VA macro codec on Qualcomm SM8550, which comes without NPL clock
> exposed.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Depends on:
> https://lore.kernel.org/r/20221118071849.25506-2-srinivas.kandagatla@linaro.org
> ---
>  .../bindings/sound/qcom,lpass-va-macro.yaml    | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Rob Herring (Arm) March 17, 2023, 4:41 p.m. UTC | #4
On Mon, 13 Mar 2023 08:54:44 +0100, Krzysztof Kozlowski wrote:
> Add the WSA macro codec on Qualcomm SM8550, which comes without NPL clock
> exposed.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/sound/qcom,lpass-wsa-macro.yaml  | 23 +++++++++++++++++--
>  1 file changed, 21 insertions(+), 2 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Mark Brown March 28, 2023, 4:41 p.m. UTC | #5
On Mon, 13 Mar 2023 08:55:51 +0100, Krzysztof Kozlowski wrote:
> Dependencies
> ============
> For va-macro bindings:
> https://lore.kernel.org/r/20221118071849.25506-2-srinivas.kandagatla@linaro.org
> 
> NOT a dependency
> ================
> The patchset can be applied independently of my previous fix:
> https://lore.kernel.org/linux-arm-msm/20230310100937.32485-1-krzysztof.kozlowski@linaro.org/T/#u
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/9] ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants
      commit: e4cf7805f084772cccf2094b634a16bccf2f444f
[2/9] ASoC: dt-bindings: qcom,lpass-rx-macro: Add SM8550 RX macro
      commit: 0fc109f875721f9cef29bb68095f50d67343b4b7
[3/9] ASoC: codecs: lpass-rx-macro: add support for SM8550
      commit: 492fe974fed0754f7076580e069e1e182e7b3603
[4/9] ASoC: dt-bindings: qcom,lpass-tx-macro: narrow clocks per variants
      commit: bf4afbf950938d42cf0df1ecd915affeb26f4d76
[5/9] ASoC: dt-bindings: qcom,lpass-tx-macro: Add SM8550 TX macro
      commit: 050578c6f18c28e95f9659493a52a67b68b4b667
[6/9] ASoC: codecs: lpass-tx-macro: add support for SM8550
      commit: 5faf6a1c5256559af98c998b7416e4db8fb09b75
[7/9] ASoC: dt-bindings: qcom,lpass-va-macro: Add SM8550 VA macro
      (no commit info)
[8/9] ASoC: dt-bindings: qcom,lpass-wsa-macro: Add SM8550 WSA macro
      commit: c1bda22bd2f382f9c3b27fb7a899f8804d92f897
[9/9] ASoC: codecs: lpass-wsa-macro: add support for SM8550
      commit: 6b004b836ced4d9ce655b5f1c810833c1a880369

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
index b0b95689d78b..8b3d617a9578 100644
--- a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
@@ -9,9 +9,6 @@  title: LPASS(Low Power Audio Subsystem) RX Macro audio codec
 maintainers:
   - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 
-allOf:
-  - $ref: dai-common.yaml#
-
 properties:
   compatible:
     enum:
@@ -34,17 +31,8 @@  properties:
     maxItems: 5
 
   clock-names:
-    oneOf:
-      - items:   #for ADSP based platforms
-          - const: mclk
-          - const: npl
-          - const: macro
-          - const: dcodec
-          - const: fsgen
-      - items:   #for ADSP bypass based platforms
-          - const: mclk
-          - const: npl
-          - const: fsgen
+    minItems: 3
+    maxItems: 5
 
   clock-output-names:
     maxItems: 1
@@ -62,6 +50,48 @@  required:
   - reg
   - "#sound-dai-cells"
 
+allOf:
+  - $ref: dai-common.yaml#
+  - if:
+      properties:
+        compatible:
+          enum:
+            - qcom,sc7280-lpass-rx-macro
+    then:
+      properties:
+        clock-names:
+          oneOf:
+            - items:   #for ADSP based platforms
+                - const: mclk
+                - const: npl
+                - const: macro
+                - const: dcodec
+                - const: fsgen
+            - items:   #for ADSP bypass based platforms
+                - const: mclk
+                - const: npl
+                - const: fsgen
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - qcom,sc8280xp-lpass-rx-macro
+            - qcom,sm8250-lpass-rx-macro
+            - qcom,sm8450-lpass-rx-macro
+    then:
+      properties:
+        clocks:
+          minItems: 5
+          maxItems: 5
+        clock-names:
+          items:
+            - const: mclk
+            - const: npl
+            - const: macro
+            - const: dcodec
+            - const: fsgen
+
 unevaluatedProperties: false
 
 examples: