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

Commit 3a31f2d7 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: DT: Kirkwood: Use symbolic names from gpio.h 



Use GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW instead of 0 and 1.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 23301190

arch/arm/boot/dts/kirkwood-cloudbox.dts

+4 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		button@1 {

			label = "Power push button";

			linux,code = <KEY_POWER>;

			gpios = <&gpio0 16 1>;

			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

		};

	};
@@ -76,17 +76,17 @@ 


		red-fail {

			label = "cloudbox:red:fail";

			gpios = <&gpio0 14 0>;

			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		};

		blue-sata {

			label = "cloudbox:blue:sata";

			gpios = <&gpio0 15 0>;

			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;

		};

	};



	gpio_poweroff {

		compatible = "gpio-poweroff";

		gpios = <&gpio0 17 0>;

		gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

	};

};

arch/arm/boot/dts/kirkwood-db.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio_gpios>;

			pinctrl-names = "default";

			wp-gpios = <&gpio1 5 0>;

			cd-gpios = <&gpio1 6 0>;

			wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;

			cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

			status = "okay";

		};

	};

arch/arm/boot/dts/kirkwood-dns320.dts

+5 −5
Original line number Diff line number Diff line
@@ -24,24 +24,24 @@ 


		blue-power {

			label = "dns320:blue:power";

			gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */

			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

			default-state = "keep";

		};

		blue-usb {

			label = "dns320:blue:usb";

			gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */

			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;

		};

		orange-l_hdd {

			label = "dns320:orange:l_hdd";

			gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */

			gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

		};

		orange-r_hdd {

			label = "dns320:orange:r_hdd";

			gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */

			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;

		};

		orange-usb {

			label = "dns320:orange:usb";

			gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */

			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */

		};

	};

arch/arm/boot/dts/kirkwood-dns325.dts

+5 −5
Original line number Diff line number Diff line
@@ -24,24 +24,24 @@ 


		white-power {

			label = "dns325:white:power";

			gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */

			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

			default-state = "keep";

		};

		white-usb {

			label = "dns325:white:usb";

			gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */

			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */

		};

		red-l_hdd {

			label = "dns325:red:l_hdd";

			gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */

			gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

		};

		red-r_hdd {

			label = "dns325:red:r_hdd";

			gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */

			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;

		};

		red-usb {

			label = "dns325:red:usb";

			gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};

	};

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ 
		button@1 {

			label = "Power button";

			linux,code = <KEY_POWER>;

			gpios = <&gpio1 2 1>;

			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;

		};

		button@2 {

			label = "USB unmount button";

			linux,code = <KEY_EJECTCD>;

			gpios = <&gpio1 15 1>;

			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

		};

		button@3 {

			label = "Reset button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio1 16 1>;

			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

		};

	};
@@ -35,8 +35,8 @@ 
		compatible = "gpio-fan";

		pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>;

		pinctrl-names = "default";

		gpios = <&gpio1 14 1

			 &gpio1 13 1>;

		gpios = <&gpio1 14 GPIO_ACTIVE_LOW

			 &gpio1 13 GPIO_ACTIVE_LOW>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;
@@ -46,7 +46,7 @@ 
		compatible = "gpio-poweroff";

		pinctrl-0 = <&pmx_power_off>;

		pinctrl-names = "default";

		gpios = <&gpio1 4 0>;

		gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;

	};



	ocp@f1000000 {