1 files changed, 104 insertions, 38 deletions
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index dd0c57dd9f30..14e36e19d515 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -25,50 +25,116 @@
        };
        soc {
-                serial@d0012000 {
+                internal-regs {
-                        clock-frequency = <200000000>;
+                        serial@12000 {
-                        status = "okay";
+                                clock-frequency = <200000000>;
-                };
+                                status = "okay";
-                timer@d0020300 {
-                        clock-frequency = <600000000>;
-                        status = "okay";
-                };
-                mdio {
-                        phy0: ethernet-phy@0 {
-                                reg = <0>;
                        };
+                        timer@20300 {
+                                clock-frequency = <600000000>;
+                                status = "okay";
+                        };
+                        pinctrl {
+                                pwr_led_pin: pwr-led-pin {
+                                        marvell,pins = "mpp63";
+                                        marvell,function = "gpo";
+                                };
-                        phy1: ethernet-phy@1 {
+                                stat_led_pins: stat-led-pins {
-                                reg = <1>;
+                                        marvell,pins = "mpp64", "mpp65";
+                                        marvell,function = "gpio";
+                                };
                        };
-                };
-                ethernet@d0070000 {
-                        status = "okay";
-                        phy = <&phy0>;
-                        phy-mode = "rgmii-id";
-                };
-                ethernet@d0074000 {
-                        status = "okay";
-                        phy = <&phy1>;
-                        phy-mode = "rgmii-id";
-                };
-                mvsdio@d00d4000 {
+                        gpio_leds {
-                        pinctrl-0 = <&sdio_pins2>;
+                                compatible = "gpio-leds";
-                        pinctrl-names = "default";
+                                pinctrl-names = "default";
-                        status = "okay";
+                                pinctrl-0 = <&pwr_led_pin &stat_led_pins>;
-                        /*
-                         * No CD or WP GPIOs: SDIO interface used for
-                         * Wifi/Bluetooth chip
-                         */
-                };
-                usb@d0050000 {
+                                green_pwr_led {
-                        status = "okay";
+                                        label = "mirabox:green:pwr";
-                };
+                                        gpios = <&gpio1 31 1>;
+                                        linux,default-trigger = "heartbeat";
+                                };
+                                blue_stat_led {
+                                        label = "mirabox:blue:stat";
+                                        gpios = <&gpio2 0 1>;
+                                        linux,default-trigger = "cpu0";
+                                };
+                                green_stat_led {
+                                        label = "mirabox:green:stat";
+                                        gpios = <&gpio2 1 1>;
+                                        default-state = "off";
+                                };
+                        };
+                        mdio {
+                                phy0: ethernet-phy@0 {
+                                        reg = <0>;
+                                };
+                                phy1: ethernet-phy@1 {
+                                        reg = <1>;
+                                };
+                        };
+                        ethernet@70000 {
+                                status = "okay";
+                                phy = <&phy0>;
+                                phy-mode = "rgmii-id";
+                        };
+                        ethernet@74000 {
+                                status = "okay";
+                                phy = <&phy1>;
+                                phy-mode = "rgmii-id";
+                        };
+                        mvsdio@d4000 {
+                                pinctrl-0 = <&sdio_pins3>;
+                                pinctrl-names = "default";
+                                status = "okay";
+                                /*
+                                 * No CD or WP GPIOs: SDIO interface used for
+                                 * Wifi/Bluetooth chip
+                                 */
+                        };
+                        usb@50000 {
+                                status = "okay";
+                        };
-                usb@d0051000 {
+                        usb@51000 {
-                        status = "okay";
+                                status = "okay";
+                        };
+                        i2c@11000 {
+                                status = "okay";
+                                clock-frequency = <100000>;
+                                pca9505: pca9505@25 {
+                                        compatible = "nxp,pca9505";
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        reg = <0x25>;
+                                };
+                        };
+                        pcie-controller {
+                                status = "okay";
+                                /* Internal mini-PCIe connector */
+                                pcie@1,0 {
+                                        /* Port 0, Lane 0 */
+                                        status = "okay";
+                                };
+                                /* Connected on the PCB to a USB 3.0 XHCI controller */
+                                pcie@2,0 {
+                                        /* Port 1, Lane 0 */
+                                        status = "okay";
+                                };
+                        };
                };
        };
 };

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index dd0c57dd9f30..14e36e19d515 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -25,50 +25,116 @@
25	};	25	};
26		26
27	soc {	27	soc {
28	serial@d0012000 {	28	internal-regs {
29	clock-frequency = <200000000>;	29	serial@12000 {
30	status = "okay";	30	clock-frequency = <200000000>;
31	};	31	status = "okay";
32	timer@d0020300 {
33	clock-frequency = <600000000>;
34	status = "okay";
35	};
36	mdio {
37	phy0: ethernet-phy@0 {
38	reg = <0>;
39	};	32	};
		33	timer@20300 {
		34	clock-frequency = <600000000>;
		35	status = "okay";
		36	};
		37
		38	pinctrl {
		39	pwr_led_pin: pwr-led-pin {
		40	marvell,pins = "mpp63";
		41	marvell,function = "gpo";
		42	};
40		43
41	phy1: ethernet-phy@1 {	44	stat_led_pins: stat-led-pins {
42	reg = <1>;	45	marvell,pins = "mpp64", "mpp65";
		46	marvell,function = "gpio";
		47	};
43	};	48	};
44	};
45	ethernet@d0070000 {
46	status = "okay";
47	phy = <&phy0>;
48	phy-mode = "rgmii-id";
49	};
50	ethernet@d0074000 {
51	status = "okay";
52	phy = <&phy1>;
53	phy-mode = "rgmii-id";
54	};
55		49
56	mvsdio@d00d4000 {	50	gpio_leds {
57	pinctrl-0 = <&sdio_pins2>;	51	compatible = "gpio-leds";
58	pinctrl-names = "default";	52	pinctrl-names = "default";
59	status = "okay";	53	pinctrl-0 = <&pwr_led_pin &stat_led_pins>;
60	/*
61	* No CD or WP GPIOs: SDIO interface used for
62	* Wifi/Bluetooth chip
63	*/
64	};
65		54
66	usb@d0050000 {	55	green_pwr_led {
67	status = "okay";	56	label = "mirabox:green:pwr";
68	};	57	gpios = <&gpio1 31 1>;
		58	linux,default-trigger = "heartbeat";
		59	};
		60
		61	blue_stat_led {
		62	label = "mirabox:blue:stat";
		63	gpios = <&gpio2 0 1>;
		64	linux,default-trigger = "cpu0";
		65	};
		66
		67	green_stat_led {
		68	label = "mirabox:green:stat";
		69	gpios = <&gpio2 1 1>;
		70	default-state = "off";
		71	};
		72	};
		73
		74	mdio {
		75	phy0: ethernet-phy@0 {
		76	reg = <0>;
		77	};
		78
		79	phy1: ethernet-phy@1 {
		80	reg = <1>;
		81	};
		82	};
		83	ethernet@70000 {
		84	status = "okay";
		85	phy = <&phy0>;
		86	phy-mode = "rgmii-id";
		87	};
		88	ethernet@74000 {
		89	status = "okay";
		90	phy = <&phy1>;
		91	phy-mode = "rgmii-id";
		92	};
		93
		94	mvsdio@d4000 {
		95	pinctrl-0 = <&sdio_pins3>;
		96	pinctrl-names = "default";
		97	status = "okay";
		98	/*
		99	* No CD or WP GPIOs: SDIO interface used for
		100	* Wifi/Bluetooth chip
		101	*/
		102	};
		103
		104	usb@50000 {
		105	status = "okay";
		106	};
69		107
70	usb@d0051000 {	108	usb@51000 {
71	status = "okay";	109	status = "okay";
		110	};
		111
		112	i2c@11000 {
		113	status = "okay";
		114	clock-frequency = <100000>;
		115	pca9505: pca9505@25 {
		116	compatible = "nxp,pca9505";
		117	gpio-controller;
		118	#gpio-cells = <2>;
		119	reg = <0x25>;
		120	};
		121	};
		122
		123	pcie-controller {
		124	status = "okay";
		125
		126	/* Internal mini-PCIe connector */
		127	pcie@1,0 {
		128	/* Port 0, Lane 0 */
		129	status = "okay";
		130	};
		131
		132	/* Connected on the PCB to a USB 3.0 XHCI controller */
		133	pcie@2,0 {
		134	/* Port 1, Lane 0 */
		135	status = "okay";
		136	};
		137	};
72	};	138	};
73	};	139	};
74	};	140	};