| Message ID | 20230105144145.165010-1-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] ASoC: dt-bindings: fsl-sai: Simplify the VFxxx dmas binding | expand |
On 05/01/2023 15:41, Marek Vasut wrote: > Get rid of the vf610 sai special case, instead update the vfxxx.dtsi > DT to use the same DMA channel ordering as all the other devices. The > sai DMA channel ordering has not been aligned with other IP DMA channel > ordering in the vfxxx.dtsi anyway. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- Assuming that Linux implementation does not care about the order of these (and takes by name): Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Although other users might not be happy about change of order... Best regards, Krzysztof
On Thu, 05 Jan 2023 15:41:44 +0100, Marek Vasut wrote: > Get rid of the vf610 sai special case, instead update the vfxxx.dtsi > DT to use the same DMA channel ordering as all the other devices. The > sai DMA channel ordering has not been aligned with other IP DMA channel > ordering in the vfxxx.dtsi anyway. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: dt-bindings: fsl-sai: Simplify the VFxxx dmas binding commit: 21d64f6f63eeca9f136ac514ca801a5a6485cd78 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,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 7e56337d8edc1..088c26b001cc0 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -76,10 +76,14 @@ properties: minItems: 4 dmas: - maxItems: 2 + items: + - description: DMA controller phandle and request line for RX + - description: DMA controller phandle and request line for TX dma-names: - maxItems: 2 + items: + - const: rx + - const: tx interrupts: items: @@ -142,31 +146,6 @@ properties: allOf: - $ref: dai-common.yaml# - - if: - properties: - compatible: - contains: - const: fsl,vf610-sai - then: - properties: - dmas: - items: - - description: DMA controller phandle and request line for TX - - description: DMA controller phandle and request line for RX - dma-names: - items: - - const: tx - - const: rx - else: - properties: - dmas: - items: - - description: DMA controller phandle and request line for RX - - description: DMA controller phandle and request line for TX - dma-names: - items: - - const: rx - - const: tx - if: required: - fsl,sai-asynchronous @@ -199,9 +178,8 @@ examples: <&clks VF610_CLK_SAI2>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 21>, - <&edma0 0 20>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 20>, <&edma0 0 21>; big-endian; lsb-first; };
Get rid of the vf610 sai special case, instead update the vfxxx.dtsi DT to use the same DMA channel ordering as all the other devices. The sai DMA channel ordering has not been aligned with other IP DMA channel ordering in the vfxxx.dtsi anyway. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Adam Ford <aford173@gmail.com> Cc: Alexander Stein <alexander.stein@ew.tq-group.com> Cc: Fabio Estevam <festevam@gmail.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Marek Vasut <marex@denx.de> Cc: Mark Brown <broonie@kernel.org> Cc: Markus Niebel <Markus.Niebel@ew.tq-group.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Paul Elder <paul.elder@ideasonboard.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Richard Zhu <hongxing.zhu@nxp.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Shengjiu Wang <shengjiu.wang@nxp.com> Cc: Stefan Agner <stefan@agner.ch> Cc: Tim Harvey <tharvey@gateworks.com> Cc: alsa-devel@alsa-project.org Cc: devicetree@vger.kernel.org To: linux-arm-kernel@lists.infradead.org --- .../devicetree/bindings/sound/fsl,sai.yaml | 38 ++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-)