Commit 3e372088 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'stratix10_fix_for_v5.1' of...

Merge tag 'stratix10_fix_for_v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

arm64: dts: stratix10: fix emac loading warning
- Add missing "altr,sysmgr-syscon" property to all gmac nodes

* tag 'stratix10_fix_for_v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 57683e45 8efd6365
...@@ -162,6 +162,7 @@ gmac0: ethernet@ff800000 { ...@@ -162,6 +162,7 @@ gmac0: ethernet@ff800000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 1>; iommus = <&smmu 1>;
altr,sysmgr-syscon = <&sysmgr 0x44 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -179,6 +180,7 @@ gmac1: ethernet@ff802000 { ...@@ -179,6 +180,7 @@ gmac1: ethernet@ff802000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 2>; iommus = <&smmu 2>;
altr,sysmgr-syscon = <&sysmgr 0x48 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -196,6 +198,7 @@ gmac2: ethernet@ff804000 { ...@@ -196,6 +198,7 @@ gmac2: ethernet@ff804000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 3>; iommus = <&smmu 3>;
altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment