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

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

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

		};

arch/arm/boot/dts/bcm2835-rpi-a.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


	leds {

		act {

			gpios = <&gpio 16 1>;

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

		};

	};

};

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

		};

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


	leds {

		act {

			gpios = <&gpio 16 1>;

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

		};

	};

};

arch/arm/boot/dts/bcm2835-rpi-b.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


	leds {

		act {

			gpios = <&gpio 16 1>;

			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE