[PATCH] ASoC: dt-bindings: q6asm: Add Q6ASM_DAI_{TX_RX,TX,RX} defines

Srinivas Kandagatla srinivas.kandagatla at linaro.org
Mon Jul 27 11:51:57 CEST 2020



On 27/07/2020 09:25, Stephan Gerhold wrote:
> Right now the direction of a DAI has to be specified as a literal
> number in the device tree, e.g.:
> 
> 	dai at 0 {
> 		reg = <0>;
> 		direction = <2>;
> 	};
> 
> but this does not make it immediately clear that this is a
> playback/RX-only DAI.
> 
> Actually, q6asm-dai.c has useful defines for this. Move them to the
> dt-bindings header to allow using them in the dts(i) files.
> The example above then becomes:
> 
> 	dai at 0 {
> 		reg = <0>;
> 		direction = <Q6ASM_DAI_RX>;
> 	};
> 
> which is immediately recognizable as playback/RX-only DAI.
> 
> Cc: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>
> Signed-off-by: Stephan Gerhold <stephan at gerhold.net>

Thanks Stephan,

Looks good to me,

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


--srini
> ---
>   Documentation/devicetree/bindings/sound/qcom,q6asm.txt | 9 +++++----
>   include/dt-bindings/sound/qcom,q6asm.h                 | 4 ++++
>   sound/soc/qcom/qdsp6/q6asm-dai.c                       | 3 ---
>   3 files changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> index 6b9a88d0ea3f..8c4883becae9 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
> @@ -39,9 +39,9 @@ configuration of each dai. Must contain the following properties.
>   	Usage: Required for Compress offload dais
>   	Value type: <u32>
>   	Definition: Specifies the direction of the dai stream
> -			0 for both tx and rx
> -			1 for only tx (Capture/Encode)
> -			2 for only rx (Playback/Decode)
> +			Q6ASM_DAI_TX_RX (0) for both tx and rx
> +			Q6ASM_DAI_TX (1) for only tx (Capture/Encode)
> +			Q6ASM_DAI_RX (2) for only rx (Playback/Decode)
>   
>   - is-compress-dai:
>   	Usage: Required for Compress offload dais
> @@ -50,6 +50,7 @@ configuration of each dai. Must contain the following properties.
>   
>   
>   = EXAMPLE
> +#include <dt-bindings/sound/qcom,q6asm.h>
>   
>   apr-service at 7 {
>   	compatible = "qcom,q6asm";
> @@ -62,7 +63,7 @@ apr-service at 7 {
>   
>   		dai at 0 {
>   			reg = <0>;
> -			direction = <2>;
> +			direction = <Q6ASM_DAI_RX>;
>   			is-compress-dai;
>   		};
>   	};
> diff --git a/include/dt-bindings/sound/qcom,q6asm.h b/include/dt-bindings/sound/qcom,q6asm.h
> index 1eb77d87c2e8..f59d74f14395 100644
> --- a/include/dt-bindings/sound/qcom,q6asm.h
> +++ b/include/dt-bindings/sound/qcom,q6asm.h
> @@ -19,4 +19,8 @@
>   #define	MSM_FRONTEND_DAI_MULTIMEDIA15	14
>   #define	MSM_FRONTEND_DAI_MULTIMEDIA16	15
>   
> +#define Q6ASM_DAI_TX_RX	0
> +#define Q6ASM_DAI_TX	1
> +#define Q6ASM_DAI_RX	2
> +
>   #endif /* __DT_BINDINGS_Q6_ASM_H__ */
> diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
> index a2acb7564eb8..9b7b218f2a20 100644
> --- a/sound/soc/qcom/qdsp6/q6asm-dai.c
> +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
> @@ -37,9 +37,6 @@
>   #define COMPR_PLAYBACK_MAX_FRAGMENT_SIZE (128 * 1024)
>   #define COMPR_PLAYBACK_MIN_NUM_FRAGMENTS (4)
>   #define COMPR_PLAYBACK_MAX_NUM_FRAGMENTS (16 * 4)
> -#define Q6ASM_DAI_TX_RX	0
> -#define Q6ASM_DAI_TX	1
> -#define Q6ASM_DAI_RX	2
>   
>   #define ALAC_CH_LAYOUT_MONO   ((101 << 16) | 1)
>   #define ALAC_CH_LAYOUT_STEREO ((101 << 16) | 2)
> 


More information about the Alsa-devel mailing list