Commit 9df69906 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-3.15' of git://git.infradead.org/linux-mvebu into next/dt 

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: default avatarOlof Johansson <olof@lixom.net>
parents ab658f89 5c0169d1

arch/arm/boot/dts/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -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 \

arch/arm/boot/dts/armada-370-mirabox.dts

+4 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-370.dtsi"



/ {
@@ -73,19 +74,19 @@ 


				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";

				};

			};

arch/arm/boot/dts/armada-370-rd.dts

+4 −2
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
 */



/dts-v1/;

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include "armada-370.dtsi"



/ {
@@ -100,8 +102,8 @@ 
				#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>;

				};

			};

arch/arm/boot/dts/armada-xp-axpwifiap.dts

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "armada-xp-mv78230.dtsi"



/ {
@@ -157,8 +159,8 @@ 


		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>;

		};

	};

};

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+7 −5
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "armada-xp-mv78260.dtsi"



/ {
@@ -90,19 +92,19 @@ 


				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";

				};

			};
@@ -114,8 +116,8 @@ 


				button@1 {

					label = "Init Button";

					linux,code = <116>;

					gpios = <&gpio1 28 0>;

					linux,code = <KEY_POWER>;

					gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

				};

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE