Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / armada-385-linksys.dtsi

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 85d2c377c3322f6be3a612d85661534771896153..8450944b28e6bb7728ccd731dcb709fa7346aa28 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -245,7 +245,7 @@
                button@2 {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
-                       gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -260,7 +260,7 @@
                };
 
                sata {
-                       gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
        };
@@ -313,7 +313,7 @@
 
 &pinctrl {
        keys_pin: keys-pin {
-               marvell,pins = "mpp24", "mpp47";
+               marvell,pins = "mpp24", "mpp29";
                marvell,function = "gpio";
        };