Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e74f8b authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 



Instead of harcoding 0 and 1 for the gpio specifications in the Armada
370/XP boards, use the <dt-bindings/gpio/gpio.h> header file and its
GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW definitions.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 934b524b

arch/arm/boot/dts/armada-370-mirabox.dts

+4 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-370.dtsi"



/ {
@@ -73,19 +74,19 @@ 


				green_pwr_led {

					label = "mirabox:green:pwr";

					gpios = <&gpio1 31 1>;

					gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

					default-state = "keep";

				};



				blue_stat_led {

					label = "mirabox:blue:stat";

					gpios = <&gpio2 0 1>;

					gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;

					default-state = "off";

				};



				green_stat_led {

					label = "mirabox:green:stat";

					gpios = <&gpio2 1 1>;

					gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;

					default-state = "off";

				};

			};

arch/arm/boot/dts/armada-370-rd.dts

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-370.dtsi"



/ {
@@ -101,7 +102,7 @@ 
				button@1 {

					label = "Software Button";

					linux,code = <116>;

					gpios = <&gpio0 6 1>;

					gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

				};

			};

arch/arm/boot/dts/armada-xp-axpwifiap.dts

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-xp-mv78230.dtsi"



/ {
@@ -158,7 +159,7 @@ 
		button@1 {

			label = "Factory Reset Button";

			linux,code = <141>; /* KEY_SETUP */

			gpios = <&gpio1 1 1>;

			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

		};

	};

};

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+5 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-xp-mv78260.dtsi"



/ {
@@ -90,19 +91,19 @@ 


				red_led {

					label = "red_led";

					gpios = <&gpio1 17 1>;

					gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;

					default-state = "off";

				};



				yellow_led {

					label = "yellow_led";

					gpios = <&gpio1 19 1>;

					gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;

					default-state = "off";

				};



				green_led {

					label = "green_led";

					gpios = <&gpio1 21 1>;

					gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;

					default-state = "keep";

				};

			};
@@ -115,7 +116,7 @@ 
				button@1 {

					label = "Init Button";

					linux,code = <116>;

					gpios = <&gpio1 28 0>;

					gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

				};

			};