Merge tag 'efi-2019-07-rc1-2' of git://git.denx.de/u-boot-efi

[oweals/u-boot.git] / arch / arm / dts / fsl-ls1046a-rdb.dts

diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index 646e4772c1cdc07f8f64aa6bd432b78419a809e2..a05c9e9b9ea0ee33e4f89a7445514037c92ad261 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
  *
  * Mingkai Hu <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
 /dts-v1/;
@@ -27,7 +26,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -35,8 +34,12 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
         };
 };
+
+&sata {
+       status = "okay";
+};