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

Commit bdb3eec7 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

ARM: dts: i.MX51 boards: Switch to use standard GPIO flags definitions 



Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 4e942303

arch/arm/boot/dts/imx51-apf51.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec>;

	pinctrl-0 = <&pinctrl_fec>;

	phy-mode = "mii";

	phy-mode = "mii";

	phy-reset-gpios = <&gpio3 0 0>;

	phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;

	phy-reset-duration = <1>;

	phy-reset-duration = <1>;

	status = "okay";

	status = "okay";

};

};

arch/arm/boot/dts/imx51-apf51dev.dts

+7 −5
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ 




		user-key {

		user-key {

			label = "user";

			label = "user";

			gpios = <&gpio1 3 0>;

			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;

			linux,code = <256>; /* BTN_0 */

			linux,code = <256>; /* BTN_0 */

		};

		};

	};

	};
@@ -58,7 +58,7 @@ 




		user {

		user {

			label = "Heartbeat";

			label = "Heartbeat";

			gpios = <&gpio1 2 0>;

			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			linux,default-trigger = "heartbeat";

		};

		};

	};

	};
@@ -68,7 +68,8 @@ 
	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ecspi1>;

	pinctrl-0 = <&pinctrl_ecspi1>;

	fsl,spi-num-chipselects = <2>;

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>;

	cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,

		   <&gpio4 25 GPIO_ACTIVE_HIGH>;

	status = "okay";

	status = "okay";

};

};
@@ -76,14 +77,15 @@ 
	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ecspi2>;

	pinctrl-0 = <&pinctrl_ecspi2>;

	fsl,spi-num-chipselects = <2>;

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;

	cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,

		   <&gpio3 27 GPIO_ACTIVE_LOW>;

	status = "okay";

	status = "okay";

};

};





&esdhc1 {

&esdhc1 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio2 29 0>;

	cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;

	bus-width = <4>;

	bus-width = <4>;

	status = "okay";

	status = "okay";

};

};

arch/arm/boot/dts/imx51-babbage.dts

+6 −5
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ 




		power {

		power {

			label = "Power Button";

			label = "Power Button";

			gpios = <&gpio2 21 0>;

			gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;

			linux,code = <116>; /* KEY_POWER */

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

			gpio-key,wakeup;

		};

		};
@@ -105,7 +105,7 @@ 
			reg=<0>;

			reg=<0>;

			#clock-cells = <0>;

			#clock-cells = <0>;

			clock-frequency = <26000000>;

			clock-frequency = <26000000>;

			gpios = <&gpio4 26 1>;

			gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;

		};

		};

	};

	};

};

};
@@ -121,8 +121,8 @@ 
&esdhc2 {

&esdhc2 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc2>;

	pinctrl-0 = <&pinctrl_esdhc2>;

	cd-gpios = <&gpio1 6 0>;

	cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

	wp-gpios = <&gpio1 5 0>;

	wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;

	status = "okay";

	status = "okay";

};

};
@@ -137,7 +137,8 @@ 
	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ecspi1>;

	pinctrl-0 = <&pinctrl_ecspi1>;

	fsl,spi-num-chipselects = <2>;

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>;

	cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,

		   <&gpio4 25 GPIO_ACTIVE_HIGH>;

	status = "okay";

	status = "okay";





	pmic: mc13892@0 {

	pmic: mc13892@0 {

arch/arm/boot/dts/imx51.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "imx51-pinfunc.h"

#include "imx51-pinfunc.h"

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/clock/imx5-clock.h>

#include <dt-bindings/clock/imx5-clock.h>

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





/ {

/ {

	aliases {

	aliases {