9 files changed, 23 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 55b986cc4356..5920b4e4b74c 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -30,6 +30,8 @@
        };
        soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
                internal-regs {
                        serial@12000 {
                                clock-frequency = <200000000>;
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 37530afd8af0..a4202b6c16c2 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -25,6 +25,8 @@
        };
        soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
                internal-regs {
                        serial@12000 {
                                clock-frequency = <200000000>;
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 7aa2171fbc76..dd0ba018b628 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -28,6 +28,8 @@
        };
        soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
                internal-regs {
                        serial@12000 {
                                clock-frequency = <200000000>;
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 90b117624abb..62639b4a61f9 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -18,6 +18,8 @@
 /include/ "skeleton64.dtsi"
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 / {
        model = "Marvell Armada 370 and XP SoC";
        compatible = "marvell,armada-370-xp";
@@ -38,18 +40,21 @@
        };
        soc {
-                #address-cells = <1>;
+                #address-cells = <2>;
                #size-cells = <1>;
-                compatible = "simple-bus";
+                controller = <&mbusc>;
                interrupt-parent = <&mpic>;
-                ranges = <0          0 0xd0000000 0x0100000 /* internal registers */
-                          0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
                internal-regs {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                        ranges;
+                        ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
+                        mbusc: mbus-controller@20000 {
+                                compatible = "marvell,mbus-controller";
+                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                        };
                        mpic: interrupt-controller@20000 {
                                compatible = "marvell,mpic";
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 08ec6e3a9c7a..4b54e511baef 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -29,8 +29,8 @@
        };
        soc {
-                ranges = <0          0xd0000000 0x0100000 /* internal registers */
+                compatible = "marvell,armada370-mbus", "simple-bus";
-                          0xe0000000 0xe0000000 0x8100000 /* PCIe */>;
                internal-regs {
                        system-controller@18200 {
                                compatible = "marvell,armada-370-xp-system-controller";
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index a9bd766c5324..0d4ce54d0c2d 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -30,9 +30,7 @@
        };
        soc {
-                ranges = <0          0 0xd0000000 0x100000      /* Internal registers 1MiB */
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
-                          0xe0000000 0 0xe0000000 0x8100000     /* PCIe */
-                          0xf0000000 0 0xf0000000 0x1000000>;   /* Device Bus, NOR 16MiB   */
                internal-regs {
                        serial@12000 {
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 54843e5a049f..2fa920987780 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -39,9 +39,7 @@
        };
        soc {
-                ranges = <0          0 0xd0000000 0x100000  /* Internal registers 1MiB */
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
-                          0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
-                          0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB  */>;
                internal-regs {
                        serial@12000 {
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index d090264d81dd..a3e3a1290ff5 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -27,9 +27,7 @@
        };
        soc {
-                ranges = <0          0 0xd0000000 0x100000      /* Internal registers 1MiB */
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
-                          0xe0000000 0 0xe0000000 0x8100000     /* PCIe */
-                          0xf0000000 0 0xf0000000 0x8000000     /* Device Bus, NOR 128MiB   */>;
                internal-regs {
                        serial@12000 {
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 8c07bfe21ee8..803382497c35 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -27,6 +27,8 @@
        };
        soc {
+                compatible = "marvell,armadaxp-mbus", "simple-bus";
                internal-regs {
                        L2: l2-cache {
                                compatible = "marvell,aurora-system-cache";

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index 55b986cc4356..5920b4e4b74c 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -30,6 +30,8 @@
30	};	30	};
31		31
32	soc {	32	soc {
		33	ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
		34
33	internal-regs {	35	internal-regs {
34	serial@12000 {	36	serial@12000 {
35	clock-frequency = <200000000>;	37	clock-frequency = <200000000>;


diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 37530afd8af0..a4202b6c16c2 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -25,6 +25,8 @@
25	};	25	};
26		26
27	soc {	27	soc {
		28	ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
		29
28	internal-regs {	30	internal-regs {
29	serial@12000 {	31	serial@12000 {
30	clock-frequency = <200000000>;	32	clock-frequency = <200000000>;


diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 7aa2171fbc76..dd0ba018b628 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -28,6 +28,8 @@
28	};	28	};
29		29
30	soc {	30	soc {
		31	ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
		32
31	internal-regs {	33	internal-regs {
32	serial@12000 {	34	serial@12000 {
33	clock-frequency = <200000000>;	35	clock-frequency = <200000000>;


diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 90b117624abb..62639b4a61f9 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -18,6 +18,8 @@
18		18
19	/include/ "skeleton64.dtsi"	19	/include/ "skeleton64.dtsi"
20		20
		21	#define MBUS_ID(target,attributes) (((target) << 24) \| ((attributes) << 16))
		22
21	/ {	23	/ {
22	model = "Marvell Armada 370 and XP SoC";	24	model = "Marvell Armada 370 and XP SoC";
23	compatible = "marvell,armada-370-xp";	25	compatible = "marvell,armada-370-xp";
@@ -38,18 +40,21 @@
38	};	40	};
39		41
40	soc {	42	soc {
41	#address-cells = <1>;	43	#address-cells = <2>;
42	#size-cells = <1>;	44	#size-cells = <1>;
43	compatible = "simple-bus";	45	controller = <&mbusc>;
44	interrupt-parent = <&mpic>;	46	interrupt-parent = <&mpic>;
45	ranges = <0 0 0xd0000000 0x0100000 /* internal registers */
46	0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
47		47
48	internal-regs {	48	internal-regs {
49	compatible = "simple-bus";	49	compatible = "simple-bus";
50	#address-cells = <1>;	50	#address-cells = <1>;
51	#size-cells = <1>;	51	#size-cells = <1>;
52	ranges;	52	ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
		53
		54	mbusc: mbus-controller@20000 {
		55	compatible = "marvell,mbus-controller";
		56	reg = <0x20000 0x100>, <0x20180 0x20>;
		57	};
53		58
54	mpic: interrupt-controller@20000 {	59	mpic: interrupt-controller@20000 {
55	compatible = "marvell,mpic";	60	compatible = "marvell,mpic";


diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 08ec6e3a9c7a..4b54e511baef 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -29,8 +29,8 @@
29	};	29	};
30		30
31	soc {	31	soc {
32	ranges = <0 0xd0000000 0x0100000 /* internal registers */	32	compatible = "marvell,armada370-mbus", "simple-bus";
33	0xe0000000 0xe0000000 0x8100000 /* PCIe */>;	33
34	internal-regs {	34	internal-regs {
35	system-controller@18200 {	35	system-controller@18200 {
36	compatible = "marvell,armada-370-xp-system-controller";	36	compatible = "marvell,armada-370-xp-system-controller";


diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index a9bd766c5324..0d4ce54d0c2d 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -30,9 +30,7 @@
30	};	30	};
31		31
32	soc {	32	soc {
33	ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */	33	ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
34	0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
35	0xf0000000 0 0xf0000000 0x1000000>; /* Device Bus, NOR 16MiB */
36		34
37	internal-regs {	35	internal-regs {
38	serial@12000 {	36	serial@12000 {


diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 54843e5a049f..2fa920987780 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -39,9 +39,7 @@
39	};	39	};
40		40
41	soc {	41	soc {
42	ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */	42	ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
43	0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
44	0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB */>;
45		43
46	internal-regs {	44	internal-regs {
47	serial@12000 {	45	serial@12000 {


diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index d090264d81dd..a3e3a1290ff5 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -27,9 +27,7 @@
27	};	27	};
28		28
29	soc {	29	soc {
30	ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */	30	ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
31	0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
32	0xf0000000 0 0xf0000000 0x8000000 /* Device Bus, NOR 128MiB */>;
33		31
34	internal-regs {	32	internal-regs {
35	serial@12000 {	33	serial@12000 {


diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 8c07bfe21ee8..803382497c35 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -27,6 +27,8 @@
27	};	27	};
28		28
29	soc {	29	soc {
		30	compatible = "marvell,armadaxp-mbus", "simple-bus";
		31
30	internal-regs {	32	internal-regs {
31	L2: l2-cache {	33	L2: l2-cache {
32	compatible = "marvell,aurora-system-cache";	34	compatible = "marvell,aurora-system-cache";