Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / dts / zynq-zc770-xm010.dts

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index cc5ba98d6bd9a71db3c9e7b0c433d304b8a09293..e1f34653ec3cc79eabd2f088506269ac091565e5 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -1,16 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Xilinx ZC770 XM010 board DTS
  *
- * Copyright (C) 2013 - 2015 Xilinx, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2013-2018 Xilinx, Inc.
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
 
 / {
+       model = "Xilinx ZC770 XM010 board";
        compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
-       model = "Xilinx Zynq";
 
        aliases {
                ethernet0 = &gem0;
@@ -55,11 +54,10 @@
        status = "okay";
        clock-frequency = <400000>;
 
-       m24c02_eeprom@52 {
-               compatible = "at,24c02";
+       eeprom: eeprom@52 {
+               compatible = "atmel,24c02";
                reg = <0x52>;
        };
-
 };
 
 &qspi {
@@ -75,14 +73,17 @@
        num-cs = <4>;
        is-decoded-cs = <0>;
        flash@0 {
-               compatible = "sst25wf080";
+               compatible = "sst25wf080", "jedec,spi-nor";
                reg = <1>;
                spi-max-frequency = <1000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               partition@test {
-                       label = "spi-flash";
-                       reg = <0x0 0x100000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "data";
+                               reg = <0x0 0x100000>;
+                       };
                };
        };
 };