Commit 594e45fd authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-4.16/devicetree' of http://github.com/Broadcom/stblinux into next/dt

This pull request contains Broadcom ARM-based SoCs Device Tree changes for
4.16, please pull the following:

- Stefan updates the BCM283x DTS to make consistent use of the existing GPIO
  defines for the polarity specifier

* tag 'arm-soc/for-4.16/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Use GPIO polarity defines consistently
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents db29bf7b ececb563
...@@ -10,12 +10,12 @@ / { ...@@ -10,12 +10,12 @@ / {
leds { leds {
act { act {
gpios = <&gpio 47 0>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 0>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
......
...@@ -10,7 +10,7 @@ / { ...@@ -10,7 +10,7 @@ / {
leds { leds {
act { act {
gpios = <&gpio 16 1>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
......
...@@ -11,12 +11,12 @@ / { ...@@ -11,12 +11,12 @@ / {
leds { leds {
act { act {
gpios = <&gpio 47 0>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 0>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
......
...@@ -11,7 +11,7 @@ / { ...@@ -11,7 +11,7 @@ / {
leds { leds {
act { act {
gpios = <&gpio 16 1>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
......
...@@ -11,7 +11,7 @@ / { ...@@ -11,7 +11,7 @@ / {
leds { leds {
act { act {
gpios = <&gpio 16 1>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
......
...@@ -15,12 +15,12 @@ memory { ...@@ -15,12 +15,12 @@ memory {
leds { leds {
act { act {
gpios = <&gpio 47 0>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 0>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
......
...@@ -20,7 +20,7 @@ memory { ...@@ -20,7 +20,7 @@ memory {
leds { leds {
act { act {
gpios = <&gpio 47 0>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment