| Message ID | 20220310114553.184763-2-sergiu.moga@microchip.com |
|---|---|
| State | Accepted |
| Commit | df96e96a8c6f61db17a640cbac00494d13ed0779 |
| Headers | show |
| Series | dt-bindings: i2c: convert i2c-at91 to json-schema | expand |
On 10/03/2022 at 12:45, Sergiu Moga wrote: > Swap `rx` and `tx` for the `dma-names` property of the `i2c` nodes > in order to maintain consistency across Microchip/Atmel SoC files. > > Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com> > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> As it fixes some of the warning in dt schema check in 5.18-rc1, I queue this patch in "fixes" branch for 5.18. Thanks, best regards, Nicolas > --- > arch/arm/boot/dts/sama7g5.dtsi | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi > index 4decd3a91a76..f691c8f08d04 100644 > --- a/arch/arm/boot/dts/sama7g5.dtsi > +++ b/arch/arm/boot/dts/sama7g5.dtsi > @@ -601,9 +601,9 @@ i2c1: i2c@600 { > #size-cells = <0>; > clocks = <&pmc PMC_TYPE_PERIPHERAL 39>; > atmel,fifo-size = <32>; > - dmas = <&dma0 AT91_XDMAC_DT_PERID(7)>, > - <&dma0 AT91_XDMAC_DT_PERID(8)>; > - dma-names = "rx", "tx"; > + dmas = <&dma0 AT91_XDMAC_DT_PERID(8)>, > + <&dma0 AT91_XDMAC_DT_PERID(7)>; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > }; > @@ -786,9 +786,9 @@ i2c8: i2c@600 { > #size-cells = <0>; > clocks = <&pmc PMC_TYPE_PERIPHERAL 46>; > atmel,fifo-size = <32>; > - dmas = <&dma0 AT91_XDMAC_DT_PERID(21)>, > - <&dma0 AT91_XDMAC_DT_PERID(22)>; > - dma-names = "rx", "tx"; > + dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>, > + <&dma0 AT91_XDMAC_DT_PERID(21)>; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > }; > @@ -810,9 +810,9 @@ i2c9: i2c@600 { > #size-cells = <0>; > clocks = <&pmc PMC_TYPE_PERIPHERAL 47>; > atmel,fifo-size = <32>; > - dmas = <&dma0 AT91_XDMAC_DT_PERID(23)>, > - <&dma0 AT91_XDMAC_DT_PERID(24)>; > - dma-names = "rx", "tx"; > + dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>, > + <&dma0 AT91_XDMAC_DT_PERID(23)>; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > };
diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi index 4decd3a91a76..f691c8f08d04 100644 --- a/arch/arm/boot/dts/sama7g5.dtsi +++ b/arch/arm/boot/dts/sama7g5.dtsi @@ -601,9 +601,9 @@ i2c1: i2c@600 { #size-cells = <0>; clocks = <&pmc PMC_TYPE_PERIPHERAL 39>; atmel,fifo-size = <32>; - dmas = <&dma0 AT91_XDMAC_DT_PERID(7)>, - <&dma0 AT91_XDMAC_DT_PERID(8)>; - dma-names = "rx", "tx"; + dmas = <&dma0 AT91_XDMAC_DT_PERID(8)>, + <&dma0 AT91_XDMAC_DT_PERID(7)>; + dma-names = "tx", "rx"; status = "disabled"; }; }; @@ -786,9 +786,9 @@ i2c8: i2c@600 { #size-cells = <0>; clocks = <&pmc PMC_TYPE_PERIPHERAL 46>; atmel,fifo-size = <32>; - dmas = <&dma0 AT91_XDMAC_DT_PERID(21)>, - <&dma0 AT91_XDMAC_DT_PERID(22)>; - dma-names = "rx", "tx"; + dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>, + <&dma0 AT91_XDMAC_DT_PERID(21)>; + dma-names = "tx", "rx"; status = "disabled"; }; }; @@ -810,9 +810,9 @@ i2c9: i2c@600 { #size-cells = <0>; clocks = <&pmc PMC_TYPE_PERIPHERAL 47>; atmel,fifo-size = <32>; - dmas = <&dma0 AT91_XDMAC_DT_PERID(23)>, - <&dma0 AT91_XDMAC_DT_PERID(24)>; - dma-names = "rx", "tx"; + dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>, + <&dma0 AT91_XDMAC_DT_PERID(23)>; + dma-names = "tx", "rx"; status = "disabled"; }; };