diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-20 12:28:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-20 12:28:57 -0500 |
| commit | 888f9aa5cac4227e540a5c91a744ac7bed386e70 (patch) | |
| tree | 27e0c1da87d75b80ab673d13084fb1489c985893 /arch | |
| parent | 0c41e59a37fbd5b10d4837ae30c288a084997465 (diff) | |
| parent | a3c9021771608f5b514c75874fa0d8fbee2873d6 (diff) | |
| download | u-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.zip u-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.tar.gz u-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-nyan.dtsi | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi index 3ff2f67..ddfeba8 100644 --- a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi +++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi @@ -15,7 +15,7 @@ }; spi@7000d400 { - spi-deactivate-delay = <200>; + spi-deactivate-delay = <500>; spi-max-frequency = <3000000>; cros_ec: cros-ec@0 { diff --git a/arch/arm/dts/tegra124-nyan.dtsi b/arch/arm/dts/tegra124-nyan.dtsi index 51895e4..2b28fe1 100644 --- a/arch/arm/dts/tegra124-nyan.dtsi +++ b/arch/arm/dts/tegra124-nyan.dtsi @@ -414,6 +414,7 @@ usb@7d000000 { /* Rear external USB port. */ status = "okay"; + dr_mode = "otg"; nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>; }; |