| Message ID | 2185a3ec866bc59f82d93b73d1a732a896fd8f48.1592369271.git.shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 56d6663d41f982542097775a3a8a6a1b867fe608 |
| Headers | show |
| Series | [v2,1/2] ASoC: bindings: fsl-asoc-card: Add compatible string for MQS | expand |
On Wed, 17 Jun 2020 12:48:24 +0800, Shengjiu Wang wrote: > Add compatible string "fsl,imx-audio-mqs" for MQS, and move > "audio-routing" property to be optional for MQS doesn't need > such property. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: bindings: fsl-asoc-card: Add compatible string for MQS commit: 56d6663d41f982542097775a3a8a6a1b867fe608 [2/2] ASoC: fsl-asoc-card: Add MQS support commit: 039652a5b965404aee1fa8f61017f822668f41d4 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
diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index c60a5732d29c..ca9a3a43adfd 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -34,6 +34,8 @@ The compatible list for this generic sound card currently: "fsl,imx-audio-wm8960" + "fsl,imx-audio-mqs" + Required properties: - compatible : Contains one of entries in the compatible list. @@ -44,6 +46,11 @@ Required properties: - audio-codec : The phandle of an audio codec +Optional properties: + + - audio-asrc : The phandle of ASRC. It can be absent if there's no + need to add ASRC support via DPCM. + - audio-routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's @@ -60,11 +67,6 @@ Required properties: coexisting in order to support the old bindings of wm8962 and sgtl5000. -Optional properties: - - - audio-asrc : The phandle of ASRC. It can be absent if there's no - need to add ASRC support via DPCM. - Optional unless SSI is selected as a CPU DAI: - mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)
Add compatible string "fsl,imx-audio-mqs" for MQS, and move "audio-routing" property to be optional for MQS doesn't need such property. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- changes in v2 - Move "audio-routing" to optional. .../devicetree/bindings/sound/fsl-asoc-card.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)