Skip to content

Commit 6c38892

Browse files
olofjolofj
committed
Merge tag 'mvebu-fixes-4.5-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.5 (part 1) - Fix dts on buffalo linksations machines (gpios and leds) - Fix dts partition node according to new binding introduced in v4.5 * tag 'mvebu-fixes-4.5-1' of git://git.infradead.org/linux-mvebu: ARM: dts: orion5x: gpio pin fixes for linkstation lswtgl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl ARM: mvebu: ix4-300d: Add compatible property to "partitions" node ARM: mvebu: kirkwood: Add compatible property to "partitions" node Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 7f7420f + ff61ee8 commit 6c38892

File tree

5 files changed

+35
-31
lines changed

5 files changed

+35
-31
lines changed

‎arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
nand-on-flash-bbt;
153153

154154
partitions {
155+
compatible = "fixed-partitions";
155156
#address-cells = <1>;
156157
#size-cells = <1>;
157158

‎arch/arm/boot/dts/kirkwood-lswvl.dts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
22
* Device Tree file for Buffalo Linkstation LS-WVL/VL
33
*
4-
* Copyright (C) 2015, rogershimizu@gmail.com
4+
* Copyright (C) 2015, 2016
5+
* Roger Shimizu <rogershimizu@gmail.com>
56
*
67
* This program is free software; you can redistribute it and/or
78
* modify it under the terms of the GNU General Public License
@@ -156,21 +157,21 @@
156157
button@1 {
157158
label = "Function Button";
158159
linux,code = <KEY_OPTION>;
159-
gpios = <&gpio0 45 GPIO_ACTIVE_LOW>;
160+
gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
160161
};
161162

162163
button@2 {
163164
label = "Power-on Switch";
164165
linux,code = <KEY_RESERVED>;
165166
linux,input-type = <5>;
166-
gpios = <&gpio0 46 GPIO_ACTIVE_LOW>;
167+
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
167168
};
168169

169170
button@3 {
170171
label = "Power-auto Switch";
171172
linux,code = <KEY_ESC>;
172173
linux,input-type = <5>;
173-
gpios = <&gpio0 47 GPIO_ACTIVE_LOW>;
174+
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
174175
};
175176
};
176177

@@ -185,38 +186,38 @@
185186

186187
led@1 {
187188
label = "lswvl:red:alarm";
188-
gpios = <&gpio0 36 GPIO_ACTIVE_LOW>;
189+
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
189190
};
190191

191192
led@2 {
192193
label = "lswvl:red:func";
193-
gpios = <&gpio0 37 GPIO_ACTIVE_LOW>;
194+
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
194195
};
195196

196197
led@3 {
197198
label = "lswvl:amber:info";
198-
gpios = <&gpio0 38 GPIO_ACTIVE_LOW>;
199+
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
199200
};
200201

201202
led@4 {
202203
label = "lswvl:blue:func";
203-
gpios = <&gpio0 39 GPIO_ACTIVE_LOW>;
204+
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
204205
};
205206

206207
led@5 {
207208
label = "lswvl:blue:power";
208-
gpios = <&gpio0 40 GPIO_ACTIVE_LOW>;
209+
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
209210
default-state = "keep";
210211
};
211212

212213
led@6 {
213214
label = "lswvl:red:hdderr0";
214-
gpios = <&gpio0 34 GPIO_ACTIVE_LOW>;
215+
gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
215216
};
216217

217218
led@7 {
218219
label = "lswvl:red:hdderr1";
219-
gpios = <&gpio0 35 GPIO_ACTIVE_LOW>;
220+
gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
220221
};
221222
};
222223

@@ -233,7 +234,7 @@
233234
3250 1
234235
5000 0>;
235236

236-
alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>;
237+
alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
237238
};
238239

239240
restart_poweroff {

‎arch/arm/boot/dts/kirkwood-lswxl.dts

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
22
* Device Tree file for Buffalo Linkstation LS-WXL/WSXL
33
*
4-
* Copyright (C) 2015, rogershimizu@gmail.com
4+
* Copyright (C) 2015, 2016
5+
* Roger Shimizu <rogershimizu@gmail.com>
56
*
67
* This program is free software; you can redistribute it and/or
78
* modify it under the terms of the GNU General Public License
@@ -156,21 +157,21 @@
156157
button@1 {
157158
label = "Function Button";
158159
linux,code = <KEY_OPTION>;
159-
gpios = <&gpio1 41 GPIO_ACTIVE_LOW>;
160+
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
160161
};
161162

162163
button@2 {
163164
label = "Power-on Switch";
164165
linux,code = <KEY_RESERVED>;
165166
linux,input-type = <5>;
166-
gpios = <&gpio1 42 GPIO_ACTIVE_LOW>;
167+
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
167168
};
168169

169170
button@3 {
170171
label = "Power-auto Switch";
171172
linux,code = <KEY_ESC>;
172173
linux,input-type = <5>;
173-
gpios = <&gpio1 43 GPIO_ACTIVE_LOW>;
174+
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
174175
};
175176
};
176177

@@ -185,12 +186,12 @@
185186

186187
led@1 {
187188
label = "lswxl:blue:func";
188-
gpios = <&gpio1 36 GPIO_ACTIVE_LOW>;
189+
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
189190
};
190191

191192
led@2 {
192193
label = "lswxl:red:alarm";
193-
gpios = <&gpio1 49 GPIO_ACTIVE_LOW>;
194+
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
194195
};
195196

196197
led@3 {
@@ -200,23 +201,23 @@
200201

201202
led@4 {
202203
label = "lswxl:blue:power";
203-
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
204+
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
205+
default-state = "keep";
204206
};
205207

206208
led@5 {
207209
label = "lswxl:red:func";
208-
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
209-
default-state = "keep";
210+
gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
210211
};
211212

212213
led@6 {
213214
label = "lswxl:red:hdderr0";
214-
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
215+
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
215216
};
216217

217218
led@7 {
218219
label = "lswxl:red:hdderr1";
219-
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
220+
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
220221
};
221222
};
222223

@@ -225,15 +226,15 @@
225226
pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
226227
pinctrl-names = "default";
227228

228-
gpios = <&gpio0 47 GPIO_ACTIVE_LOW
229-
&gpio0 48 GPIO_ACTIVE_LOW>;
229+
gpios = <&gpio1 16 GPIO_ACTIVE_LOW
230+
&gpio1 15 GPIO_ACTIVE_LOW>;
230231

231232
gpio-fan,speed-map = <0 3
232233
1500 2
233234
3250 1
234235
5000 0>;
235236

236-
alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>;
237+
alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
237238
};
238239

239240
restart_poweroff {
@@ -256,7 +257,7 @@
256257
enable-active-high;
257258
regulator-always-on;
258259
regulator-boot-on;
259-
gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>;
260+
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
260261
};
261262
hdd_power0: regulator@2 {
262263
compatible = "regulator-fixed";

‎arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
chip-delay = <40>;
132132
status = "okay";
133133
partitions {
134+
compatible = "fixed-partitions";
134135
#address-cells = <1>;
135136
#size-cells = <1>;
136137

‎arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
22
* Device Tree file for Buffalo Linkstation LS-WTGL
33
*
4-
* Copyright (C) 2015, Roger Shimizu <rogershimizu@gmail.com>
4+
* Copyright (C) 2015, 2016
5+
* Roger Shimizu <rogershimizu@gmail.com>
56
*
67
* This file is dual-licensed: you can use it either under the terms
78
* of the GPL or the X11 license, at your option. Note that this dual
@@ -69,8 +70,6 @@
6970

7071
internal-regs {
7172
pinctrl: pinctrl@10000 {
72-
pinctrl-0 = <&pmx_usb_power &pmx_power_hdd
73-
&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
7473
pinctrl-names = "default";
7574

7675
pmx_led_power: pmx-leds {
@@ -162,6 +161,7 @@
162161
led@1 {
163162
label = "lswtgl:blue:power";
164163
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
164+
default-state = "keep";
165165
};
166166

167167
led@2 {
@@ -188,7 +188,7 @@
188188
3250 1
189189
5000 0>;
190190

191-
alarm-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
191+
alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
192192
};
193193

194194
restart_poweroff {

0 commit comments

Comments
 (0)