projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into patchwork
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-lswvl.dts
diff --git
a/arch/arm/boot/dts/kirkwood-lswvl.dts
b/arch/arm/boot/dts/kirkwood-lswvl.dts
index
09eed3c
..
36eec73
100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-lswvl.dts
+++ b/
arch/arm/boot/dts/kirkwood-lswvl.dts
@@
-1,7
+1,8
@@
/*
* Device Tree file for Buffalo Linkstation LS-WVL/VL
*
/*
* Device Tree file for Buffalo Linkstation LS-WVL/VL
*
- * Copyright (C) 2015, rogershimizu@gmail.com
+ * Copyright (C) 2015, 2016
+ * Roger Shimizu <rogershimizu@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-156,21
+157,21
@@
button@1 {
label = "Function Button";
linux,code = <KEY_OPTION>;
button@1 {
label = "Function Button";
linux,code = <KEY_OPTION>;
- gpios = <&gpio
0 45
GPIO_ACTIVE_LOW>;
+ gpios = <&gpio
1 13
GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Power-on Switch";
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
};
button@2 {
label = "Power-on Switch";
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
- gpios = <&gpio
0 46
GPIO_ACTIVE_LOW>;
+ gpios = <&gpio
1 14
GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Power-auto Switch";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
};
button@3 {
label = "Power-auto Switch";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
- gpios = <&gpio
0 47
GPIO_ACTIVE_LOW>;
+ gpios = <&gpio
1 15
GPIO_ACTIVE_LOW>;
};
};
};
};
@@
-185,38
+186,38
@@
led@1 {
label = "lswvl:red:alarm";
led@1 {
label = "lswvl:red:alarm";
- gpios = <&gpio
0 36 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 4 GPIO_ACTIVE_HIGH
>;
};
led@2 {
label = "lswvl:red:func";
};
led@2 {
label = "lswvl:red:func";
- gpios = <&gpio
0 37 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 5 GPIO_ACTIVE_HIGH
>;
};
led@3 {
label = "lswvl:amber:info";
};
led@3 {
label = "lswvl:amber:info";
- gpios = <&gpio
0 38 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 6 GPIO_ACTIVE_HIGH
>;
};
led@4 {
label = "lswvl:blue:func";
};
led@4 {
label = "lswvl:blue:func";
- gpios = <&gpio
0 39 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 7 GPIO_ACTIVE_HIGH
>;
};
led@5 {
label = "lswvl:blue:power";
};
led@5 {
label = "lswvl:blue:power";
- gpios = <&gpio
0 40
GPIO_ACTIVE_LOW>;
+ gpios = <&gpio
1 8
GPIO_ACTIVE_LOW>;
default-state = "keep";
};
led@6 {
label = "lswvl:red:hdderr0";
default-state = "keep";
};
led@6 {
label = "lswvl:red:hdderr0";
- gpios = <&gpio
0 34 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 2 GPIO_ACTIVE_HIGH
>;
};
led@7 {
label = "lswvl:red:hdderr1";
};
led@7 {
label = "lswvl:red:hdderr1";
- gpios = <&gpio
0 35 GPIO_ACTIVE_LOW
>;
+ gpios = <&gpio
1 3 GPIO_ACTIVE_HIGH
>;
};
};
};
};
@@
-233,7
+234,7
@@
3250 1
5000 0>;
3250 1
5000 0>;
- alarm-gpios = <&gpio
0 43
GPIO_ACTIVE_HIGH>;
+ alarm-gpios = <&gpio
1 11
GPIO_ACTIVE_HIGH>;
};
restart_poweroff {
};
restart_poweroff {