Skip to contentSkip to conversation

arm64: dts: xilinx: Align IOMMU nodename with dtschema

PATCH Applied Krzysztof Kozlowski 2 participants 4 messages Jun 29, 2020 – Aug 17, 2020

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

PATCH 1/1 arm64: dts: xilinx: Align IOMMU nodename with dtschema

Fix dtschema validator warnings like:

    smmu@fd800000: $nodename:0: 'smmu@fd800000' does not match '^iommu@[0-9a-f]*'
---
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
index 9174ddc76bdc..2b82206eba02 100644
@@ -601,7 +601,7 @@
 			power-domains = <&zynqmp_firmware PD_SD_1>;
 		};
 
-		smmu: smmu@fd800000 {
+		smmu: iommu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;
 			status = "disabled";
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#1 lore raw
Quoted 14 lines · Krzysztof Kozlowski

Fix dtschema validator warnings like:

    smmu@fd800000: $nodename:0: 'smmu@fd800000' does not match '^iommu@[0-9a-f]*'
---
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +0 -0
index 9174ddc76bdc..2b82206eba02 100644

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 607

Quoted 8 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
@@ -601,7 +601,7 @@
 			power-domains = <&zynqmp_firmware PD_SD_1>;
 		};
 
-		smmu: smmu@fd800000 {
+		smmu: iommu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;
 			status = "disabled";

Applied.

Thanks,
Michal

#2 lore raw
Quoted 19 lines · Michal Simek
Quoted 16 lines · Krzysztof Kozlowski

Fix dtschema validator warnings like:

    smmu@fd800000: $nodename:0: 'smmu@fd800000' does not match '^iommu@[0-9a-f]*'
---
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +0 -0
index 9174ddc76bdc..2b82206eba02 100644
@@ -601,7 +601,7 @@
 			power-domains = <&zynqmp_firmware PD_SD_1>;
 		};
 
Quoted 8 lines

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 607

Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
-		smmu: smmu@fd800000 {
+		smmu: iommu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;
 			status = "disabled";

Applied.

Hi Michal,

What happened with this patch? I cannot find it in Linus' nor in next/master trees.

Best regards,
Krzysztof

#3 lore raw

Hi,

Quoted 29 lines · Krzysztof Kozlowski
Quoted 19 lines · Michal Simek
Quoted 16 lines · Krzysztof Kozlowski

Fix dtschema validator warnings like:

    smmu@fd800000: $nodename:0: 'smmu@fd800000' does not match '^iommu@[0-9a-f]*'
---
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +0 -0
index 9174ddc76bdc..2b82206eba02 100644
@@ -601,7 +601,7 @@
 			power-domains = <&zynqmp_firmware PD_SD_1>;
 		};
 
Quoted 8 lines

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 607

Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
-		smmu: smmu@fd800000 {
+		smmu: iommu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;
 			status = "disabled";

Applied.

Quoted 4 lines

Hi Michal,

What happened with this patch? I cannot find it in Linus' nor in next/master trees.

Laurent sent one patch before yours which depend on binding doc merged from different tree. Here is the link.
https://lore.kernel.org/lkml/[email protected]/

That's why I didn't send my PR for rc1.
But your patch is listed here.
https://github.com/Xilinx/linux-xlnx/commits/zynqmp/dt

I will rebase it based on rc1 and retest and send PR to arm-soc guys soon.

Thanks,
Michal