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.

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200415081159.1098-2-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt
index f8fa71f..2e2f6dc 100644 (file)
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt
@@ -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";