Merge tag 'mvebu-dt-3.15' of git://git.infradead.org/linux-mvebu into next/dt
authorOlof Johansson <olof@lixom.net>
Fri, 21 Feb 2014 22:49:12 +0000 (14:49 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 21 Feb 2014 22:49:12 +0000 (14:49 -0800)
Merge "mvebu DT changes for v3.15" from Jason Cooper:

 - kirkwood
    - new board QNAP 419
    - new board Excito Bubba B3
 - mvebu
    - use gpio and input defines for Armada 370/XP boards

* tag 'mvebu-dt-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: use input DT defines in Armada 370/XP boards
  ARM: mvebu: use GPIO DT defines in Armada 370/XP boards
  ARM: Kirkwood: Add DT description of QNAP 419
  ARM: Kirkwood: Add support for Excito Bubba B3

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/armada-370-mirabox.dts
arch/arm/boot/dts/armada-370-rd.dts
arch/arm/boot/dts/armada-xp-axpwifiap.dts
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
arch/arm/boot/dts/kirkwood-b3.dts [new file with mode: 0644]
arch/arm/boot/dts/kirkwood-ts419-6281.dts [new file with mode: 0644]
arch/arm/boot/dts/kirkwood-ts419-6282.dts [new file with mode: 0644]
arch/arm/boot/dts/kirkwood-ts419.dtsi [new file with mode: 0644]

index 0b805c8..222fe15 100644 (file)
@@ -83,7 +83,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
 dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
 dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
-dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
+dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \
+       kirkwood-cloudbox.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \
@@ -116,7 +117,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
        kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
-       kirkwood-ts219-6282.dtb
+       kirkwood-ts219-6282.dtb \
+       kirkwood-ts419-6281.dtb \
+       kirkwood-ts419-6282.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
index 944e878..2354fe0 100644 (file)
@@ -9,6 +9,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
 #include "armada-370.dtsi"
 
 / {
 
                                green_pwr_led {
                                        label = "mirabox:green:pwr";
-                                       gpios = <&gpio1 31 1>;
+                                       gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
                                        default-state = "keep";
                                };
 
                                blue_stat_led {
                                        label = "mirabox:blue:stat";
-                                       gpios = <&gpio2 0 1>;
+                                       gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                                        default-state = "off";
                                };
 
                                green_stat_led {
                                        label = "mirabox:green:stat";
-                                       gpios = <&gpio2 1 1>;
+                                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                                        default-state = "off";
                                };
                        };
index abbb807..3e2c857 100644 (file)
@@ -12,6 +12,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 #include "armada-370.dtsi"
 
 / {
                                #size-cells = <0>;
                                button@1 {
                                        label = "Software Button";
-                                       linux,code = <116>;
-                                       gpios = <&gpio0 6 1>;
+                                       linux,code = <KEY_POWER>;
+                                       gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
                                };
                        };
 
index c5fe572..d83d7d6 100644 (file)
@@ -16,6 +16,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include "armada-xp-mv78230.dtsi"
 
 / {
 
                button@1 {
                        label = "Factory Reset Button";
-                       linux,code = <141>; /* KEY_SETUP */
-                       gpios = <&gpio1 1 1>;
+                       linux,code = <KEY_SETUP>;
+                       gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                };
        };
 };
index 99bcf76..985948c 100644 (file)
@@ -11,6 +11,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include "armada-xp-mv78260.dtsi"
 
 / {
 
                                red_led {
                                        label = "red_led";
-                                       gpios = <&gpio1 17 1>;
+                                       gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                                        default-state = "off";
                                };
 
                                yellow_led {
                                        label = "yellow_led";
-                                       gpios = <&gpio1 19 1>;
+                                       gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
                                        default-state = "off";
                                };
 
                                green_led {
                                        label = "green_led";
-                                       gpios = <&gpio1 21 1>;
+                                       gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
                                        default-state = "keep";
                                };
                        };
 
                                button@1 {
                                        label = "Init Button";
-                                       linux,code = <116>;
-                                       gpios = <&gpio1 28 0>;
+                                       linux,code = <KEY_POWER>;
+                                       gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
                                };
                        };
 
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
new file mode 100644 (file)
index 0000000..4079105
--- /dev/null
@@ -0,0 +1,204 @@
+/*
+ * Device Tree file for Excito Bubba B3
+ *
+ * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Note: This requires a new'ish version of u-boot, which disables the
+ * L2 cache. If your B3 silently fails to boot, u-boot is probably too
+ * old. Either upgrade, or consider the following email:
+ *
+ * http://lists.debian.org/debian-arm/2012/08/msg00128.html
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+       model = "Excito B3";
+       compatible = "excito,b3", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+       memory { /* 512 MB */
+               device_type = "memory";
+               reg = <0x00000000 0x20000000>;
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200n8 earlyprintk";
+       };
+
+       mbus {
+               pcie-controller {
+                       status = "okay";
+
+                       /* Wifi model has Atheros chipset on pcie port */
+                       pcie@1,0 {
+                               status = "okay";
+                       };
+               };
+       };
+
+       ocp@f1000000 {
+               pinctrl: pinctrl@10000 {
+                       pmx_button_power: pmx-button-power {
+                               marvell,pins = "mpp39";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_green: pmx-led-green {
+                               marvell,pins = "mpp38";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_red: pmx-led-red {
+                               marvell,pins = "mpp41";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_blue: pmx-led-blue {
+                               marvell,pins = "mpp42";
+                               marvell,function = "gpio";
+                       };
+                       pmx_beeper: pmx-beeper {
+                               marvell,pins = "mpp40";
+                               marvell,function = "gpio";
+                       };
+               };
+
+               spi@10600 {
+                       status = "okay";
+                       pinctrl-0 = <&pmx_spi>;
+                       pinctrl-names = "default";
+
+                       m25p16@0 {
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               compatible = "m25p16";
+                               reg = <0>;
+                               spi-max-frequency = <40000000>;
+                               mode = <0>;
+
+                               partition@0 {
+                                       reg = <0x0 0xc0000>;
+                                       label = "u-boot";
+                               };
+
+                               partition@c0000 {
+                                       reg = <0xc0000 0x20000>;
+                                       label = "u-boot env";
+                               };
+
+                               partition@e0000 {
+                                       reg = <0xe0000 0x120000>;
+                                       label = "data";
+                               };
+                       };
+               };
+
+               i2c@11000 {
+                       status = "okay";
+                       /*
+                        * There is something on the bus at address 0x64.
+                        * Not yet identified what it is, maybe the eeprom
+                        * for the Atheros WiFi chip?
+                        */
+               };
+
+
+               serial@12000 {
+                       /* Internal on test pins, 3.3v TTL
+                        * UART0_RX = Testpoint 65
+                        * UART0_TX = Testpoint 66
+                        * See the Excito Wiki for more details.
+                        */
+                       pinctrl-0 = <&pmx_uart0>;
+                       pinctrl-names = "default";
+                       status = "okay";
+               };
+
+               sata@80000 {
+                       /* One internal, the second as eSATA */
+                       status = "okay";
+                       nr-ports = <2>;
+               };
+       };
+
+       gpio-leds {
+               /*
+                * There is one LED "port" on the front and the colours
+                * mix together giving some interesting combinations.
+                */
+               compatible = "gpio-leds";
+               pinctrl-0 = < &pmx_led_green &pmx_led_red
+                             &pmx_led_blue >;
+               pinctrl-names = "default";
+
+               programming_led {
+                       label = "bubba3:green:programming";
+                       gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               error_led {
+                       label = "bubba3:red:error";
+                       gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+               };
+
+               active_led {
+                       label = "bubba3:blue:active";
+                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+               };
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-0 = <&pmx_button_power>;
+               pinctrl-names = "default";
+
+               power-button {
+                       /* On the back */
+                       label = "Power Button";
+                       linux,code = <KEY_POWER>;
+                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       beeper: beeper {
+               /* 4KHz Piezoelectric buzzer */
+               compatible = "gpio-beeper";
+               pinctrl-0 = <&pmx_beeper>;
+               pinctrl-names = "default";
+               gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+&mdio {
+       status = "okay";
+
+       ethphy0: ethernet-phy@8 {
+               device_type = "ethernet-phy";
+               reg = <8>;
+       };
+
+       ethphy1: ethernet-phy@24 {
+               device_type = "ethernet-phy";
+               reg = <24>;
+       };
+};
+
+&eth0 {
+       status = "okay";
+       ethernet0-port@0 {
+               phy-handle = <&ethphy0>;
+       };
+};
+
+&eth1 {
+       status = "okay";
+       ethernet1-port@0 {
+               phy-handle = <&ethphy1>;
+       };
+};
+
diff --git a/arch/arm/boot/dts/kirkwood-ts419-6281.dts b/arch/arm/boot/dts/kirkwood-ts419-6281.dts
new file mode 100644 (file)
index 0000000..aa22aa8
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ * Device Tree file for QNAP TS41X with 6281 SoC
+ *
+ * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-ts219.dtsi"
+#include "kirkwood-ts419.dtsi"
+
+&ethphy0 { reg = <8>; };
+&ethphy1 { reg = <0>; };
diff --git a/arch/arm/boot/dts/kirkwood-ts419-6282.dts b/arch/arm/boot/dts/kirkwood-ts419-6282.dts
new file mode 100644 (file)
index 0000000..d7512d4
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * Device Tree file for QNAP TS41X with 6282 SoC
+ *
+ * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
+#include "kirkwood-ts219.dtsi"
+#include "kirkwood-ts419.dtsi"
+
+/ {
+       mbus {
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@2,0 {
+                               status = "okay";
+                       };
+               };
+       };
+};
+
+&ethphy0 { reg = <0>; };
+&ethphy1 { reg = <1>; };
diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
new file mode 100644 (file)
index 0000000..1a9c624
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * Device Tree include file for QNAP TS41X
+ *
+ * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/ {
+       model = "QNAP TS419 family";
+       compatible = "qnap,ts419", "marvell,kirkwood";
+
+       ocp@f1000000 {
+               pinctrl: pinctrl@10000 {
+                       pinctrl-names = "default";
+
+                       pmx_USB_copy_button: pmx-USB-copy-button {
+                               marvell,pins = "mpp43";
+                               marvell,function = "gpio";
+                       };
+                       pmx_reset_button: pmx-reset-button {
+                               marvell,pins = "mpp37";
+                               marvell,function = "gpio";
+                       };
+                       /*
+                        * JP1 indicates if an LCD module is installed
+                        * on the serial port (0), or if the port is used
+                        * as a console (1).
+                        */
+                       pmx_jumper_jp1: pmx-jumper_jp1 {
+                               marvell,pins = "mpp45";
+                               marvell,function = "gpio";
+                       };
+
+               };
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
+               pinctrl-names = "default";
+
+               button@1 {
+                       label = "USB Copy";
+                       linux,code = <KEY_COPY>;
+                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+               };
+               button@2 {
+                       label = "Reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&mdio {
+       status = "okay";
+
+       ethphy1: ethernet-phy@1 {
+               device_type = "ethernet-phy";
+                /* overwrite reg property in board file */
+       };
+};
+
+&eth1 {
+       status = "okay";
+       ethernet1-port@0 {
+               phy-handle = <&ethphy1>;
+       };
+};