Skip to content

Commit 9df6990

Browse files
committed
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: Olof Johansson <[email protected]>
2 parents ab658f8 + 5c0169d commit 9df6990

File tree

9 files changed

+355
-14
lines changed

9 files changed

+355
-14
lines changed

arch/arm/boot/dts/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
8383
dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
8484
integratorcp.dtb
8585
dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
86-
dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
86+
dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \
87+
kirkwood-cloudbox.dtb \
8788
kirkwood-db-88f6281.dtb \
8889
kirkwood-db-88f6282.dtb \
8990
kirkwood-dns320.dtb \
@@ -116,7 +117,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
116117
kirkwood-sheevaplug-esata.dtb \
117118
kirkwood-topkick.dtb \
118119
kirkwood-ts219-6281.dtb \
119-
kirkwood-ts219-6282.dtb
120+
kirkwood-ts219-6282.dtb \
121+
kirkwood-ts419-6281.dtb \
122+
kirkwood-ts419-6282.dtb
120123
dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
121124
dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
122125
dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
/dts-v1/;
12+
#include <dt-bindings/gpio/gpio.h>
1213
#include "armada-370.dtsi"
1314

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

7475
green_pwr_led {
7576
label = "mirabox:green:pwr";
76-
gpios = <&gpio1 31 1>;
77+
gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
7778
default-state = "keep";
7879
};
7980

8081
blue_stat_led {
8182
label = "mirabox:blue:stat";
82-
gpios = <&gpio2 0 1>;
83+
gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
8384
default-state = "off";
8485
};
8586

8687
green_stat_led {
8788
label = "mirabox:green:stat";
88-
gpios = <&gpio2 1 1>;
89+
gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
8990
default-state = "off";
9091
};
9192
};

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313

1414
/dts-v1/;
15+
#include <dt-bindings/input/input.h>
16+
#include <dt-bindings/gpio/gpio.h>
1517
#include "armada-370.dtsi"
1618

1719
/ {
@@ -100,8 +102,8 @@
100102
#size-cells = <0>;
101103
button@1 {
102104
label = "Software Button";
103-
linux,code = <116>;
104-
gpios = <&gpio0 6 1>;
105+
linux,code = <KEY_POWER>;
106+
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
105107
};
106108
};
107109

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717

1818
/dts-v1/;
19+
#include <dt-bindings/gpio/gpio.h>
20+
#include <dt-bindings/input/input.h>
1921
#include "armada-xp-mv78230.dtsi"
2022

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

158160
button@1 {
159161
label = "Factory Reset Button";
160-
linux,code = <141>; /* KEY_SETUP */
161-
gpios = <&gpio1 1 1>;
162+
linux,code = <KEY_SETUP>;
163+
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
162164
};
163165
};
164166
};

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
*/
1212

1313
/dts-v1/;
14+
#include <dt-bindings/gpio/gpio.h>
15+
#include <dt-bindings/input/input.h>
1416
#include "armada-xp-mv78260.dtsi"
1517

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

9193
red_led {
9294
label = "red_led";
93-
gpios = <&gpio1 17 1>;
95+
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
9496
default-state = "off";
9597
};
9698

9799
yellow_led {
98100
label = "yellow_led";
99-
gpios = <&gpio1 19 1>;
101+
gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
100102
default-state = "off";
101103
};
102104

103105
green_led {
104106
label = "green_led";
105-
gpios = <&gpio1 21 1>;
107+
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
106108
default-state = "keep";
107109
};
108110
};
@@ -114,8 +116,8 @@
114116

115117
button@1 {
116118
label = "Init Button";
117-
linux,code = <116>;
118-
gpios = <&gpio1 28 0>;
119+
linux,code = <KEY_POWER>;
120+
gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
119121
};
120122
};
121123

arch/arm/boot/dts/kirkwood-b3.dts

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
/*
2+
* Device Tree file for Excito Bubba B3
3+
*
4+
* Copyright (C) 2013, Andrew Lunn <[email protected]>
5+
*
6+
* This program is free software; you can redistribute it and/or
7+
* modify it under the terms of the GNU General Public License
8+
* as published by the Free Software Foundation; either version
9+
* 2 of the License, or (at your option) any later version.
10+
*
11+
* Note: This requires a new'ish version of u-boot, which disables the
12+
* L2 cache. If your B3 silently fails to boot, u-boot is probably too
13+
* old. Either upgrade, or consider the following email:
14+
*
15+
* http://lists.debian.org/debian-arm/2012/08/msg00128.html
16+
*/
17+
18+
/dts-v1/;
19+
20+
#include "kirkwood.dtsi"
21+
#include "kirkwood-6281.dtsi"
22+
23+
/ {
24+
model = "Excito B3";
25+
compatible = "excito,b3", "marvell,kirkwood-88f6281", "marvell,kirkwood";
26+
memory { /* 512 MB */
27+
device_type = "memory";
28+
reg = <0x00000000 0x20000000>;
29+
};
30+
31+
chosen {
32+
bootargs = "console=ttyS0,115200n8 earlyprintk";
33+
};
34+
35+
mbus {
36+
pcie-controller {
37+
status = "okay";
38+
39+
/* Wifi model has Atheros chipset on pcie port */
40+
pcie@1,0 {
41+
status = "okay";
42+
};
43+
};
44+
};
45+
46+
ocp@f1000000 {
47+
pinctrl: pinctrl@10000 {
48+
pmx_button_power: pmx-button-power {
49+
marvell,pins = "mpp39";
50+
marvell,function = "gpio";
51+
};
52+
pmx_led_green: pmx-led-green {
53+
marvell,pins = "mpp38";
54+
marvell,function = "gpio";
55+
};
56+
pmx_led_red: pmx-led-red {
57+
marvell,pins = "mpp41";
58+
marvell,function = "gpio";
59+
};
60+
pmx_led_blue: pmx-led-blue {
61+
marvell,pins = "mpp42";
62+
marvell,function = "gpio";
63+
};
64+
pmx_beeper: pmx-beeper {
65+
marvell,pins = "mpp40";
66+
marvell,function = "gpio";
67+
};
68+
};
69+
70+
spi@10600 {
71+
status = "okay";
72+
pinctrl-0 = <&pmx_spi>;
73+
pinctrl-names = "default";
74+
75+
m25p16@0 {
76+
#address-cells = <1>;
77+
#size-cells = <1>;
78+
compatible = "m25p16";
79+
reg = <0>;
80+
spi-max-frequency = <40000000>;
81+
mode = <0>;
82+
83+
partition@0 {
84+
reg = <0x0 0xc0000>;
85+
label = "u-boot";
86+
};
87+
88+
partition@c0000 {
89+
reg = <0xc0000 0x20000>;
90+
label = "u-boot env";
91+
};
92+
93+
partition@e0000 {
94+
reg = <0xe0000 0x120000>;
95+
label = "data";
96+
};
97+
};
98+
};
99+
100+
i2c@11000 {
101+
status = "okay";
102+
/*
103+
* There is something on the bus at address 0x64.
104+
* Not yet identified what it is, maybe the eeprom
105+
* for the Atheros WiFi chip?
106+
*/
107+
};
108+
109+
110+
serial@12000 {
111+
/* Internal on test pins, 3.3v TTL
112+
* UART0_RX = Testpoint 65
113+
* UART0_TX = Testpoint 66
114+
* See the Excito Wiki for more details.
115+
*/
116+
pinctrl-0 = <&pmx_uart0>;
117+
pinctrl-names = "default";
118+
status = "okay";
119+
};
120+
121+
sata@80000 {
122+
/* One internal, the second as eSATA */
123+
status = "okay";
124+
nr-ports = <2>;
125+
};
126+
};
127+
128+
gpio-leds {
129+
/*
130+
* There is one LED "port" on the front and the colours
131+
* mix together giving some interesting combinations.
132+
*/
133+
compatible = "gpio-leds";
134+
pinctrl-0 = < &pmx_led_green &pmx_led_red
135+
&pmx_led_blue >;
136+
pinctrl-names = "default";
137+
138+
programming_led {
139+
label = "bubba3:green:programming";
140+
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
141+
default-state = "off";
142+
};
143+
144+
error_led {
145+
label = "bubba3:red:error";
146+
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
147+
};
148+
149+
active_led {
150+
label = "bubba3:blue:active";
151+
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
152+
};
153+
};
154+
155+
gpio-keys {
156+
compatible = "gpio-keys";
157+
pinctrl-0 = <&pmx_button_power>;
158+
pinctrl-names = "default";
159+
160+
power-button {
161+
/* On the back */
162+
label = "Power Button";
163+
linux,code = <KEY_POWER>;
164+
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
165+
};
166+
};
167+
168+
beeper: beeper {
169+
/* 4KHz Piezoelectric buzzer */
170+
compatible = "gpio-beeper";
171+
pinctrl-0 = <&pmx_beeper>;
172+
pinctrl-names = "default";
173+
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
174+
};
175+
};
176+
177+
&mdio {
178+
status = "okay";
179+
180+
ethphy0: ethernet-phy@8 {
181+
device_type = "ethernet-phy";
182+
reg = <8>;
183+
};
184+
185+
ethphy1: ethernet-phy@24 {
186+
device_type = "ethernet-phy";
187+
reg = <24>;
188+
};
189+
};
190+
191+
&eth0 {
192+
status = "okay";
193+
ethernet0-port@0 {
194+
phy-handle = <&ethphy0>;
195+
};
196+
};
197+
198+
&eth1 {
199+
status = "okay";
200+
ethernet1-port@0 {
201+
phy-handle = <&ethphy1>;
202+
};
203+
};
204+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Device Tree file for QNAP TS41X with 6281 SoC
3+
*
4+
* Copyright (C) 2013, Andrew Lunn <[email protected]>
5+
*
6+
* This program is free software; you can redistribute it and/or
7+
* modify it under the terms of the GNU General Public License
8+
* as published by the Free Software Foundation; either version
9+
* 2 of the License, or (at your option) any later version.
10+
*/
11+
12+
/dts-v1/;
13+
14+
#include "kirkwood.dtsi"
15+
#include "kirkwood-6281.dtsi"
16+
#include "kirkwood-ts219.dtsi"
17+
#include "kirkwood-ts419.dtsi"
18+
19+
&ethphy0 { reg = <8>; };
20+
&ethphy1 { reg = <0>; };
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Device Tree file for QNAP TS41X with 6282 SoC
3+
*
4+
* Copyright (C) 2013, Andrew Lunn <[email protected]>
5+
*
6+
* This program is free software; you can redistribute it and/or
7+
* modify it under the terms of the GNU General Public License
8+
* as published by the Free Software Foundation; either version
9+
* 2 of the License, or (at your option) any later version.
10+
*/
11+
12+
/dts-v1/;
13+
14+
#include "kirkwood.dtsi"
15+
#include "kirkwood-6282.dtsi"
16+
#include "kirkwood-ts219.dtsi"
17+
#include "kirkwood-ts419.dtsi"
18+
19+
/ {
20+
mbus {
21+
pcie-controller {
22+
status = "okay";
23+
24+
pcie@2,0 {
25+
status = "okay";
26+
};
27+
};
28+
};
29+
};
30+
31+
&ethphy0 { reg = <0>; };
32+
&ethphy1 { reg = <1>; };

0 commit comments

Comments
 (0)