aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/files/arch/arm
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-06-20 23:05:23 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-06-20 23:05:23 +0000
commit643a8a626dd5e30e792fba2cc9072186b34add87 (patch)
tree6460cd906fad2b7a30e351d13ee889b4845b71f6 /target/linux/mvebu/files/arch/arm
parentf11de38d448158cb630089658fe0fdaba5f308ab (diff)
downloadupstream-643a8a626dd5e30e792fba2cc9072186b34add87.tar.gz
upstream-643a8a626dd5e30e792fba2cc9072186b34add87.tar.bz2
upstream-643a8a626dd5e30e792fba2cc9072186b34add87.zip
update mamba dts
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 41292
Diffstat (limited to 'target/linux/mvebu/files/arch/arm')
-rw-r--r--target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts47
1 files changed, 33 insertions, 14 deletions
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts
index a8b1643755..f8576f8016 100644
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts
@@ -6,9 +6,13 @@
* is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be
* used.
*
- * Copyright (C) 2013 Marvell
+ * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
*
- * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ * Based on armada-xp-axpwifiap.dts:
+ *
+ * Copyright (C) 2013 Marvell
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@@ -16,6 +20,8 @@
*/
/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
#include "armada-xp-mv78230.dtsi"
/ {
@@ -59,9 +65,6 @@
internal-regs {
pinctrl {
- pinctrl-0 = <&pmx_phy_int>;
- pinctrl-names = "default";
-
pmx_ge0: pmx-ge0 {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
@@ -77,7 +80,7 @@
};
pmx_keys: pmx-keys {
- marvell,pins = "mpp33";
+ marvell,pins = "mpp32", "mpp33";
marvell,function = "gpio";
};
@@ -86,13 +89,13 @@
marvell,function = "spi";
};
- pmx_phy_int: pmx-phy-int {
- marvell,pins = "mpp32";
+ power_led_pin: power-led-pin {
+ marvell,pins = "mpp40";
marvell,function = "gpio";
};
- power_led_pin: power-led-pin {
- marvell,pins = "mpp40";
+ gpio_fan_pin: gpio-fan-pin {
+ marvell,pins = "mpp24";
marvell,function = "gpio";
};
@@ -114,7 +117,7 @@
};
mdio {
- disabled;
+ status = "disabled";
};
ethernet@70000 {
@@ -187,6 +190,7 @@
partition@900000 {
label = "devinfo";
reg = <0x900000 0x100000>; /* 1MB */
+ read-only;
};
partition@a00000 {
@@ -240,9 +244,15 @@
pinctrl-names = "default";
button@1 {
+ label = "WPS";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&gpio0 32 GPIO_ACTIVE_HIGH>;
+ };
+
+ button@2 {
label = "Factory Reset Button";
- linux,code = <141>; /* KEY_SETUP */
- gpios = <&gpio1 1 1>;
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
};
};
@@ -253,8 +263,17 @@
power {
label = "mamba:white:power";
- gpios = <&gpio1 8 0>;
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
};
+
+ gpio_fan {
+ /* SUNON HA4010V4-0000-C99 */
+ compatible = "gpio-fan";
+ gpios = <&gpio0 24 0>;
+
+ gpio-fan,speed-map = <0 0
+ 4500 1>;
+ };
};