Unverified Commit ececb563 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2017-12-19' into devicetree/next 



This pull request cleans up the bcm2835 DT to use #defines for GPIO
polarity.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 4fbd8d19 3edb73d8

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