Skip to contentSkip to conversation

arm: dts: mediatek: Format mediatek,larbs as an array of phandles

PATCH Applied Nícolas F. R. A. Prado 2 participants 3 messages Mar 1, 2022 – Mar 2, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 arm: dts: mediatek: Format mediatek,larbs as an array of phandles

Commit 39bd2b6a3783 ("dt-bindings: Improve phandle-array schemas") updated the mediatek,larbs property in the mediatek,iommu.yaml dt-binding to make it clearer that the phandles passed to the property are independent, rather than subsequent arguments to the first phandle.

Update the mediatek,larbs property in the arm Devicetrees to use the same formatting. This change doesn't impact any behavior: the compiled dtb is exactly the same. It does however fix the warnings generated by dtbs_check.

---
v1: https://lore.kernel.org/linux-mediatek/[email protected]/

Changes in v2:
- Split arm and arm64 changes into separate commits

 arch/arm/boot/dts/mt2701.dtsi  | 2 +-
 arch/arm/boot/dts/mt7623n.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/mt2701.dtsi +1 -1
index 4776f85d6d5b..64722285228c 100644
@@ -222,7 +222,7 @@ iommu: mmsys_iommu@10205000 {
 		interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&infracfg CLK_INFRA_M4U>;
 		clock-names = "bclk";
-		mediatek,larbs = <&larb0 &larb1 &larb2>;
+		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>;
 		#iommu-cells = <1>;
 	};
 
arch/arm/boot/dts/mt7623n.dtsi +1 -1
index bcb0846e29fd..f9e031621c80 100644
@@ -107,7 +107,7 @@ iommu: mmsys_iommu@10205000 {
 		interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&infracfg CLK_INFRA_M4U>;
 		clock-names = "bclk";
-		mediatek,larbs = <&larb0 &larb1 &larb2>;
+		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>;
 		#iommu-cells = <1>;
 	};
 
Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 2/2 arm64: dts: mediatek: Format mediatek,larbs as an array of phandles

Commit 39bd2b6a3783 ("dt-bindings: Improve phandle-array schemas") updated the mediatek,larbs property in the mediatek,iommu.yaml dt-binding to make it clearer that the phandles passed to the property are independent, rather than subsequent arguments to the first phandle.

Update the mediatek,larbs property in the arm64 Devicetrees to use the same formatting. This change doesn't impact any behavior: the compiled dtb is exactly the same. It does however fix the warnings generated by dtbs_check.

---

Changes in v2:
- Split arm and arm64 changes into separate commits

 arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 6 +++---
 arch/arm64/boot/dts/mediatek/mt8167.dtsi  | 2 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi  | 4 ++--
 arch/arm64/boot/dts/mediatek/mt8183.dtsi  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/mediatek/mt2712e.dtsi +3 -3
index de16c0d80c30..973c9beade0c 100644
@@ -329,8 +329,8 @@ iommu0: iommu@10205000 {
 		interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&infracfg CLK_INFRA_M4U>;
 		clock-names = "bclk";
-		mediatek,larbs = <&larb0 &larb1 &larb2
-				  &larb3 &larb6>;
+		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>,
+				 <&larb3>, <&larb6>;
 		#iommu-cells = <1>;
 	};
 
@@ -346,7 +346,7 @@ iommu1: iommu@1020a000 {
 		interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&infracfg CLK_INFRA_M4U>;
 		clock-names = "bclk";
-		mediatek,larbs = <&larb4 &larb5 &larb7>;
+		mediatek,larbs = <&larb4>, <&larb5>, <&larb7>;
 		#iommu-cells = <1>;
 	};
 
arch/arm64/boot/dts/mediatek/mt8167.dtsi +1 -1
index 9029051624a6..54655f2feb04 100644
@@ -174,7 +174,7 @@ larb2: larb@16010000 {
 		iommu: m4u@10203000 {
 			compatible = "mediatek,mt8167-m4u";
 			reg = <0 0x10203000 0 0x1000>;
-			mediatek,larbs = <&larb0 &larb1 &larb2>;
+			mediatek,larbs = <&larb0>, <&larb1>, <&larb2>;
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_LOW>;
 			#iommu-cells = <1>;
 		};
arch/arm64/boot/dts/mediatek/mt8173.dtsi +2 -2
index 2b7d331a4588..042feaedda4a 100644
@@ -588,8 +588,8 @@ iommu: iommu@10205000 {
 			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>;
 			clocks = <&infracfg CLK_INFRA_M4U>;
 			clock-names = "bclk";
-			mediatek,larbs = <&larb0 &larb1 &larb2
-					  &larb3 &larb4 &larb5>;
+			mediatek,larbs = <&larb0>, <&larb1>, <&larb2>,
+					 <&larb3>, <&larb4>, <&larb5>;
 			#iommu-cells = <1>;
 		};
 
arch/arm64/boot/dts/mediatek/mt8183.dtsi +2 -2
index 00f2ddd245e1..523741150968 100644
@@ -682,8 +682,8 @@ iommu: iommu@10205000 {
 			compatible = "mediatek,mt8183-m4u";
 			reg = <0 0x10205000 0 0x1000>;
 			interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_LOW>;
-			mediatek,larbs = <&larb0 &larb1 &larb2 &larb3
-					  &larb4 &larb5 &larb6>;
+			mediatek,larbs = <&larb0>, <&larb1>, <&larb2>, <&larb3>,
+					 <&larb4>, <&larb5>, <&larb6>;
 			#iommu-cells = <1>;
 		};
 
Signature · 1 line
2.35.1
maintainer Applied
#2 lore raw
In reply to Nícolas F. R. A. Prado
Quoted 5 lines · Nícolas F. R. A. Prado

Commit 39bd2b6a3783 ("dt-bindings: Improve phandle-array schemas") updated the mediatek,larbs property in the mediatek,iommu.yaml dt-binding to make it clearer that the phandles passed to the property are independent, rather than subsequent arguments to the first phandle.

Quoted 7 lines

Update the mediatek,larbs property in the arm Devicetrees to use the same formatting. This change doesn't impact any behavior: the compiled dtb is exactly the same. It does however fix the warnings generated by dtbs_check.

Applied, thanks!

Matthias

Quoted 36 lines

---
v1: https://lore.kernel.org/linux-mediatek/[email protected]/

Changes in v2:
- Split arm and arm64 changes into separate commits

  arch/arm/boot/dts/mt2701.dtsi  | 2 +-
  arch/arm/boot/dts/mt7623n.dtsi | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/mt2701.dtsi +1 -1
index 4776f85d6d5b..64722285228c 100644
@@ -222,7 +222,7 @@ iommu: mmsys_iommu@10205000 {
  		interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&infracfg CLK_INFRA_M4U>;
  		clock-names = "bclk";
-		mediatek,larbs = <&larb0 &larb1 &larb2>;
+		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>;
  		#iommu-cells = <1>;
  	};
 
arch/arm/boot/dts/mt7623n.dtsi +1 -1
index bcb0846e29fd..f9e031621c80 100644
@@ -107,7 +107,7 @@ iommu: mmsys_iommu@10205000 {
  		interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&infracfg CLK_INFRA_M4U>;
  		clock-names = "bclk";
-		mediatek,larbs = <&larb0 &larb1 &larb2>;
+		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>;
  		#iommu-cells = <1>;
  	};