ARM: tegra: update device trees for USB binding rework

This patch updates all Tegra board files so that they contain all the
properties required by the updated USB DT binding. Note that this patch
only adds the new properties and does not yet remove the old properties,
in order to maintain bisectability. The old properties will be removed
once the driver has been updated to assume the new bindings.

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
[swarren: fixed some newly added regulator-name properties to better
match schematic, avoided duplicate regulator-name on Whistler.]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Venu Byravarasu 2013-05-16 19:42:57 +05:30 коммит произвёл Stephen Warren
Родитель 9dffe3be3f
Коммит 4c94c8b5b3
9 изменённых файлов: 143 добавлений и 13 удалений

Просмотреть файл

@ -428,12 +428,17 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5000000 {
status = "okay";
};
usb@c5004000 { usb@c5004000 {
status = "okay"; status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
usb-phy@c5004000 { usb-phy@c5004000 {
status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
@ -441,6 +446,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000200 { sdhci@c8000200 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio 69 1>; /* gpio PI5 */

Просмотреть файл

@ -38,13 +38,20 @@
usb@c5000000 { usb@c5000000 {
status = "okay"; status = "okay";
dr_mode = "otg"; };
usb-phy@c5000000 {
status = "okay";
}; };
usb@c5008000 { usb@c5008000 {
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
serial@70006000 { serial@70006000 {
status = "okay"; status = "okay";
}; };

Просмотреть файл

@ -427,12 +427,17 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5000000 {
status = "okay";
};
usb@c5004000 { usb@c5004000 {
status = "okay"; status = "okay";
nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
}; };
usb-phy@c5004000 { usb-phy@c5004000 {
status = "okay";
nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
}; };
@ -440,6 +445,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 { sdhci@c8000000 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 173 1>; /* gpio PV5 */ cd-gpios = <&gpio 173 1>; /* gpio PV5 */

Просмотреть файл

@ -569,12 +569,19 @@
dr_mode = "otg"; dr_mode = "otg";
}; };
usb-phy@c5000000 {
status = "okay";
vbus-supply = <&vbus_reg>;
dr_mode = "otg";
};
usb@c5004000 { usb@c5004000 {
status = "okay"; status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
usb-phy@c5004000 { usb-phy@c5004000 {
status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
@ -582,6 +589,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 { sdhci@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio 86 0>; /* gpio PK6 */ power-gpios = <&gpio 86 0>; /* gpio PK6 */
@ -807,6 +818,15 @@
gpio = <&pmic 1 0>; gpio = <&pmic 1 0>;
enable-active-high; enable-active-high;
}; };
vbus_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_vbus_wup1";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 24 0>; /* PD0 */
};
}; };
sound { sound {

Просмотреть файл

@ -470,6 +470,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000600 { sdhci@c8000600 {
cd-gpios = <&gpio 58 1>; /* gpio PH2 */ cd-gpios = <&gpio 58 1>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */ wp-gpios = <&gpio 59 0>; /* gpio PH3 */

Просмотреть файл

@ -314,12 +314,18 @@
nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */ nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
}; };
usb-phy@c5000000 {
status = "okay";
vbus-supply = <&vbus_reg>;
};
usb@c5004000 { usb@c5004000 {
status = "okay"; status = "okay";
nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
}; };
usb-phy@c5004000 { usb-phy@c5004000 {
status = "okay";
nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */ nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
}; };
@ -327,6 +333,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 { sdhci@c8000000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
@ -390,6 +400,15 @@
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
}; };
vbus_reg: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 170 0>; /* PV2 */
};
}; };
sound { sound {

Просмотреть файл

@ -505,12 +505,17 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5000000 {
status = "okay";
};
usb@c5004000 { usb@c5004000 {
status = "okay"; status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
usb-phy@c5004000 { usb-phy@c5004000 {
status = "okay";
nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */ nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
}; };
@ -518,6 +523,10 @@
status = "okay"; status = "okay";
}; };
usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 { sdhci@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio 86 0>; /* gpio PK6 */ power-gpios = <&gpio 86 0>; /* gpio PK6 */

Просмотреть файл

@ -511,11 +511,21 @@
nvidia,vbus-gpio = <&tca6416 0 0>; /* GPIO_PMU0 */ nvidia,vbus-gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
}; };
usb-phy@c5000000 {
status = "okay";
vbus-supply = <&vbus1_reg>;
};
usb@c5008000 { usb@c5008000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&tca6416 1 0>; /* GPIO_PMU1 */ nvidia,vbus-gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
}; };
usb-phy@c5008000 {
status = "okay";
vbus-supply = <&vbus3_reg>;
};
sdhci@c8000400 { sdhci@c8000400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */ cd-gpios = <&gpio 69 1>; /* gpio PI5 */
@ -568,6 +578,24 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on; regulator-always-on;
}; };
vbus1_reg: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vbus1";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
};
vbus3_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vbus3";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
};
}; };
sound { sound {

Просмотреть файл

@ -455,13 +455,24 @@
status = "disabled"; status = "disabled";
}; };
phy1: usb-phy@c5000400 { phy1: usb-phy@c5000000 {
compatible = "nvidia,tegra20-usb-phy"; compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5000400 0x3c00>; reg = <0xc5000000 0x4000 0xc5000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car 22>,
<&tegra_car 127>,
<&tegra_car 106>,
<&tegra_car 22>;
clock-names = "reg", "pll_u", "timer", "utmi-pads";
nvidia,has-legacy-mode; nvidia,has-legacy-mode;
clocks = <&tegra_car 22>, <&tegra_car 127>; hssync_start_delay = <9>;
clock-names = "phy", "pll_u"; idle_wait_delay = <17>;
elastic_limit = <16>;
term_range_adj = <6>;
xcvr_setup = <9>;
xcvr_lsfslew = <1>;
xcvr_lsrslew = <1>;
status = "disabled";
}; };
usb@c5004000 { usb@c5004000 {
@ -474,12 +485,15 @@
status = "disabled"; status = "disabled";
}; };
phy2: usb-phy@c5004400 { phy2: usb-phy@c5004000 {
compatible = "nvidia,tegra20-usb-phy"; compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5004400 0x3c00>; reg = <0xc5004000 0x4000>;
phy_type = "ulpi"; phy_type = "ulpi";
clocks = <&tegra_car 93>, <&tegra_car 127>; clocks = <&tegra_car 58>,
clock-names = "phy", "pll_u"; <&tegra_car 127>,
<&tegra_car 93>;
clock-names = "reg", "pll_u", "ulpi-link";
status = "disabled";
}; };
usb@c5008000 { usb@c5008000 {
@ -492,12 +506,23 @@
status = "disabled"; status = "disabled";
}; };
phy3: usb-phy@c5008400 { phy3: usb-phy@c5008000 {
compatible = "nvidia,tegra20-usb-phy"; compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5008400 0x3c00>; reg = <0xc5008000 0x4000 0xc5000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car 22>, <&tegra_car 127>; clocks = <&tegra_car 59>,
clock-names = "phy", "pll_u"; <&tegra_car 127>,
<&tegra_car 106>,
<&tegra_car 22>;
clock-names = "reg", "pll_u", "timer", "utmi-pads";
hssync_start_delay = <9>;
idle_wait_delay = <17>;
elastic_limit = <16>;
term_range_adj = <6>;
xcvr_setup = <9>;
xcvr_lsfslew = <2>;
xcvr_lsrslew = <2>;
status = "disabled";
}; };
sdhci@c8000000 { sdhci@c8000000 {