mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 01:49:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-01-04 22:30:10 -08:00
parent db29bf7b1c ececb5639c
commit 594e45fd31
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View File

@@ -10,12 +10,12 @@ / {
leds {
act {
gpios = <&gpio 47 0>;
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
label = "PWR";
gpios = <&gpio 35 0>;
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};

2
arch/arm/boot/dts/bcm2835-rpi-a.dts
View File

@@ -10,7 +10,7 @@ / {
leds {
act {
gpios = <&gpio 16 1>;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};

4
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View File

@@ -11,12 +11,12 @@ / {
leds {
act {
gpios = <&gpio 47 0>;
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
label = "PWR";
gpios = <&gpio 35 0>;
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};

2
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View File

@@ -11,7 +11,7 @@ / {
leds {
act {
gpios = <&gpio 16 1>;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};

2
arch/arm/boot/dts/bcm2835-rpi-b.dts
View File

@@ -11,7 +11,7 @@ / {
leds {
act {
gpios = <&gpio 16 1>;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};

4
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View File

@@ -15,12 +15,12 @@ memory {
leds {
act {
gpios = <&gpio 47 0>;
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
pwr {
label = "PWR";
gpios = <&gpio 35 0>;
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep";
linux,default-trigger = "default-on";
};

2
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View File

@@ -20,7 +20,7 @@ memory {
leds {
act {
gpios = <&gpio 47 0>;
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
};
};
};