projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-overo-palo35-common.dtsi
diff --git
a/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
b/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
index
8df7ec3
..
a8020fb
100644
(file)
--- a/
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
+++ b/
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
@@
-37,13
+37,13
@@
pinctrl-0 = <&button_pins>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&button_pins>;
#address-cells = <1>;
#size-cells = <0>;
- button0
@23
{
+ button0 {
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source;
};
label = "button0";
linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source;
};
- button1
@14
{
+ button1 {
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
label = "button1";
linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */