diff options
author | Olof Johansson <olof@lixom.net> | 2016-02-01 15:24:31 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-02-01 15:24:31 -0500 |
commit | 6c388927a7db95c20a29ff6c26da29cb9a5555aa (patch) | |
tree | 3c9e1f2dae61ba9e8c6b8980b2a295fbfd88cfec | |
parent | 7f7420f07ee2161e09e305e2d8a41069c3612942 (diff) | |
parent | ff61ee84e7aa5842d9e33c0b442f0b43a6a44eaf (diff) |
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>
-rw-r--r-- | arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lswvl.dts | 25 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lswxl.dts | 31 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 8 |
5 files changed, 35 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts index 13cf69a8d0fb..fb9e1bbf2338 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | |||
@@ -152,6 +152,7 @@ | |||
152 | nand-on-flash-bbt; | 152 | nand-on-flash-bbt; |
153 | 153 | ||
154 | partitions { | 154 | partitions { |
155 | compatible = "fixed-partitions"; | ||
155 | #address-cells = <1>; | 156 | #address-cells = <1>; |
156 | #size-cells = <1>; | 157 | #size-cells = <1>; |
157 | 158 | ||
diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 09eed3cea0af..36eec7392ab4 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Device Tree file for Buffalo Linkstation LS-WVL/VL | 2 | * Device Tree file for Buffalo Linkstation LS-WVL/VL |
3 | * | 3 | * |
4 | * Copyright (C) 2015, rogershimizu@gmail.com | 4 | * Copyright (C) 2015, 2016 |
5 | * Roger Shimizu <rogershimizu@gmail.com> | ||
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
@@ -156,21 +157,21 @@ | |||
156 | button@1 { | 157 | button@1 { |
157 | label = "Function Button"; | 158 | label = "Function Button"; |
158 | linux,code = <KEY_OPTION>; | 159 | linux,code = <KEY_OPTION>; |
159 | gpios = <&gpio0 45 GPIO_ACTIVE_LOW>; | 160 | gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; |
160 | }; | 161 | }; |
161 | 162 | ||
162 | button@2 { | 163 | button@2 { |
163 | label = "Power-on Switch"; | 164 | label = "Power-on Switch"; |
164 | linux,code = <KEY_RESERVED>; | 165 | linux,code = <KEY_RESERVED>; |
165 | linux,input-type = <5>; | 166 | linux,input-type = <5>; |
166 | gpios = <&gpio0 46 GPIO_ACTIVE_LOW>; | 167 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
167 | }; | 168 | }; |
168 | 169 | ||
169 | button@3 { | 170 | button@3 { |
170 | label = "Power-auto Switch"; | 171 | label = "Power-auto Switch"; |
171 | linux,code = <KEY_ESC>; | 172 | linux,code = <KEY_ESC>; |
172 | linux,input-type = <5>; | 173 | linux,input-type = <5>; |
173 | gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; | 174 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
174 | }; | 175 | }; |
175 | }; | 176 | }; |
176 | 177 | ||
@@ -185,38 +186,38 @@ | |||
185 | 186 | ||
186 | led@1 { | 187 | led@1 { |
187 | label = "lswvl:red:alarm"; | 188 | label = "lswvl:red:alarm"; |
188 | gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; | 189 | gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; |
189 | }; | 190 | }; |
190 | 191 | ||
191 | led@2 { | 192 | led@2 { |
192 | label = "lswvl:red:func"; | 193 | label = "lswvl:red:func"; |
193 | gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; | 194 | gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
194 | }; | 195 | }; |
195 | 196 | ||
196 | led@3 { | 197 | led@3 { |
197 | label = "lswvl:amber:info"; | 198 | label = "lswvl:amber:info"; |
198 | gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; | 199 | gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
199 | }; | 200 | }; |
200 | 201 | ||
201 | led@4 { | 202 | led@4 { |
202 | label = "lswvl:blue:func"; | 203 | label = "lswvl:blue:func"; |
203 | gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; | 204 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; |
204 | }; | 205 | }; |
205 | 206 | ||
206 | led@5 { | 207 | led@5 { |
207 | label = "lswvl:blue:power"; | 208 | label = "lswvl:blue:power"; |
208 | gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; | 209 | gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; |
209 | default-state = "keep"; | 210 | default-state = "keep"; |
210 | }; | 211 | }; |
211 | 212 | ||
212 | led@6 { | 213 | led@6 { |
213 | label = "lswvl:red:hdderr0"; | 214 | label = "lswvl:red:hdderr0"; |
214 | gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; | 215 | gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
215 | }; | 216 | }; |
216 | 217 | ||
217 | led@7 { | 218 | led@7 { |
218 | label = "lswvl:red:hdderr1"; | 219 | label = "lswvl:red:hdderr1"; |
219 | gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; | 220 | gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; |
220 | }; | 221 | }; |
221 | }; | 222 | }; |
222 | 223 | ||
@@ -233,7 +234,7 @@ | |||
233 | 3250 1 | 234 | 3250 1 |
234 | 5000 0>; | 235 | 5000 0>; |
235 | 236 | ||
236 | alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; | 237 | alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; |
237 | }; | 238 | }; |
238 | 239 | ||
239 | restart_poweroff { | 240 | restart_poweroff { |
diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index f5db16a08597..b13ec20a7088 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Device Tree file for Buffalo Linkstation LS-WXL/WSXL | 2 | * Device Tree file for Buffalo Linkstation LS-WXL/WSXL |
3 | * | 3 | * |
4 | * Copyright (C) 2015, rogershimizu@gmail.com | 4 | * Copyright (C) 2015, 2016 |
5 | * Roger Shimizu <rogershimizu@gmail.com> | ||
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
@@ -156,21 +157,21 @@ | |||
156 | button@1 { | 157 | button@1 { |
157 | label = "Function Button"; | 158 | label = "Function Button"; |
158 | linux,code = <KEY_OPTION>; | 159 | linux,code = <KEY_OPTION>; |
159 | gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; | 160 | gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; |
160 | }; | 161 | }; |
161 | 162 | ||
162 | button@2 { | 163 | button@2 { |
163 | label = "Power-on Switch"; | 164 | label = "Power-on Switch"; |
164 | linux,code = <KEY_RESERVED>; | 165 | linux,code = <KEY_RESERVED>; |
165 | linux,input-type = <5>; | 166 | linux,input-type = <5>; |
166 | gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; | 167 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; |
167 | }; | 168 | }; |
168 | 169 | ||
169 | button@3 { | 170 | button@3 { |
170 | label = "Power-auto Switch"; | 171 | label = "Power-auto Switch"; |
171 | linux,code = <KEY_ESC>; | 172 | linux,code = <KEY_ESC>; |
172 | linux,input-type = <5>; | 173 | linux,input-type = <5>; |
173 | gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; | 174 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
174 | }; | 175 | }; |
175 | }; | 176 | }; |
176 | 177 | ||
@@ -185,12 +186,12 @@ | |||
185 | 186 | ||
186 | led@1 { | 187 | led@1 { |
187 | label = "lswxl:blue:func"; | 188 | label = "lswxl:blue:func"; |
188 | gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; | 189 | gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
189 | }; | 190 | }; |
190 | 191 | ||
191 | led@2 { | 192 | led@2 { |
192 | label = "lswxl:red:alarm"; | 193 | label = "lswxl:red:alarm"; |
193 | gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; | 194 | gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; |
194 | }; | 195 | }; |
195 | 196 | ||
196 | led@3 { | 197 | led@3 { |
@@ -200,23 +201,23 @@ | |||
200 | 201 | ||
201 | led@4 { | 202 | led@4 { |
202 | label = "lswxl:blue:power"; | 203 | label = "lswxl:blue:power"; |
203 | gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; | 204 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; |
205 | default-state = "keep"; | ||
204 | }; | 206 | }; |
205 | 207 | ||
206 | led@5 { | 208 | led@5 { |
207 | label = "lswxl:red:func"; | 209 | label = "lswxl:red:func"; |
208 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; | 210 | gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
209 | default-state = "keep"; | ||
210 | }; | 211 | }; |
211 | 212 | ||
212 | led@6 { | 213 | led@6 { |
213 | label = "lswxl:red:hdderr0"; | 214 | label = "lswxl:red:hdderr0"; |
214 | gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; | 215 | gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; |
215 | }; | 216 | }; |
216 | 217 | ||
217 | led@7 { | 218 | led@7 { |
218 | label = "lswxl:red:hdderr1"; | 219 | label = "lswxl:red:hdderr1"; |
219 | gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; | 220 | gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; |
220 | }; | 221 | }; |
221 | }; | 222 | }; |
222 | 223 | ||
@@ -225,15 +226,15 @@ | |||
225 | pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; | 226 | pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; |
226 | pinctrl-names = "default"; | 227 | pinctrl-names = "default"; |
227 | 228 | ||
228 | gpios = <&gpio0 47 GPIO_ACTIVE_LOW | 229 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW |
229 | &gpio0 48 GPIO_ACTIVE_LOW>; | 230 | &gpio1 15 GPIO_ACTIVE_LOW>; |
230 | 231 | ||
231 | gpio-fan,speed-map = <0 3 | 232 | gpio-fan,speed-map = <0 3 |
232 | 1500 2 | 233 | 1500 2 |
233 | 3250 1 | 234 | 3250 1 |
234 | 5000 0>; | 235 | 5000 0>; |
235 | 236 | ||
236 | alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; | 237 | alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; |
237 | }; | 238 | }; |
238 | 239 | ||
239 | restart_poweroff { | 240 | restart_poweroff { |
@@ -256,7 +257,7 @@ | |||
256 | enable-active-high; | 257 | enable-active-high; |
257 | regulator-always-on; | 258 | regulator-always-on; |
258 | regulator-boot-on; | 259 | regulator-boot-on; |
259 | gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; | 260 | gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
260 | }; | 261 | }; |
261 | hdd_power0: regulator@2 { | 262 | hdd_power0: regulator@2 { |
262 | compatible = "regulator-fixed"; | 263 | compatible = "regulator-fixed"; |
diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts index 1db6f2c506cc..8082d64266a3 100644 --- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts +++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | |||
@@ -131,6 +131,7 @@ | |||
131 | chip-delay = <40>; | 131 | chip-delay = <40>; |
132 | status = "okay"; | 132 | status = "okay"; |
133 | partitions { | 133 | partitions { |
134 | compatible = "fixed-partitions"; | ||
134 | #address-cells = <1>; | 135 | #address-cells = <1>; |
135 | #size-cells = <1>; | 136 | #size-cells = <1>; |
136 | 137 | ||
diff --git a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts index 3daec912b4bf..420788229e6f 100644 --- a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +++ b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Device Tree file for Buffalo Linkstation LS-WTGL | 2 | * Device Tree file for Buffalo Linkstation LS-WTGL |
3 | * | 3 | * |
4 | * Copyright (C) 2015, Roger Shimizu <rogershimizu@gmail.com> | 4 | * Copyright (C) 2015, 2016 |
5 | * Roger Shimizu <rogershimizu@gmail.com> | ||
5 | * | 6 | * |
6 | * This file is dual-licensed: you can use it either under the terms | 7 | * This file is dual-licensed: you can use it either under the terms |
7 | * of the GPL or the X11 license, at your option. Note that this dual | 8 | * of the GPL or the X11 license, at your option. Note that this dual |
@@ -69,8 +70,6 @@ | |||
69 | 70 | ||
70 | internal-regs { | 71 | internal-regs { |
71 | pinctrl: pinctrl@10000 { | 72 | pinctrl: pinctrl@10000 { |
72 | pinctrl-0 = <&pmx_usb_power &pmx_power_hdd | ||
73 | &pmx_fan_low &pmx_fan_high &pmx_fan_lock>; | ||
74 | pinctrl-names = "default"; | 73 | pinctrl-names = "default"; |
75 | 74 | ||
76 | pmx_led_power: pmx-leds { | 75 | pmx_led_power: pmx-leds { |
@@ -162,6 +161,7 @@ | |||
162 | led@1 { | 161 | led@1 { |
163 | label = "lswtgl:blue:power"; | 162 | label = "lswtgl:blue:power"; |
164 | gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; | 163 | gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; |
164 | default-state = "keep"; | ||
165 | }; | 165 | }; |
166 | 166 | ||
167 | led@2 { | 167 | led@2 { |
@@ -188,7 +188,7 @@ | |||
188 | 3250 1 | 188 | 3250 1 |
189 | 5000 0>; | 189 | 5000 0>; |
190 | 190 | ||
191 | alarm-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; | 191 | alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; |
192 | }; | 192 | }; |
193 | 193 | ||
194 | restart_poweroff { | 194 | restart_poweroff { |