Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
armada-385-linksys.dtsi
diff --git
a/kernel/arch/arm/boot/dts/armada-385-linksys.dtsi
b/kernel/arch/arm/boot/dts/armada-385-linksys.dtsi
index
3710755
..
22f7a13
100644
(file)
--- a/
kernel/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/
kernel/arch/arm/boot/dts/armada-385-linksys.dtsi
@@
-58,8
+58,8
@@
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
- MBUS_ID(0x09, 0x
0
9) 0 0xf1100000 0x10000
- MBUS_ID(0x09, 0x
0
5) 0 0xf1110000 0x10000>;
+ MBUS_ID(0x09, 0x
1
9) 0 0xf1100000 0x10000
+ MBUS_ID(0x09, 0x
1
5) 0 0xf1110000 0x10000>;
internal-regs {
internal-regs {
@@
-117,7
+117,7
@@
};
/* USB part of the eSATA/USB 2.0 port */
};
/* USB part of the eSATA/USB 2.0 port */
- usb@5
0
000 {
+ usb@5
8
000 {
status = "okay";
};
status = "okay";
};
@@
-245,7
+245,7
@@
button@2 {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
button@2 {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
- gpios = <&gpio
1 15
GPIO_ACTIVE_LOW>;
+ gpios = <&gpio
0 29
GPIO_ACTIVE_LOW>;
};
};
};
};
@@
-260,7
+260,7
@@
};
sata {
};
sata {
- gpios = <&gpio1 22 GPIO_ACTIVE_
HIGH
>;
+ gpios = <&gpio1 22 GPIO_ACTIVE_
LOW
>;
default-state = "off";
};
};
default-state = "off";
};
};
@@
-313,7
+313,7
@@
&pinctrl {
keys_pin: keys-pin {
&pinctrl {
keys_pin: keys-pin {
- marvell,pins = "mpp24", "mpp
47
";
+ marvell,pins = "mpp24", "mpp
29
";
marvell,function = "gpio";
};
marvell,function = "gpio";
};