dt-bindings: ASoC: qdsp6: Suggest more generic node names
Subsystems (5)
PATCH 1/2 dt-bindings: ASoC: qdsp6: Suggest more generic node names
Change the listed examples to use more generic node names, representing the class of the device nodes:
- apr-service@<id>
- dai@<id>
Both names are already in use in arch/arm64/boot/dts/qcom/sdm845.dtsi.
Also add #address-cells + #size-cells to the q6asm example, without them the example produces dtc warnings.
--- .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +++++++++---------- .../devicetree/bindings/sound/qcom,q6asm.txt | 7 ++- .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-)
Documentation/devicetree/bindings/sound/qcom,q6adm.txt +1 -1
@@ -29,7 +29,7 @@ used by the apr service device. Definition: Must be 0 = EXAMPLE -q6adm@8 { +apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; q6routing: routing {
Documentation/devicetree/bindings/sound/qcom,q6afe.txt +23 -23
93 lines not on this page · raw message
Documentation/devicetree/bindings/sound/qcom,q6asm.txt +5 -2
@@ -51,13 +51,16 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6asm@7 { +apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; q6asmdai: dais { compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; #sound-dai-cells = <1>; - mm@0 { + + dai@0 { reg = <0>; direction = <2>; is-compress-dai;
Documentation/devicetree/bindings/sound/qcom,q6core.txt +1 -1
@@ -15,7 +15,7 @@ used by the apr service device. example "qcom,q6core-v2.0" = EXAMPLE -q6core@3 { +apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; };
Signature · 1 line
2.26.1
PATCH 2/2 dt-bindings: soc: qcom: apr: Use generic node names for APR services
Device nodes should be named according to the class of devices they belong to. Change the suggested names of the subnodes to apr-service@<id>, which is already in use in arch/arm64/boot/dts/qcom/sdm845.dtsi.
--- .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt +10 -10
@@ -65,30 +65,30 @@ which uses apr as communication between Apps and QDSP. compatible = "qcom,apr-v2"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core@3 { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe@4 { + apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; dais { #sound-dai-cells = <1>; - hdmi@1 { - reg = <1>; + dai@1 { + reg = <HDMI_RX>; }; }; }; - q6asm@7 { + apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; ... }; - q6adm@8 { + apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; ...
@@ -106,26 +106,26 @@ have no such dependency. qcom,glink-channels = "apr_audio_svc"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe: q6afe { + q6afe: apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; ... }; - q6asm: q6asm { + q6asm: apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; qcom,protection-domain = "tms/servreg", "msm/slpi/sensor_pd"; ... }; - q6adm: q6adm { + q6adm: apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
Signature · 1 line
2.26.1
Re: [PATCH 2/2] dt-bindings: soc: qcom: apr: Use generic node names for APR services
Quoted 7 lines · Stephan Gerhold
Device nodes should be named according to the class of devices they belong to. Change the suggested names of the subnodes to apr-service@<id>, which is already in use in
arch/arm64/boot/dts/qcom/sdm845.dtsi.Cc Srinivas Kandagatla <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>
Quoted 77 lines
--- .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt +10
-10@@ -65,30 +65,30 @@ which uses apr as communication between Apps and QDSP. compatible = "qcom,apr-v2"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core@3 { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe@4 { + apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; dais { #sound-dai-cells = <1>; - hdmi@1 { - reg = <1>; + dai@1 { + reg = <HDMI_RX>; }; }; }; - q6asm@7 { + apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; }; - q6adm@8 { + apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>;@@ -106,26 +106,26 @@ have no such dependency. qcom,glink-channels = "apr_audio_svc"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe: q6afe { + q6afe: apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; }; - q6asm: q6asm { + q6asm: apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; qcom,protection-domain = "tms/servreg", "msm/slpi/sensor_pd"; }; - q6adm: q6adm { + q6adm: apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
Re: [PATCH 2/2] dt-bindings: soc: qcom: apr: Use generic node names for APR services
In reply to Stephan GerholdQuoted 11 lines · Stephan Gerhold
Device nodes should be named according to the class of devices they belong to. Change the suggested names of the subnodes to apr-service@<id>, which is already in use in
arch/arm64/boot/dts/qcom/sdm845.dtsi.Cc Srinivas Kandagatla <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>--- .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Bjorn Andersson
AppliedRe: [PATCH 2/2] dt-bindings: soc: qcom: apr: Use generic node names for APR services
In reply to Stephan GerholdQuoted 7 lines · Stephan Gerhold
Device nodes should be named according to the class of devices they belong to. Change the suggested names of the subnodes to apr-service@<id>, which is already in use in
arch/arm64/boot/dts/qcom/sdm845.dtsi.Cc Srinivas Kandagatla <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>
Applied, thank you.
Quoted 79 lines
--- .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt +10
-10@@ -65,30 +65,30 @@ which uses apr as communication between Apps and QDSP. compatible = "qcom,apr-v2"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core@3 { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe@4 { + apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; dais { #sound-dai-cells = <1>; - hdmi@1 { - reg = <1>; + dai@1 { + reg = <HDMI_RX>; }; }; }; - q6asm@7 { + apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; }; - q6adm@8 { + apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>;@@ -106,26 +106,26 @@ have no such dependency. qcom,glink-channels = "apr_audio_svc"; qcom,apr-domain = <APR_DOMAIN_ADSP>; - q6core { + apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; - q6afe: q6afe { + q6afe: apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; }; - q6asm: q6asm { + q6asm: apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; qcom,protection-domain = "tms/servreg", "msm/slpi/sensor_pd"; }; - q6adm: q6adm { + q6adm: apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";Signature · 1 line
2.26.1
Quoted 6 lines · Stephan Gerhold
Change the listed examples to use more generic node names, representing the class of the device nodes:
- apr-service@<id>
- dai@<id>
Quoted 7 lines
Both names are already in use in
arch/arm64/boot/dts/qcom/sdm845.dtsi.Also add #address-cells + #size-cells to the q6asm example, without them the example produces dtc warnings.
Cc Srinivas Kandagatla <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>
Quoted 158 lines
--- .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +++++++++---------- .../devicetree/bindings/sound/qcom,q6asm.txt | 7 ++- .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-)Documentation/devicetree/bindings/sound/qcom,q6adm.txt +1
-1@@ -29,7 +29,7 @@ used by the apr service device. Definition: Must be 0 = EXAMPLE -q6adm@8 { +apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; q6routing: routing {Documentation/devicetree/bindings/sound/qcom,q6afe.txt +23
-23@@ -100,7 +100,7 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6afe@4 { +apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>;@@ -110,12 +110,12 @@ q6afe@4 { #address-cells = <1>; #size-cells = <0>; - hdmi@1 { - reg = <1>; + dai@1 { + reg = <HDMI_RX>; }; - tdm@24 { - reg = <24>; + dai@24 { + reg = <PRIMARY_TDM_RX_0>; qcom,tdm-sync-mode = <1>: qcom,tdm-sync-src = <1>; qcom,tdm-data-out = <0>;@@ -125,8 +125,8 @@ q6afe@4 { }; - tdm@25 { - reg = <25>; + dai@25 { + reg = <PRIMARY_TDM_TX_0>; qcom,tdm-sync-mode = <1>: qcom,tdm-sync-src = <1>; qcom,tdm-data-out = <0>;@@ -135,43 +135,43 @@ q6afe@4 { qcom,tdm-data-align = <0>; }; - prim-mi2s-rx@16 { - reg = <16>; + dai@16 { + reg = <PRIMARY_MI2S_RX>; qcom,sd-lines = <0 2>; }; - prim-mi2s-tx@17 { - reg = <17>; + dai@17 { + reg = <PRIMARY_MI2S_TX>; qcom,sd-lines = <1>; }; - sec-mi2s-rx@18 { - reg = <18>; + dai@18 { + reg = <SECONDARY_MI2S_RX>; qcom,sd-lines = <0 3>; }; - sec-mi2s-tx@19 { - reg = <19>; + dai@19 { + reg = <SECONDARY_MI2S_TX>; qcom,sd-lines = <1>; }; - tert-mi2s-rx@20 { - reg = <20>; + dai@20 { + reg = <TERTIARY_MI2S_RX>; qcom,sd-lines = <1 3>; }; - tert-mi2s-tx@21 { - reg = <21>; + dai@21 { + reg = <TERTIARY_MI2S_TX>; qcom,sd-lines = <0>; }; - quat-mi2s-rx@22 { - reg = <22>; + dai@22 { + reg = <QUATERNARY_MI2S_RX>; qcom,sd-lines = <0>; }; - quat-mi2s-tx@23 { - reg = <23>; + dai@23 { + reg = <QUATERNARY_MI2S_TX>; qcom,sd-lines = <1>; }; };Documentation/devicetree/bindings/sound/qcom,q6asm.txt +5
-2@@ -51,13 +51,16 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6asm@7 { +apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; q6asmdai: dais { compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; #sound-dai-cells = <1>; - mm@0 { + + dai@0 { reg = <0>; direction = <2>; is-compress-dai;Documentation/devicetree/bindings/sound/qcom,q6core.txt +1
-1@@ -15,7 +15,7 @@ used by the apr service device. example "qcom,q6core-v2.0" = EXAMPLE -q6core@3 { +apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; };
Mark Brown
maintainerApplied "ASoC: qdsp6: Suggest more generic node names" to the asoc tree
In reply to Stephan GerholdThe patch
ASoC: qdsp6: Suggest more generic node names
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
From 35c638d039bbabbca7affb52960d468951d811c1 Mon Sep 17 00:00:00 2001
From: Stephan Gerhold <[email protected]>
Date: Wed, 15 Apr 2020 10:11:58 +0200
Subject: [PATCH] ASoC: qdsp6: Suggest more generic node names
Change the listed examples to use more generic node names, representing the class of the device nodes:
- apr-service@<id>
- dai@<id>
Both names are already in use in arch/arm64/boot/dts/qcom/sdm845.dtsi.
Also add #address-cells + #size-cells to the q6asm example, without them the example produces dtc warnings.
--- .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +++++++++---------- .../devicetree/bindings/sound/qcom,q6asm.txt | 7 ++- .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-)
Documentation/devicetree/bindings/sound/qcom,q6adm.txt +1 -1
@@ -29,7 +29,7 @@ used by the apr service device. Definition: Must be 0 = EXAMPLE -q6adm@8 { +apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; q6routing: routing {
Documentation/devicetree/bindings/sound/qcom,q6afe.txt +23 -23
93 lines not on this page · raw message
Documentation/devicetree/bindings/sound/qcom,q6asm.txt +5 -2
@@ -51,13 +51,16 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6asm@7 { +apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; q6asmdai: dais { compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; #sound-dai-cells = <1>; - mm@0 { + + dai@0 { reg = <0>; direction = <2>; is-compress-dai;
Documentation/devicetree/bindings/sound/qcom,q6core.txt +1 -1
@@ -15,7 +15,7 @@ used by the apr service device. example "qcom,q6core-v2.0" = EXAMPLE -q6core@3 { +apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; };
Signature · 1 line
2.20.1
Quoted 9 lines · Stephan Gerhold
Change the listed examples to use more generic node names, representing the class of the device nodes:
- apr-service@<id>
- dai@<id>Both names are already in use in
arch/arm64/boot/dts/qcom/sdm845.dtsi.[...]
Applied, thanks!
[1/2] ASoC: qdsp6: Suggest more generic node names
commit: 35c638d039bbabbca7affb52960d468951d811c1
[2/2] dt-bindings: soc: qcom: apr: Use generic node names for APR services
(not applied)
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