| Message ID | 20230105144145.165010-2-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 |
Am Donnerstag, dem 05.01.2023 um 15:41 +0100 schrieb Marek Vasut: > Swap the SAI dmas and dma-names to match the order documented in > Documentation/devicetree/bindings/sound/fsl,sai.yaml > No functional change. > While I'm not opposing this patch, I find this class of changes a bit odd. The *-names properties are there so the properties they are naming can be in any order in the DT without impacting the lookup. Enforcing a fixed order for named properties just feels odd. Not sure if the schema validation could take this into account or if there is any policy in place already by the DT maintainer that we still want to enforce the same order in the DTs as in the bindings. Regards, Lucas > 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 > --- > arch/arm/boot/dts/vfxxx.dtsi | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi > index d53f9c9db8bfd..ff4479994b600 100644 > --- a/arch/arm/boot/dts/vfxxx.dtsi > +++ b/arch/arm/boot/dts/vfxxx.dtsi > @@ -191,9 +191,8 @@ sai0: sai@4002f000 { > <&clks VF610_CLK_SAI0_DIV>, > <&clks 0>, <&clks 0>; > clock-names = "bus", "mclk1", "mclk2", "mclk3"; > - dma-names = "tx", "rx"; > - dmas = <&edma0 0 17>, > - <&edma0 0 16>; > + dma-names = "rx", "tx"; > + dmas = <&edma0 0 16>, <&edma0 0 17>; > status = "disabled"; > }; > > @@ -205,9 +204,8 @@ sai1: sai@40030000 { > <&clks VF610_CLK_SAI1_DIV>, > <&clks 0>, <&clks 0>; > clock-names = "bus", "mclk1", "mclk2", "mclk3"; > - dma-names = "tx", "rx"; > - dmas = <&edma0 0 19>, > - <&edma0 0 18>; > + dma-names = "rx", "tx"; > + dmas = <&edma0 0 18>, <&edma0 0 19>; > status = "disabled"; > }; > > @@ -219,9 +217,8 @@ sai2: sai@40031000 { > <&clks VF610_CLK_SAI2_DIV>, > <&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>; > status = "disabled"; > }; > > @@ -233,9 +230,8 @@ sai3: sai@40032000 { > <&clks VF610_CLK_SAI3_DIV>, > <&clks 0>, <&clks 0>; > clock-names = "bus", "mclk1", "mclk2", "mclk3"; > - dma-names = "tx", "rx"; > - dmas = <&edma0 1 9>, > - <&edma0 1 8>; > + dma-names = "rx", "tx"; > + dmas = <&edma0 1 8>, <&edma0 1 9>; > status = "disabled"; > }; >
On 06/01/2023 10:18, Lucas Stach wrote: > Am Donnerstag, dem 05.01.2023 um 15:41 +0100 schrieb Marek Vasut: >> Swap the SAI dmas and dma-names to match the order documented in >> Documentation/devicetree/bindings/sound/fsl,sai.yaml >> No functional change. >> > While I'm not opposing this patch, I find this class of changes a bit > odd. The *-names properties are there so the properties they are naming > can be in any order in the DT without impacting the lookup. Enforcing a > fixed order for named properties just feels odd. DT requires fixed order regardless of '-names' property. '-names' are not there to fulfill "can be in any order", but merely a helper. > > Not sure if the schema validation could take this into account or if > there is any policy in place already by the DT maintainer that we still > want to enforce the same order in the DTs as in the bindings. The order in DTS must obviously match bindings, however here both are changed, so what is exactly your concern? Best regards, Krzysztof
On Thu, Jan 05, 2023 at 03:41:45PM +0100, Marek Vasut wrote: > Swap the SAI dmas and dma-names to match the order documented in > Documentation/devicetree/bindings/sound/fsl,sai.yaml > No functional change. > > Signed-off-by: Marek Vasut <marex@denx.de> Applied, thanks!
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index d53f9c9db8bfd..ff4479994b600 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -191,9 +191,8 @@ sai0: sai@4002f000 { <&clks VF610_CLK_SAI0_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 17>, - <&edma0 0 16>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 16>, <&edma0 0 17>; status = "disabled"; }; @@ -205,9 +204,8 @@ sai1: sai@40030000 { <&clks VF610_CLK_SAI1_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 0 19>, - <&edma0 0 18>; + dma-names = "rx", "tx"; + dmas = <&edma0 0 18>, <&edma0 0 19>; status = "disabled"; }; @@ -219,9 +217,8 @@ sai2: sai@40031000 { <&clks VF610_CLK_SAI2_DIV>, <&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>; status = "disabled"; }; @@ -233,9 +230,8 @@ sai3: sai@40032000 { <&clks VF610_CLK_SAI3_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dma-names = "tx", "rx"; - dmas = <&edma0 1 9>, - <&edma0 1 8>; + dma-names = "rx", "tx"; + dmas = <&edma0 1 8>, <&edma0 1 9>; status = "disabled"; };
Swap the SAI dmas and dma-names to match the order documented in Documentation/devicetree/bindings/sound/fsl,sai.yaml No functional change. 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 --- arch/arm/boot/dts/vfxxx.dtsi | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)