ASoC: dt-bindings: q6asm: Add Q6ASM_DAI_{TX_RX, TX, RX} defines
Subsystems (5)
PATCH 1/1 ASoC: dt-bindings: q6asm: Add Q6ASM_DAI_{TX_RX, TX, RX} defines
Right now the direction of a DAI has to be specified as a literal number in the device tree, e.g.:
dai@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@0 {
reg = <0>;
direction = <Q6ASM_DAI_RX>;
};which is immediately recognizable as playback/RX-only DAI.
--- 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(-)
Documentation/devicetree/bindings/sound/qcom,q6asm.txt +5 -4
@@ -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@7 { compatible = "qcom,q6asm";
@@ -62,7 +63,7 @@ apr-service@7 { dai@0 { reg = <0>; - direction = <2>; + direction = <Q6ASM_DAI_RX>; is-compress-dai; }; };
include/dt-bindings/sound/qcom,q6asm.h +4 -0
@@ -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__ */
sound/soc/qcom/qdsp6/q6asm-dai.c +0 -3
@@ -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)
Signature · 1 line
2.27.0
Re: [PATCH] ASoC: dt-bindings: q6asm: Add Q6ASM_DAI_{TX_RX,TX,RX} defines
Quoted 20 lines · Stephan Gerhold
Right now the direction of a DAI has to be specified as a literal number in the device tree, e.g.:
dai@0 { reg = <0>; direction = <2>; };but this does not make it immediately clear that this is a playback/RX-only DAI.
Actually,
q6asm-dai.chas 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@0 { reg = <0>; direction = <Q6ASM_DAI_RX>; };
Quoted 4 lines
which is immediately recognizable as playback/RX-only DAI.
Cc Srinivas Kandagatla <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>
Thanks Stephan,
Looks good to me,
--srini
Quoted 68 lines
--- 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(-)Documentation/devicetree/bindings/sound/qcom,q6asm.txt +5
-4@@ -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@7 { compatible = "qcom,q6asm";@@ -62,7 +63,7 @@ apr-service@7 { dai@0 { reg = <0>; - direction = <2>; + direction = <Q6ASM_DAI_RX>; is-compress-dai; }; };include/dt-bindings/sound/qcom,q6asm.h +4
-0@@ -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__ */ sound/soc/qcom/qdsp6/q6asm-dai.c +0
-3@@ -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)
Mark Brown
maintainerQuoted 9 lines · Stephan Gerhold
Right now the direction of a DAI has to be specified as a literal number in the device tree, e.g.:
dai@0 { reg = <0>; direction = <2>; };[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: dt-bindings: q6asm: Add Q6ASM_DAI_{TX_RX, TX, RX} defines
commit: 34facb04228b36006a37727fddee59cf069d95d4
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