LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: tegra: dts: Use TEGRA_GPIO() macro for all GPIOs 

This new method is much easier and matches the kernel.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-01-05 20:05:41 -07:00
parent 050fb909b6
commit 2b2b50bc87
18 changed files with 109 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/dts/tegra114-dalmore.dts
View File

@ -57,7 +57,7 @@
}; };
sdhci@78000400 { sdhci@78000400 {
cd-gpios = <&gpio 170 1>; /* gpio PV2 */ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };
@ -68,8 +68,7 @@
}; };
usb@7d008000 { usb@7d008000 {
/* SPDIF_IN: USB_VBUS_EN1 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
nvidia,vbus-gpio = <&gpio 86 0>;
status = "okay"; status = "okay";
}; };
}; };

9
arch/arm/dts/tegra124-jetson-tk1.dts
View File

@ -303,8 +303,9 @@
sdhci@700b0400 { sdhci@700b0400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 170 1>; /* gpio PV2 */ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio 136 0>; /* gpio PR0 */ power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -316,12 +317,12 @@
usb@7d000000 { usb@7d000000 {
status = "okay"; status = "okay";
dr_mode = "otg"; dr_mode = "otg";
nvidia,vbus-gpio = <&gpio 108 0>; /* gpio PN4, USB_VBUS_EN0 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
}; };
usb@7d008000 { usb@7d008000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 109 0>; /* gpio PN5, USB_VBUS_EN1 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
}; };
regulators { regulators {

9
arch/arm/dts/tegra124-venice2.dts
View File

@ -72,8 +72,9 @@
sdhci@700b0400 { sdhci@700b0400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 170 0>; /* gpio PV2 */ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 136 0>; /* gpio PR0 */ power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
bus-width = <4>; bus-width = <4>;
}; };
@ -85,11 +86,11 @@
usb@7d000000 { usb@7d000000 {
status = "okay"; status = "okay";
dr_mode = "otg"; dr_mode = "otg";
nvidia,vbus-gpio = <&gpio 108 0>; /* gpio PN4, USB_VBUS_EN0 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
}; };
usb@7d008000 { usb@7d008000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 109 0>; /* gpio PN5, USB_VBUS_EN1 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
}; };
}; };

10
arch/arm/dts/tegra20-colibri_t20_iris.dts
View File

@ -22,16 +22,16 @@
}; };
usb@c5004000 { usb@c5004000 {
nvidia,phy-reset-gpio = <&gpio 169 0>; /* PV1 */ nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
nvidia,vbus-gpio = <&gpio 217 0>; /* PBB1 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
}; };
usb@c5008000 { usb@c5008000 {
nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
}; };
nand-controller@70008000 { nand-controller@70008000 {
nvidia,wp-gpios = <&gpio 144 0>; /* PS0 */ nvidia,wp-gpios = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
nvidia,width = <8>; nvidia,width = <8>;
nvidia,timing = <15 100 25 80 25 10 15 10 100>; nvidia,timing = <15 100 25 80 25 10 15 10 100>;
@ -43,7 +43,7 @@
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 23 1>; /* gpio PC7 */ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
bus-width = <4>; bus-width = <4>;
}; };
}; };

28
arch/arm/dts/tegra20-harmony.dts
View File

@ -37,7 +37,7 @@
}; };
nand-controller@70008000 { nand-controller@70008000 {
nvidia,wp-gpios = <&gpio 23 0>; /* PC7 */ nvidia,wp-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
nvidia,width = <8>; nvidia,width = <8>;
nvidia,timing = <26 100 20 80 20 10 12 10 70>; nvidia,timing = <26 100 20 80 20 10 12 10 70>;
nand@0 { nand@0 {
@ -67,22 +67,22 @@
}; };
usb@c5004000 { usb@c5004000 {
nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) 0>;
}; };
sdhci@c8000200 { sdhci@c8000200 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 155 0>; /* gpio PT3 */ power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 58 1>; /* gpio PH2 */ cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 59 0>; /* gpio PH3 */ wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 70 0>; /* gpio PI6 */ power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
bus-width = <8>; bus-width = <8>;
}; };
@ -100,10 +100,14 @@
vsyncx-active-high; vsyncx-active-high;
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 0 0>; nvidia,pwm = <&pwm 0 0>;
nvidia,backlight-enable-gpios = <&gpio 13 0>; /* PB5 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(B, 5)
nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
nvidia,panel-vdd-gpios = <&gpio 22 0>; /* PC6 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(C, 6)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <0 0 200 0 0>; nvidia,panel-timings = <0 0 200 0 0>;
}; };
}; };

9
arch/arm/dts/tegra20-medcom-wide.dts
View File

@ -73,9 +73,12 @@
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 0 500000>; nvidia,pwm = <&pwm 0 500000>;
nvidia,backlight-enable-gpios = <&gpio 13 0>; /* PB5 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(B, 5)
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ GPIO_ACTIVE_HIGH>;
nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <0 0 0 0>; nvidia,panel-timings = <0 0 0 0>;
}; };
}; };

18
arch/arm/dts/tegra20-paz00.dts
View File

@ -61,9 +61,9 @@
sdhci@c8000000 { sdhci@c8000000 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 173 1>; /* gpio PV5 */ cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 169 0>; /* gpio PV1 */ power-gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -86,10 +86,14 @@
hsync-active-high; hsync-active-high;
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 0 0>; nvidia,pwm = <&pwm 0 0>;
nvidia,backlight-enable-gpios = <&gpio 164 0>; /* PU4 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(U, 4)
nvidia,lvds-shutdown-gpios = <&gpio 102 0>; /* PM6 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(M, 6)
nvidia,panel-vdd-gpios = <&gpio 4 0>; /* PA4 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(A, 4)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <400 4 203 17 15>; nvidia,panel-timings = <400 4 203 17 15>;
}; };
}; };

22
arch/arm/dts/tegra20-seaboard.dts
View File

@ -65,7 +65,7 @@
}; };
nand-controller@70008000 { nand-controller@70008000 {
nvidia,wp-gpios = <&gpio 59 0>; /* PH3 */ nvidia,wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
nvidia,width = <8>; nvidia,width = <8>;
nvidia,timing = <26 100 20 80 20 10 12 10 70>; nvidia,timing = <26 100 20 80 20 10 12 10 70>;
nand@0 { nand@0 {
@ -151,7 +151,7 @@
}; };
usb@c5000000 { usb@c5000000 {
nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
dr_mode = "otg"; dr_mode = "otg";
}; };
@ -161,9 +161,9 @@
sdhci@c8000400 { sdhci@c8000400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 70 0>; /* gpio PI6 */ power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -186,10 +186,14 @@
hsync-active-high; hsync-active-high;
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 2 0>; nvidia,pwm = <&pwm 2 0>;
nvidia,backlight-enable-gpios = <&gpio 28 0>; /* PD4 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(D, 4)
nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
nvidia,panel-vdd-gpios = <&gpio 22 0>; /* PC6 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(C, 6)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <400 4 203 17 15>; nvidia,panel-timings = <400 4 203 17 15>;
}; };
}; };

9
arch/arm/dts/tegra20-tamonten.dtsi
View File

@ -14,7 +14,8 @@
pll-supply = <&hdmi_pll_reg>; pll-supply = <&hdmi_pll_reg>;
nvidia,ddc-i2c-bus = <&hdmi_ddc>; nvidia,ddc-i2c-bus = <&hdmi_ddc>;
nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
GPIO_ACTIVE_HIGH>;
}; };
}; };
@ -280,7 +281,7 @@
}; };
nand-controller@70008000 { nand-controller@70008000 {
nvidia,wp-gpios = <&gpio 23 0>; /* PC7 */ nvidia,wp-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
nvidia,width = <8>; nvidia,width = <8>;
nvidia,timing = <26 100 20 80 20 10 12 10 70>; nvidia,timing = <26 100 20 80 20 10 12 10 70>;
@ -476,8 +477,8 @@
}; };
sdhci@c8000600 { sdhci@c8000600 {
cd-gpios = <&gpio 58 1>; /* gpio PH2 */ cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 59 0>; /* gpio PH3 */ wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };

9
arch/arm/dts/tegra20-tec.dts
View File

@ -73,9 +73,12 @@
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 0 500000>; nvidia,pwm = <&pwm 0 500000>;
nvidia,backlight-enable-gpios = <&gpio 13 0>; /* PB5 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(B, 5)
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ GPIO_ACTIVE_HIGH>;
nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <0 0 0 0>; nvidia,panel-timings = <0 0 0 0>;
}; };
}; };

8
arch/arm/dts/tegra20-trimslice.dts
View File

@ -62,7 +62,7 @@
}; };
usb@c5000000 { usb@c5000000 {
nvidia,vbus-gpio = <&gpio 170 0>; /* PV2 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
}; };
usb@c5004000 { usb@c5004000 {
@ -76,8 +76,8 @@
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 121 1>; /* gpio PP1 */ cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 122 0>; /* gpio PP2 */ wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -111,7 +111,7 @@
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
gpio = <&gpio TEGRA_GPIO(V, 2) 0>; gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
}; };

18
arch/arm/dts/tegra20-ventana.dts
View File

@ -61,9 +61,9 @@
sdhci@c8000400 { sdhci@c8000400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 70 0>; /* gpio PI6 */ power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -86,10 +86,14 @@
vsync-active-high; vsync-active-high;
nvidia,bits-per-pixel = <16>; nvidia,bits-per-pixel = <16>;
nvidia,pwm = <&pwm 2 0>; nvidia,pwm = <&pwm 2 0>;
nvidia,backlight-enable-gpios = <&gpio 28 0>; /* PD4 */ nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(D, 4)
nvidia,lvds-shutdown-gpios = <&gpio 10 0>; /* PB2 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio 176 0>; /* PW0 */ nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
nvidia,panel-vdd-gpios = <&gpio 22 0>; /* PC6 */ GPIO_ACTIVE_HIGH>;
nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
GPIO_ACTIVE_HIGH>;
nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(C, 6)
GPIO_ACTIVE_HIGH>;
nvidia,panel-timings = <0 0 200 0 0>; nvidia,panel-timings = <0 0 200 0 0>;
}; };
}; };

2
arch/arm/dts/tegra20-whistler.dts
View File

@ -66,7 +66,7 @@
sdhci@c8000400 { sdhci@c8000400 {
status = "okay"; status = "okay";
wp-gpios = <&gpio 173 0>; /* gpio PV5 */ wp-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
bus-width = <8>; bus-width = <8>;
}; };

10
arch/arm/dts/tegra30-apalis.dts
View File

@ -243,13 +243,13 @@
sdhci@78000000 { sdhci@78000000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio 229 1>; /* PCC5, SD1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_HIGH>;
}; };
sdhci@78000400 { sdhci@78000400 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
cd-gpios = <&gpio 171 1>; /* PV3, MMC1_CD# */ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
}; };
sdhci@78000600 { sdhci@78000600 {
@ -262,20 +262,20 @@
usb@7d000000 { usb@7d000000 {
status = "okay"; status = "okay";
dr_mode = "peripheral"; dr_mode = "peripheral";
nvidia,vbus-gpio = <&gpio 157 0>; /* PT5, USBO1_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
}; };
/* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */ /* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */
usb@7d004000 { usb@7d004000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 233 0>; /* PDD1, USBH_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
phy_type = "utmi"; phy_type = "utmi";
}; };
/* EHCI instance 2: USB3_DP/N -> USBH3_DP/N */ /* EHCI instance 2: USB3_DP/N -> USBH3_DP/N */
usb@7d008000 { usb@7d008000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 233 0>; /* PDD1, USBH_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
}; };
regulators { regulators {

10
arch/arm/dts/tegra30-beaver.dts
View File

@ -196,9 +196,9 @@
sdhci@78000000 { sdhci@78000000 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 155 0>; /* gpio PT3 */ wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 31 0>; /* gpio PD7 */ power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -210,11 +210,11 @@
usb@7d000000 { usb@7d000000 {
status = "okay"; status = "okay";
dr_mode = "otg"; dr_mode = "otg";
nvidia,vbus-gpio = <&gpio 238 0>; /* gpio DD6, PEX_L1_CLKREQ */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
}; };
usb@7d008000 { usb@7d008000 {
nvidia,vbus-gpio = <&gpio 236 0>; /* PDD4 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

8
arch/arm/dts/tegra30-cardhu.dts
View File

@ -185,9 +185,9 @@
sdhci@78000000 { sdhci@78000000 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 155 0>; /* gpio PT3 */ wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio 31 0>; /* gpio PD7 */ power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
@ -197,7 +197,7 @@
}; };
usb@7d008000 { usb@7d008000 {
nvidia,vbus-gpio = <&gpio 236 0>; /* PDD4 */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

6
arch/arm/dts/tegra30-colibri.dts
View File

@ -64,7 +64,7 @@
sdhci@78000200 { sdhci@78000200 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio 23 1>; /* PC7, MMCD */ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
}; };
sdhci@78000600 { sdhci@78000600 {
@ -83,12 +83,12 @@
usb@7d004000 { usb@7d004000 {
status = "okay"; status = "okay";
phy_type = "utmi"; phy_type = "utmi";
nvidia,vbus-gpio = <&gpio 234 0>; /* PDD2, VBUS_LAN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
}; };
/* EHCI instance 2: USB3_DP/N -> USBH_P/N */ /* EHCI instance 2: USB3_DP/N -> USBH_P/N */
usb@7d008000 { usb@7d008000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 178 1>; /* PW2, USBH_PEN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
}; };
}; };

4
arch/arm/dts/tegra30-tamonten.dtsi
View File

@ -55,8 +55,8 @@
/* SD slot on the base board */ /* SD slot on the base board */
sdhci@78000400 { sdhci@78000400 {
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio 67 0>; /* gpio PI3 */ wp-gpios = <&gpio TEGRA_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };