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

Commit 4d191868 authored by Richard Zhao's avatar Richard Zhao Committed by Shawn Guo
Browse files

dts/imx: rename gpio labels to consistent with hw spec 



GPIO1/GPIO2/... is more readable than GPIO0/GPIO1/... .
Remove redundant gpio comments.

Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent dc47ce90

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

+5 −6
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
				};



				esdhc@70008000 { /* ESDHC2 */

					cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */

					wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */

					cd-gpios = <&gpio1 6 0>;

					wp-gpios = <&gpio1 5 0>;

					status = "okay";

				};
@@ -47,8 +47,7 @@ 


				ecspi@70010000 { /* ECSPI1 */

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

					cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */

						   <&gpio3 25 0>; /* GPIO4_25 */

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

					status = "okay";



					pmic: mc13892@0 {
@@ -57,7 +56,7 @@ 
						compatible = "fsl,mc13892";

						spi-max-frequency = <6000000>;

						reg = <0>;

						mc13xxx-irq-gpios = <&gpio0 8 0>; /* GPIO1_8 */

						mc13xxx-irq-gpios = <&gpio1 8 0>;

						fsl,mc13xxx-uses-regulator;

					};
@@ -127,7 +126,7 @@ 


		power {

			label = "Power Button";

			gpios = <&gpio1 21 0>;

			gpios = <&gpio2 21 0>;

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

			gpio-key,wakeup;

		};

arch/arm/boot/dts/imx51.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
				};

			};



			gpio0: gpio@73f84000 { /* GPIO1 */

			gpio1: gpio@73f84000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				reg = <0x73f84000 0x4000>;

				interrupts = <50 51>;
@@ -127,7 +127,7 @@ 
				#interrupt-cells = <1>;

			};



			gpio1: gpio@73f88000 { /* GPIO2 */

			gpio2: gpio@73f88000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				reg = <0x73f88000 0x4000>;

				interrupts = <52 53>;
@@ -137,7 +137,7 @@ 
				#interrupt-cells = <1>;

			};



			gpio2: gpio@73f8c000 { /* GPIO3 */

			gpio3: gpio@73f8c000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				reg = <0x73f8c000 0x4000>;

				interrupts = <54 55>;
@@ -147,7 +147,7 @@ 
				#interrupt-cells = <1>;

			};



			gpio3: gpio@73f90000 { /* GPIO4 */

			gpio4: gpio@73f90000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				reg = <0x73f90000 0x4000>;

				interrupts = <56 57>;

arch/arm/boot/dts/imx53-ard.dts

+8 −8
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
		aips@50000000 { /* AIPS1 */

			spba@50000000 {

				esdhc@50004000 { /* ESDHC1 */

					cd-gpios = <&gpio0 1 0>; /* GPIO1_1 */

					wp-gpios = <&gpio0 9 0>; /* GPIO1_9 */

					cd-gpios = <&gpio1 1 0>;

					wp-gpios = <&gpio1 9 0>;

					status = "okay";

				};

			};
@@ -67,7 +67,7 @@ 
			compatible = "smsc,lan9220", "smsc,lan9115";

			reg = <0xf4000000 0x2000000>;

			phy-mode = "mii";

			interrupt-parent = <&gpio1>;

			interrupt-parent = <&gpio2>;

			interrupts = <31>;

			reg-io-width = <4>;

			smsc,irq-push-pull;
@@ -79,34 +79,34 @@ 


		home {

			label = "Home";

			gpios = <&gpio4 10 0>; /* GPIO5_10 */

			gpios = <&gpio5 10 0>;

			linux,code = <102>; /* KEY_HOME */

			gpio-key,wakeup;

		};



		back {

			label = "Back";

			gpios = <&gpio4 11 0>; /* GPIO5_11 */

			gpios = <&gpio5 11 0>;

			linux,code = <158>; /* KEY_BACK */

			gpio-key,wakeup;

		};



		program {

			label = "Program";

			gpios = <&gpio4 12 0>; /* GPIO5_12 */

			gpios = <&gpio5 12 0>;

			linux,code = <362>; /* KEY_PROGRAM */

			gpio-key,wakeup;

		};



		volume-up {

			label = "Volume Up";

			gpios = <&gpio4 13 0>; /* GPIO5_13 */

			gpios = <&gpio5 13 0>;

			linux,code = <115>; /* KEY_VOLUMEUP */

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio3 0 0>; /* GPIO4_0 */

			gpios = <&gpio4 0 0>;

			linux,code = <114>; /* KEY_VOLUMEDOWN */

		};

	};

arch/arm/boot/dts/imx53-evk.dts

+7 −8
Original line number Diff line number Diff line
@@ -29,15 +29,14 @@ 
		aips@50000000 { /* AIPS1 */

			spba@50000000 {

				esdhc@50004000 { /* ESDHC1 */

					cd-gpios = <&gpio2 13 0>; /* GPIO3_13 */

					wp-gpios = <&gpio2 14 0>; /* GPIO3_14 */

					cd-gpios = <&gpio3 13 0>;

					wp-gpios = <&gpio3 14 0>;

					status = "okay";

				};



				ecspi@50010000 { /* ECSPI1 */

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

					cs-gpios = <&gpio1 30 0>, /* GPIO2_30 */

						   <&gpio2 19 0>; /* GPIO3_19 */

					cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>;

					status = "okay";



					flash: at45db321d@1 {
@@ -61,8 +60,8 @@ 
				};



				esdhc@50020000 { /* ESDHC3 */

					cd-gpios = <&gpio2 11 0>; /* GPIO3_11 */

					wp-gpios = <&gpio2 12 0>; /* GPIO3_12 */

					cd-gpios = <&gpio3 11 0>;

					wp-gpios = <&gpio3 12 0>;

					status = "okay";

				};

			};
@@ -102,7 +101,7 @@ 


			fec@63fec000 {

				phy-mode = "rmii";

				phy-reset-gpios = <&gpio6 6 0>; /* GPIO7_6 */

				phy-reset-gpios = <&gpio7 6 0>;

				status = "okay";

			};

		};
@@ -113,7 +112,7 @@ 


		green {

			label = "Heartbeat";

			gpios = <&gpio6 7 0>; /* GPIO7_7 */

			gpios = <&gpio7 7 0>;

			linux,default-trigger = "heartbeat";

		};

	};

arch/arm/boot/dts/imx53-qsb.dts

+8 −8
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
		aips@50000000 { /* AIPS1 */

			spba@50000000 {

				esdhc@50004000 { /* ESDHC1 */

					cd-gpios = <&gpio2 13 0>; /* GPIO3_13 */

					cd-gpios = <&gpio3 13 0>;

					status = "okay";

				};



				esdhc@50020000 { /* ESDHC3 */

					cd-gpios = <&gpio2 11 0>; /* GPIO3_11 */

					wp-gpios = <&gpio2 12 0>; /* GPIO3_12 */

					cd-gpios = <&gpio3 11 0>;

					wp-gpios = <&gpio3 12 0>;

					status = "okay";

				};

			};
@@ -84,7 +84,7 @@ 


			fec@63fec000 {

				phy-mode = "rmii";

				phy-reset-gpios = <&gpio6 6 0>; /* GPIO7_6 */

				phy-reset-gpios = <&gpio7 6 0>;

				status = "okay";

			};

		};
@@ -95,20 +95,20 @@ 


		power {

			label = "Power Button";

			gpios = <&gpio0 8 0>; /* GPIO1_8 */

			gpios = <&gpio1 8 0>;

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

			gpio-key,wakeup;

		};



		volume-up {

			label = "Volume Up";

			gpios = <&gpio1 14 0>; /* GPIO2_14 */

			gpios = <&gpio2 14 0>;

			linux,code = <115>; /* KEY_VOLUMEUP */

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio1 15 0>; /* GPIO2_15 */

			gpios = <&gpio2 15 0>;

			linux,code = <114>; /* KEY_VOLUMEDOWN */

		};

	};
@@ -118,7 +118,7 @@ 


		user {

			label = "Heartbeat";

			gpios = <&gpio6 7 0>; /* GPIO7_7 */

			gpios = <&gpio7 7 0>;

			linux,default-trigger = "heartbeat";

		};

	};