Commit 3325f1bc authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: convert device tree files to use GPIO defines 



Use TEGRA_GPIO() macro to name all GPIOs referenced by GPIO properties,
and some interrupts properties. Use standard GPIO flag defines too.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 9798e47f

arch/arm/boot/dts/tegra114-dalmore.dts

+6 −6
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ 
	};



	sdhci@78000400 {

		cd-gpios = <&gpio 170 1>; /* gpio PV2 */

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		bus-width = <4>;

		status = "okay";

	};
@@ -883,7 +883,7 @@ 
			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			enable-active-high;

			gpio = <&gpio 61 0>; /* GPIO PH5 */

			gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;

		};



		lcd_bl_en_reg: regulator@2 {
@@ -893,7 +893,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 58 0>; /* GPIO PH2 */

			gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;

		};



		usb1_vbus_reg: regulator@3 {
@@ -903,7 +903,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 108 0>; /* GPIO PN4 */

			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;

			gpio-open-drain;

			vin-supply = <&tps65090_dcdc1_reg>;

		};
@@ -915,7 +915,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 86 0>; /* GPIO PK6 */

			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;

			gpio-open-drain;

			vin-supply = <&tps65090_dcdc1_reg>;

		};
@@ -927,7 +927,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 81 0>; /* GPIO PK1 */

			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;

			vin-supply = <&tps65090_dcdc1_reg>;

		};

	};

arch/arm/boot/dts/tegra114.dtsi

+2 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/tegra-gpio.h>



#include "skeleton.dtsi"



/ {

arch/arm/boot/dts/tegra20-colibri-512.dtsi

+12 −7
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
			pll-supply = <&hdmi_pll_reg>;



			nvidia,ddc-i2c-bus = <&i2c_ddc>;

			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */

			nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)

				GPIO_ACTIVE_HIGH>;

		};

	};
@@ -443,21 +444,25 @@ 


	ac97: ac97 {

		status = "okay";

		nvidia,codec-reset-gpio = <&gpio 168 0>; /* gpio PV0 */

		nvidia,codec-sync-gpio = <&gpio 120 0>; /* gpio PP0 */

		nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)

			GPIO_ACTIVE_HIGH>;

		nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)

			GPIO_ACTIVE_HIGH>;

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	sdhci@c8000600 {

		cd-gpios = <&gpio 23 1>; /* gpio PC7 */

		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;

	};



	clocks {
@@ -514,7 +519,7 @@ 
			enable-active-high;

			regulator-boot-on;

			regulator-always-on;

			gpio = <&gpio 217 0>;

			gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;

		};

	};

};

arch/arm/boot/dts/tegra20-harmony.dts

+26 −20
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
			pll-supply = <&hdmi_pll_reg>;



			nvidia,ddc-i2c-bus = <&hdmi_ddc>;

			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */

			nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)

				GPIO_ACTIVE_HIGH>;

		};

	};
@@ -262,7 +263,7 @@ 
			compatible = "wlf,wm8903";

			reg = <0x1a>;

			interrupt-parent = <&gpio>;

			interrupts = <187 0x04>;

			interrupts = <TEGRA_GPIO(X, 3) 0x04>;



			gpio-controller;

			#gpio-cells = <2>;
@@ -434,12 +435,14 @@ 


	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb@c5008000 {
@@ -452,17 +455,17 @@ 


	sdhci@c8000200 {

		status = "okay";

		cd-gpios = <&gpio 69 1>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

	};



	sdhci@c8000600 {

		status = "okay";

		cd-gpios = <&gpio 58 1>; /* gpio PH2 */

		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <8>;

	};
@@ -484,7 +487,7 @@ 


		power {

			label = "Power";

			gpios = <&gpio 170 1>; /* gpio PV2, active low */

			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

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

			gpio-key,wakeup;

		};
@@ -627,7 +630,7 @@ 
			regulator-name = "vdd_1v5";

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			gpio = <&pmic 0 0>;

			gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;

		};



		regulator@2 {
@@ -636,7 +639,7 @@ 
			regulator-name = "vdd_1v2";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			gpio = <&pmic 1 0>;

			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};
@@ -646,7 +649,7 @@ 
			regulator-name = "vdd_1v05";

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

			gpio = <&pmic 2 0>;

			gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;

			enable-active-high;

			/* Hack until board-harmony-pcie.c is removed */

			status = "disabled";
@@ -658,7 +661,7 @@ 
			regulator-name = "vdd_pnl";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpio 22 0>; /* gpio PC6 */

			gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};
@@ -668,7 +671,7 @@ 
			regulator-name = "vdd_bl";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpio 176 0>; /* gpio PW0 */

			gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};

	};
@@ -691,10 +694,13 @@ 
		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

		nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */

		nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */

		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;

		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)

			GPIO_ACTIVE_HIGH>;

		nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)

			GPIO_ACTIVE_HIGH>;

		nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)

			GPIO_ACTIVE_HIGH>;



		clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

arch/arm/boot/dts/tegra20-iris-512.dts

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
			regulator-max-microvolt = <5000000>;

			regulator-boot-on;

			regulator-always-on;

			gpio = <&gpio 178 0>;

			gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;

		};



		vcc_sd_reg: regulator@1 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE