1 files changed, 71 insertions, 52 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index e34b280ce6ec..2353b1f13704 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -30,68 +30,87 @@
        };
        soc {
-                serial@d0012000 {
+                internal-regs {
-                        clock-frequency = <200000000>;
+                        serial@12000 {
-                        status = "okay";
+                                clock-frequency = <200000000>;
-                };
+                                status = "okay";
-                sata@d00a0000 {
+                        };
-                        nr-ports = <2>;
+                        sata@a0000 {
-                        status = "okay";
+                                nr-ports = <2>;
-                };
+                                status = "okay";
+                        };
-                mdio {
+                        mdio {
-                        phy0: ethernet-phy@0 {
+                                phy0: ethernet-phy@0 {
-                                reg = <0>;
+                                        reg = <0>;
+                                };
+                                phy1: ethernet-phy@1 {
+                                        reg = <1>;
+                                };
                        };
-                        phy1: ethernet-phy@1 {
+                        ethernet@70000 {
-                                reg = <1>;
+                                status = "okay";
+                                phy = <&phy0>;
+                                phy-mode = "rgmii-id";
+                        };
+                        ethernet@74000 {
+                                status = "okay";
+                                phy = <&phy1>;
+                                phy-mode = "rgmii-id";
                        };
-                };
-                ethernet@d0070000 {
+                        mvsdio@d4000 {
-                        status = "okay";
+                                pinctrl-0 = <&sdio_pins1>;
-                        phy = <&phy0>;
+                                pinctrl-names = "default";
-                        phy-mode = "rgmii-id";
+                                /*
-                };
+                                 * This device is disabled by default, because
-                ethernet@d0074000 {
+                                 * using the SD card connector requires
-                        status = "okay";
+                                 * changing the default CON40 connector
-                        phy = <&phy1>;
+                                 * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a
-                        phy-mode = "rgmii-id";
+                                 * different connector
-                };
+                                 * "DB-88F6710_MPP_RGMII_SD_Jumper".
+                                 */
+                                status = "disabled";
+                                /* No CD or WP GPIOs */
+                        };
-                mvsdio@d00d4000 {
+                        usb@50000 {
-                        pinctrl-0 = <&sdio_pins1>;
+                                status = "okay";
-                        pinctrl-names = "default";
+                        };
-                        /*
-                         * This device is disabled by default, because
-                         * using the SD card connector requires
-                         * changing the default CON40 connector
-                         * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a
-                         * different connector
-                         * "DB-88F6710_MPP_RGMII_SD_Jumper".
-                         */
-                        status = "disabled";
-                        /* No CD or WP GPIOs */
-                };
-                usb@d0050000 {
+                        usb@51000 {
-                        status = "okay";
+                                status = "okay";
-                };
+                        };
-                usb@d0051000 {
+                        spi0: spi@10600 {
-                        status = "okay";
+                                status = "okay";
-                };
-                spi0: spi@d0010600 {
+                                spi-flash@0 {
-                        status = "okay";
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        compatible = "mx25l25635e";
+                                        reg = <0>; /* Chip select 0 */
+                                        spi-max-frequency = <50000000>;
+                                };
+                        };
-                        spi-flash@0 {
+                        pcie-controller {
-                                #address-cells = <1>;
+                                status = "okay";
-                                #size-cells = <1>;
+                                /*
-                                compatible = "mx25l25635e";
+                                 * The two PCIe units are accessible through
-                                reg = <0>; /* Chip select 0 */
+                                 * both standard PCIe slots and mini-PCIe
-                                spi-max-frequency = <50000000>;
+                                 * slots on the board.
+                                 */
+                                pcie@1,0 {
+                                        /* Port 0, Lane 0 */
+                                        status = "okay";
+                                };
+                                pcie@2,0 {
+                                        /* Port 1, Lane 0 */
+                                        status = "okay";
+                                };
                        };
                };
        };

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index e34b280ce6ec..2353b1f13704 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -30,68 +30,87 @@
30	};	30	};
31		31
32	soc {	32	soc {
33	serial@d0012000 {	33	internal-regs {
34	clock-frequency = <200000000>;	34	serial@12000 {
35	status = "okay";	35	clock-frequency = <200000000>;
36	};	36	status = "okay";
37	sata@d00a0000 {	37	};
38	nr-ports = <2>;	38	sata@a0000 {
39	status = "okay";	39	nr-ports = <2>;
40	};	40	status = "okay";
		41	};
41		42
42	mdio {	43	mdio {
43	phy0: ethernet-phy@0 {	44	phy0: ethernet-phy@0 {
44	reg = <0>;	45	reg = <0>;
		46	};
		47
		48	phy1: ethernet-phy@1 {
		49	reg = <1>;
		50	};
45	};	51	};
46		52
47	phy1: ethernet-phy@1 {	53	ethernet@70000 {
48	reg = <1>;	54	status = "okay";
		55	phy = <&phy0>;
		56	phy-mode = "rgmii-id";
		57	};
		58	ethernet@74000 {
		59	status = "okay";
		60	phy = <&phy1>;
		61	phy-mode = "rgmii-id";
49	};	62	};
50	};
51		63
52	ethernet@d0070000 {	64	mvsdio@d4000 {
53	status = "okay";	65	pinctrl-0 = <&sdio_pins1>;
54	phy = <&phy0>;	66	pinctrl-names = "default";
55	phy-mode = "rgmii-id";	67	/*
56	};	68	* This device is disabled by default, because
57	ethernet@d0074000 {	69	* using the SD card connector requires
58	status = "okay";	70	* changing the default CON40 connector
59	phy = <&phy1>;	71	* "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a
60	phy-mode = "rgmii-id";	72	* different connector
61	};	73	* "DB-88F6710_MPP_RGMII_SD_Jumper".
		74	*/
		75	status = "disabled";
		76	/* No CD or WP GPIOs */
		77	};
62		78
63	mvsdio@d00d4000 {	79	usb@50000 {
64	pinctrl-0 = <&sdio_pins1>;	80	status = "okay";
65	pinctrl-names = "default";	81	};
66	/*
67	* This device is disabled by default, because
68	* using the SD card connector requires
69	* changing the default CON40 connector
70	* "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a
71	* different connector
72	* "DB-88F6710_MPP_RGMII_SD_Jumper".
73	*/
74	status = "disabled";
75	/* No CD or WP GPIOs */
76	};
77		82
78	usb@d0050000 {	83	usb@51000 {
79	status = "okay";	84	status = "okay";
80	};	85	};
81		86
82	usb@d0051000 {	87	spi0: spi@10600 {
83	status = "okay";	88	status = "okay";
84	};
85		89
86	spi0: spi@d0010600 {	90	spi-flash@0 {
87	status = "okay";	91	#address-cells = <1>;
		92	#size-cells = <1>;
		93	compatible = "mx25l25635e";
		94	reg = <0>; /* Chip select 0 */
		95	spi-max-frequency = <50000000>;
		96	};
		97	};
88		98
89	spi-flash@0 {	99	pcie-controller {
90	#address-cells = <1>;	100	status = "okay";
91	#size-cells = <1>;	101	/*
92	compatible = "mx25l25635e";	102	* The two PCIe units are accessible through
93	reg = <0>; /* Chip select 0 */	103	* both standard PCIe slots and mini-PCIe
94	spi-max-frequency = <50000000>;	104	* slots on the board.
		105	*/
		106	pcie@1,0 {
		107	/* Port 0, Lane 0 */
		108	status = "okay";
		109	};
		110	pcie@2,0 {
		111	/* Port 1, Lane 0 */
		112	status = "okay";
		113	};
95	};	114	};
96	};	115	};
97	};	116	};