projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-ns2-common.dtsi
diff --git
a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index
2fcb82e
..
743152f
100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@
-64,8
+64,8
@@
button@1 {
label = "Power push button";
button@1 {
label = "Power push button";
- linux,code = <
116
>;
- gpios = <&gpio1 0
0
>;
+ linux,code = <
KEY_POWER
>;
+ gpios = <&gpio1 0
GPIO_ACTIVE_HIGH
>;
};
};
};
};
@@
-74,13
+74,13
@@
red-fail {
label = "ns2:red:fail";
red-fail {
label = "ns2:red:fail";
- gpios = <&gpio0 12
0
>;
+ gpios = <&gpio0 12
GPIO_ACTIVE_HIGH
>;
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
- gpios = <&gpio0 31
0
>;
+ gpios = <&gpio0 31
GPIO_ACTIVE_HIGH
>;
};
};
};
};
@@
-89,7
+89,6
@@
status = "okay";
ethphy0: ethernet-phy {
status = "okay";
ethphy0: ethernet-phy {
- device_type = "ethernet-phy";
/* overwrite reg property in board file */
};
};
/* overwrite reg property in board file */
};
};