[PATCH 1/2] dt-bindings: ASoC: qdsp6: Suggest more generic node names

[Srinivas Kandagatla]

On 15/04/2020 09:11, Stephan Gerhold wrote:
> 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.
> 
> Cc: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>
> Signed-off-by: Stephan Gerhold <stephan at gerhold.net>

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>


> ---
>   .../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(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt
> index bbae426cdfb1..15c353a20de8 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt
> +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt
> @@ -29,7 +29,7 @@ used by the apr service device.
>   	Definition: Must be 0
>   
>   = EXAMPLE
> -q6adm at 8 {
> +apr-service at 8 {
>   	compatible = "qcom,q6adm";
>   	reg = <APR_SVC_ADM>;
>   	q6routing: routing {
> diff --git a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
> index d74888b9f1bb..4916dd6a0896 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
> +++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
> @@ -100,7 +100,7 @@ configuration of each dai. Must contain the following properties.
>   
>   = EXAMPLE
>   
> -q6afe at 4 {
> +apr-service at 4 {
>   	compatible = "qcom,q6afe";
>   	reg = <APR_SVC_AFE>;
>   
> @@ -110,12 +110,12 @@ q6afe at 4 {
>   		#address-cells = <1>;
>   		#size-cells = <0>;
>   
> -		hdmi at 1 {
> -			reg = <1>;
> +		dai at 1 {
> +			reg = <HDMI_RX>;
>   		};
>   
> -		tdm at 24 {
> -			reg = <24>;
> +		dai at 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 at 4 {
>   
>   		};
>   
> -		tdm at 25 {
> -			reg = <25>;
> +		dai at 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 at 4 {
>   			qcom,tdm-data-align = <0>;
>   		};
>   
> -		prim-mi2s-rx at 16 {
> -			reg = <16>;
> +		dai at 16 {
> +			reg = <PRIMARY_MI2S_RX>;
>   			qcom,sd-lines = <0 2>;
>   		};
>   
> -		prim-mi2s-tx at 17 {
> -			reg = <17>;
> +		dai at 17 {
> +			reg = <PRIMARY_MI2S_TX>;
>   			qcom,sd-lines = <1>;
>   		};
>   
> -		sec-mi2s-rx at 18 {
> -			reg = <18>;
> +		dai at 18 {
> +			reg = <SECONDARY_MI2S_RX>;
>   			qcom,sd-lines = <0 3>;
>   		};
>   
> -		sec-mi2s-tx at 19 {
> -			reg = <19>;
> +		dai at 19 {
> +			reg = <SECONDARY_MI2S_TX>;
>   			qcom,sd-lines = <1>;
>   		};
>   
> -		tert-mi2s-rx at 20 {
> -			reg = <20>;
> +		dai at 20 {
> +			reg = <TERTIARY_MI2S_RX>;
>   			qcom,sd-lines = <1 3>;
>   		};
>   
> -		tert-mi2s-tx at 21 {
> -			reg = <21>;
> +		dai at 21 {
> +			reg = <TERTIARY_MI2S_TX>;
>   			qcom,sd-lines = <0>;
>   		};
>   
> -		quat-mi2s-rx at 22 {
> -			reg = <22>;
> +		dai at 22 {
> +			reg = <QUATERNARY_MI2S_RX>;
>   			qcom,sd-lines = <0>;
>   		};
>   
> -		quat-mi2s-tx at 23 {
> -			reg = <23>;
> +		dai at 23 {
> +			reg = <QUATERNARY_MI2S_TX>;
>   			qcom,sd-lines = <1>;
>   		};
>   	};
> diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> index 9f5378c51686..6b9a88d0ea3f 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> @@ -51,13 +51,16 @@ configuration of each dai. Must contain the following properties.
>   
>   = EXAMPLE
>   
> -q6asm at 7 {
> +apr-service at 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 at 0 {
> +
> +		dai at 0 {
>   			reg = <0>;
>   			direction = <2>;
>   			is-compress-dai;
> diff --git a/Documentation/devicetree/bindings/sound/qcom,q6core.txt b/Documentation/devicetree/bindings/sound/qcom,q6core.txt
> index 7f36ff8bec18..5cd4cc9b1fde 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,q6core.txt
> +++ b/Documentation/devicetree/bindings/sound/qcom,q6core.txt
> @@ -15,7 +15,7 @@ used by the apr service device.
>   		   example "qcom,q6core-v2.0"
>   
>   = EXAMPLE
> -q6core at 3 {
> +apr-service at 3 {
>   	compatible = "qcom,q6core";
>   	reg = <APR_SVC_ADSP_CORE>;
>   };
>