1 files changed, 49 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 070bba4f2585..130f8390a7e4 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -28,49 +28,62 @@
        };
        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 = "sgmii";
+                        };
+                        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 = "sgmii";
+                                status = "okay";
-                };
+                                /* No CD or WP GPIOs */
-                ethernet@d0074000 {
+                        };
-                        status = "okay";
-                        phy = <&phy1>;
-                        phy-mode = "rgmii-id";
-                };
-                mvsdio@d00d4000 {
+                        usb@50000 {
-                        pinctrl-0 = <&sdio_pins1>;
+                                status = "okay";
-                        pinctrl-names = "default";
+                        };
-                        status = "okay";
-                        /* No CD or WP GPIOs */
-                };
-                usb@d0050000 {
+                        usb@51000 {
-                        status = "okay";
+                                status = "okay";
-                };
+                        };
-                usb@d0051000 {
+                        gpio-keys {
-                        status = "okay";
+                                compatible = "gpio-keys";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                button@1 {
+                                        label = "Software Button";
+                                        linux,code = <116>;
+                                        gpios = <&gpio0 6 1>;
+                                };
+                        };
                };
        };
-};
+ };

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 070bba4f2585..130f8390a7e4 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -28,49 +28,62 @@
28	};	28	};
29		29
30	soc {	30	soc {
31	serial@d0012000 {	31	internal-regs {
32	clock-frequency = <200000000>;	32	serial@12000 {
33	status = "okay";	33	clock-frequency = <200000000>;
34	};	34	status = "okay";
35	sata@d00a0000 {	35	};
36	nr-ports = <2>;	36	sata@a0000 {
37	status = "okay";	37	nr-ports = <2>;
38	};	38	status = "okay";
		39	};
39		40
40	mdio {	41	mdio {
41	phy0: ethernet-phy@0 {	42	phy0: ethernet-phy@0 {
42	reg = <0>;	43	reg = <0>;
		44	};
		45
		46	phy1: ethernet-phy@1 {
		47	reg = <1>;
		48	};
43	};	49	};
44		50
45	phy1: ethernet-phy@1 {	51	ethernet@70000 {
46	reg = <1>;	52	status = "okay";
		53	phy = <&phy0>;
		54	phy-mode = "sgmii";
		55	};
		56	ethernet@74000 {
		57	status = "okay";
		58	phy = <&phy1>;
		59	phy-mode = "rgmii-id";
47	};	60	};
48	};
49		61
50	ethernet@d0070000 {	62	mvsdio@d4000 {
51	status = "okay";	63	pinctrl-0 = <&sdio_pins1>;
52	phy = <&phy0>;	64	pinctrl-names = "default";
53	phy-mode = "sgmii";	65	status = "okay";
54	};	66	/* No CD or WP GPIOs */
55	ethernet@d0074000 {	67	};
56	status = "okay";
57	phy = <&phy1>;
58	phy-mode = "rgmii-id";
59	};
60		68
61	mvsdio@d00d4000 {	69	usb@50000 {
62	pinctrl-0 = <&sdio_pins1>;	70	status = "okay";
63	pinctrl-names = "default";	71	};
64	status = "okay";
65	/* No CD or WP GPIOs */
66	};
67		72
68	usb@d0050000 {	73	usb@51000 {
69	status = "okay";	74	status = "okay";
70	};	75	};
71		76
72	usb@d0051000 {	77	gpio-keys {
73	status = "okay";	78	compatible = "gpio-keys";
		79	#address-cells = <1>;
		80	#size-cells = <0>;
		81	button@1 {
		82	label = "Software Button";
		83	linux,code = <116>;
		84	gpios = <&gpio0 6 1>;
		85	};
		86	};
74	};	87	};
75	};	88	};
76	};	89	};