Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / tegra124-nyan-big-u-boot.dtsi

diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
index 65c3851affac2ab4fe58a739e4310cb2b0f1c59a..ddfeba806cec5dba3066237884302f3349aa7be4 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
+++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include "tegra-u-boot.dtsi"
+
 / {
        host1x@50000000 {
                u-boot,dm-pre-reloc;
@@ -14,7 +15,7 @@
        };
 
        spi@7000d400 {
-               spi-deactivate-delay = <200>;
+               spi-deactivate-delay = <500>;
                spi-max-frequency = <3000000>;
 
                cros_ec: cros-ec@0 {