diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-02-25 10:45:04 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2014-02-25 12:59:00 -0500 |
| commit | fa15ffaaea4abe1115d075946d87cd75360e59a2 (patch) | |
| tree | 6e8cec00980bc4715256a12b0ac8b19de2927440 /arch/arm/boot/dts/tegra124-venice2.dts | |
| parent | e2b6d77ef8e6066e479fc4fcf9549f21b031f389 (diff) | |
ARM: tegra: Combine VBUS enable pins into one node
Both USB_VBUS_EN0 and USB_VBUS_EN1 are configured the same way, so they
can be combined into a single node. While at it, don't configure them as
pull-up since they already have external pull-ups. Also U-Boot doesn't
configure them as pull-up either.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts/tegra124-venice2.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-venice2.dts | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index e71aeb9929b4..c950c76185d2 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts | |||
| @@ -402,19 +402,11 @@ | |||
| 402 | nvidia,enable-input = <TEGRA_PIN_ENABLE>; | 402 | nvidia,enable-input = <TEGRA_PIN_ENABLE>; |
| 403 | }; | 403 | }; |
| 404 | usb_vbus_en0_pn4 { | 404 | usb_vbus_en0_pn4 { |
| 405 | nvidia,pins = "usb_vbus_en0_pn4"; | 405 | nvidia,pins = "usb_vbus_en0_pn4", |
| 406 | "usb_vbus_en1_pn5"; | ||
| 406 | nvidia,function = "usb"; | 407 | nvidia,function = "usb"; |
| 407 | nvidia,enable-input = <TEGRA_PIN_ENABLE>; | 408 | nvidia,enable-input = <TEGRA_PIN_ENABLE>; |
| 408 | nvidia,pull = <TEGRA_PIN_PULL_UP>; | 409 | nvidia,pull = <TEGRA_PIN_PULL_NONE>; |
| 409 | nvidia,tristate = <TEGRA_PIN_DISABLE>; | ||
| 410 | nvidia,lock = <TEGRA_PIN_DISABLE>; | ||
| 411 | nvidia,open-drain = <TEGRA_PIN_ENABLE>; | ||
| 412 | }; | ||
| 413 | usb_vbus_en1_pn5 { | ||
| 414 | nvidia,pins = "usb_vbus_en1_pn5"; | ||
| 415 | nvidia,function = "usb"; | ||
| 416 | nvidia,enable-input = <TEGRA_PIN_ENABLE>; | ||
| 417 | nvidia,pull = <TEGRA_PIN_PULL_UP>; | ||
| 418 | nvidia,tristate = <TEGRA_PIN_DISABLE>; | 410 | nvidia,tristate = <TEGRA_PIN_DISABLE>; |
| 419 | nvidia,lock = <TEGRA_PIN_DISABLE>; | 411 | nvidia,lock = <TEGRA_PIN_DISABLE>; |
| 420 | nvidia,open-drain = <TEGRA_PIN_ENABLE>; | 412 | nvidia,open-drain = <TEGRA_PIN_ENABLE>; |