Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / boot / dts / armada-370-mirabox.dts

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 3234875824dcc35258bef8909d6bd0a283710765..58ee79372206e2100c08d106d1baef256553076d 100644 (file)
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -33,6 +33,43 @@
                        clock-frequency = <600000000>;
                        status = "okay";
                };
+
+               pinctrl {
+                       pwr_led_pin: pwr-led-pin {
+                               marvell,pins = "mpp63";
+                               marvell,function = "gpo";
+                       };
+
+                       stat_led_pins: stat-led-pins {
+                               marvell,pins = "mpp64", "mpp65";
+                               marvell,function = "gpio";
+                       };
+               };
+
+               gpio_leds {
+                       compatible = "gpio-leds";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pwr_led_pin &stat_led_pins>;
+
+                       green_pwr_led {
+                               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>;
@@ -70,5 +107,32 @@
                usb@d0051000 {
                        status = "okay";
                };
+
+               i2c@d0011000 {
+                       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";
+                       };
+               };
        };
 };