leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: dts: hisilicon: normalize the node name of the SMMU devices

Browse Source 
Change the node name of the SMMU devices to match "^iommu@[0-9a-f]*".
Otherwise, the errors similar to the following will be reported by
arm,smmu-v3.yaml.

smmu_pcie: $nodename:0: 'smmu_pcie' does not match '^iommu@[0-9a-f]*'

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
This commit is contained in:
Zhen Lei 2020-10-12 21:17:34 +08:00 committed by Wei Xu
parent ee6ff04f7f
commit d7d45d5d11
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/hisilicon/hip06.dtsi
View File

@ -330,7 +330,7 @@
* when iommu-map entry is used along with the PCIe node. * when iommu-map entry is used along with the PCIe node.
* Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html * Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html
*/ */
smmu0: smmu_pcie { smmu0: iommu@a0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x0 0xa0040000 0x0 0x20000>; reg = <0x0 0xa0040000 0x0 0x20000>;
#iommu-cells = <1>; #iommu-cells = <1>;

10
arch/arm64/boot/dts/hisilicon/hip07.dtsi
View File

@ -1161,7 +1161,7 @@
* when iommu-map entry is used along with the PCIe node. * when iommu-map entry is used along with the PCIe node.
* Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html * Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html
*/ */
smmu0: smmu_pcie { smmu0: iommu@a0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x0 0xa0040000 0x0 0x20000>; reg = <0x0 0xa0040000 0x0 0x20000>;
#iommu-cells = <1>; #iommu-cells = <1>;
@ -1170,7 +1170,7 @@
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
status = "disabled"; status = "disabled";
}; };
p0_smmu_alg_a: smmu_alg@d0040000 { p0_smmu_alg_a: iommu@d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x0 0xd0040000 0x0 0x20000>; reg = <0x0 0xd0040000 0x0 0x20000>;
interrupt-parent = <&p0_mbigen_smmu_alg_a>; interrupt-parent = <&p0_mbigen_smmu_alg_a>;
@ -1183,7 +1183,7 @@
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/ /* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p0_smmu_alg_b: smmu_alg@8,d0040000 { p0_smmu_alg_b: iommu@8d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x8 0xd0040000 0x0 0x20000>; reg = <0x8 0xd0040000 0x0 0x20000>;
interrupt-parent = <&p0_mbigen_smmu_alg_b>; interrupt-parent = <&p0_mbigen_smmu_alg_b>;
@ -1196,7 +1196,7 @@
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/ /* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p1_smmu_alg_a: smmu_alg@400,d0040000 { p1_smmu_alg_a: iommu@400d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x400 0xd0040000 0x0 0x20000>; reg = <0x400 0xd0040000 0x0 0x20000>;
interrupt-parent = <&p1_mbigen_smmu_alg_a>; interrupt-parent = <&p1_mbigen_smmu_alg_a>;
@ -1209,7 +1209,7 @@
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/ /* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p1_smmu_alg_b: smmu_alg@408,d0040000 { p1_smmu_alg_b: iommu@408d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
reg = <0x408 0xd0040000 0x0 0x20000>; reg = <0x408 0xd0040000 0x0 0x20000>;
interrupt-parent = <&p1_mbigen_smmu_alg_b>; interrupt-parent = <&p1_mbigen_smmu_alg_b>;