diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-11 15:22:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-11 15:22:36 -0400 |
| commit | 9a66328a37e3b31dbe646ef3668b60466e8abd9a (patch) | |
| tree | 0ece22b0187232017e0930aa88fa4664772edba9 /arch | |
| parent | 57a72d0560eb7693a35a891f43587bcd6786dc04 (diff) | |
| parent | 71cb3d7c7897cd02ca731f4c510fff49705b84b7 (diff) | |
| download | u-boot-9a66328a37e3b31dbe646ef3668b60466e8abd9a.tar.gz | |
Merge git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/tegra124-apalis.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/tegra30-apalis.dts | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts index 2fc0384d14..fe08d3ea73 100644 --- a/arch/arm/dts/tegra124-apalis.dts +++ b/arch/arm/dts/tegra124-apalis.dts @@ -1683,9 +1683,9 @@ bias-pull-up; }; - gpio1_3_4_5_6 { - pins = "gpio1", "gpio3", "gpio4", - "gpio5", "gpio6"; + gpio0_1_3_4_5_6 { + pins = "gpio0", "gpio1", "gpio3", + "gpio4", "gpio5", "gpio6"; bias-high-impedance; }; }; diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts index 0b84dae215..0852d8dc53 100644 --- a/arch/arm/dts/tegra30-apalis.dts +++ b/arch/arm/dts/tegra30-apalis.dts @@ -43,16 +43,19 @@ vddio-pex-ctl-supply = <&sys_3v3_reg>; hvdd-pex-supply = <&sys_3v3_reg>; + /* Apalis Type Specific 4 Lane PCIe */ pci@1,0 { /* TS_DIFF1/2/3/4 left disabled */ nvidia,num-lanes = <4>; }; + /* Apalis PCIe */ pci@2,0 { /* PCIE1_RX/TX left disabled */ nvidia,num-lanes = <1>; }; + /* I210 Gigabit Ethernet Controller (On-module) */ pci@3,0 { status = "okay"; nvidia,num-lanes = <1>; |