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

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

ARM: dts: i.MX27 boards: Switch to use standard GPIO and IRQ flags definitions 



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

arch/arm/boot/dts/imx27-apf27dev.dts

+7 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


		user-key {

			label = "user";

			gpios = <&gpio6 13 0>;

			gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;

			linux,code = <276>; /* BTN_EXTRA */

		};

	};
@@ -51,7 +51,7 @@ 


		user {

			label = "Heartbeat";

			gpios = <&gpio6 14 0>;

			gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};
@@ -59,7 +59,7 @@ 


&cspi1 {

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

	cs-gpios = <&gpio4 28 1>;

	cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cspi1>;

	status = "okay";
@@ -67,8 +67,9 @@ 


&cspi2 {

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

	cs-gpios = <&gpio4 21 1>, <&gpio4 27 1>,

			<&gpio2 17 1>;

	cs-gpios = <&gpio4 21 GPIO_ACTIVE_LOW>,

		   <&gpio4 27 GPIO_ACTIVE_LOW>,

		   <&gpio2 17 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cspi2>;

	status = "okay";
@@ -179,7 +180,7 @@ 


&sdhci2 {

	bus-width = <4>;

	cd-gpios = <&gpio3 14 0>;

	cd-gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdhc2>;

	status = "okay";

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
};



&sdhci2 {

	cd-gpios = <&gpio3 29 0>;

	cd-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 


&cspi1 {

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

	cs-gpios = <&gpio4 28 0>,

		<&gpio4 27 0>;

	cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>,

		   <&gpio4 27 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts

+5 −4
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


&cspi1 {

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

	cs-gpios = <&gpio4 28 0>, <&gpio4 27 0>;

	cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>,

		   <&gpio4 27 GPIO_ACTIVE_LOW>;

};



&i2c1 {
@@ -65,8 +66,8 @@ 


&sdhci2 {

	bus-width = <4>;

	cd-gpios = <&gpio3 29 0>;

	wp-gpios = <&gpio3 28 0>;

	cd-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;

	wp-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&vmmc1_reg>;

	status = "okay";

};
@@ -90,7 +91,7 @@ 
		compatible = "nxp,sja1000";

		reg = <4 0x00000000 0x00000100>;

		interrupt-parent = <&gpio5>;

		interrupts = <19 0x2>;

		interrupts = <19 IRQ_TYPE_EDGE_FALLING>;

		nxp,external-clock-frequency = <16000000>;

		nxp,tx-output-config = <0x16>;

		nxp,no-comparator-bypass;

arch/arm/boot/dts/imx27-phytec-phycore-som.dts

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


&cspi1 {

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

	cs-gpios = <&gpio4 28 0>;

	cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;

	status = "okay";



	pmic: mc13783@0 {
@@ -62,7 +62,7 @@ 
		spi-max-frequency = <20000000>;

		reg = <0>;

		interrupt-parent = <&gpio2>;

		interrupts = <23 0x4>;

		interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;

		fsl,mc13xxx-uses-adc;

		fsl,mc13xxx-uses-rtc;
@@ -149,7 +149,7 @@ 


&fec {

	phy-mode = "mii";

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

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

	phy-supply = <&reg_3v3>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec1>;