summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormw <mw@FreeBSD.org>2017-08-09 00:51:45 +0000
committerLuiz Souza <luiz@netgate.com>2017-09-06 11:56:15 -0500
commit0db206fddda83e86d1b4c094490eb8bf02f1c361 (patch)
tree0efd06a07c1f197ed5c7ee0c413f34ed7211d10a
parente432012be4bcd7ae568601e3a54a186cd1e2721c (diff)
downloadFreeBSD-src-0db206fddda83e86d1b4c094490eb8bf02f1c361.zip
FreeBSD-src-0db206fddda83e86d1b4c094490eb8bf02f1c361.tar.gz
Restore original /soc ranges on Marvell Armada 38x boards
Because fdt_get_ranges can process now multiple 'ranges' entries, restoring the ranges from original Linux device trees is possible. Submitted by: Patryk Duda <pdk@semihalf.com> Reviewed by: cognet (mentor) Approved by: cognet (mentor) Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D11877 (cherry picked from commit e77679c61c1faabbf8025ca8e22cfd64146d92ea)
-rw-r--r--sys/boot/fdt/dts/arm/armada-385-db-ap.dts6
-rw-r--r--sys/boot/fdt/dts/arm/armada-388-gp.dts6
-rw-r--r--sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi6
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/boot/fdt/dts/arm/armada-385-db-ap.dts b/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
index 503a439..77bd350 100644
--- a/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
+++ b/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
@@ -60,7 +60,11 @@
};
soc {
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
+ MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
+ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+ MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
internal-regs {
i2c0: i2c@11000 {
diff --git a/sys/boot/fdt/dts/arm/armada-388-gp.dts b/sys/boot/fdt/dts/arm/armada-388-gp.dts
index 4a7d4bb..2079247 100644
--- a/sys/boot/fdt/dts/arm/armada-388-gp.dts
+++ b/sys/boot/fdt/dts/arm/armada-388-gp.dts
@@ -59,7 +59,11 @@
};
soc {
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
+ MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
+ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+ MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
internal-regs {
crypto@90000 {
diff --git a/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi b/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
index bc82f4f..2595eae 100644
--- a/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
+++ b/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
@@ -57,7 +57,11 @@
};
soc {
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
+ MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
+ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+ MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
internal-regs {
ethernet@70000 {
OpenPOWER on IntegriCloud