Merge tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx into arm/dt

ARM: dts: zynq: DT changes for v5.11

- Adding support for Zturn-v5
- Small DT changes to clean errors from dt_binding_check

* tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Fix incorrect reference to XM013 instead of XM011
  ARM: zynq: Convert at25 binding to new description on zc770-xm013
  ARM: zynq: Fix OCM mapping to be aligned with binding on zc702
  ARM: zynq: Fix leds subnode name for zc702/zybo-z7
  ARM: zynq: Rename bus to be align with simple-bus yaml
  ARM: zynq: Fix compatible string for adi,adxl345 chip
  ARM: zynq: Add Z-turn board V5

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f597e41..3d1ea0b 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1317,6 +1317,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
        zynq-zc770-xm013.dtb \
        zynq-zed.dtb \
        zynq-zturn.dtb \
+       zynq-zturn-v5.dtb \
        zynq-zybo.dtb \
        zynq-zybo-z7.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index db3899b..df9ad83 100644 (file)
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -92,7 +92,7 @@
                };
        };
 
-       amba: amba {
+       amba: axi {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 27cd6cb..cf70aff 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -49,7 +49,7 @@
        leds {
                compatible = "gpio-leds";
 
-               ds23 {
+               led-ds23 {
                        label = "ds23";
                        gpios = <&gpio0 10 0>;
                        linux,default-trigger = "heartbeat";
@@ -66,6 +66,12 @@
        ocm: sram@fffc0000 {
                compatible = "mmio-sram";
                reg = <0xfffc0000 0x10000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0xfffc0000 0x10000>;
+               ocm-sram@0 {
+                       reg = <0x0 0x10000>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b7f6586..56732e8 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Xilinx ZC770 XM013 board DTS
+ * Xilinx ZC770 XM011 board DTS
  *
  * Copyright (C) 2013-2018 Xilinx, Inc.
  */

diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 4ae2c85..38d96ad 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -63,13 +63,12 @@
        num-cs = <4>;
        is-decoded-cs = <0>;
        eeprom: eeprom@2 {
-               at25,byte-len = <8192>;
-               at25,addr-mode = <2>;
-               at25,page-size = <32>;
-
                compatible = "atmel,at25";
                reg = <2>;
                spi-max-frequency = <1000000>;
+               size = <8192>;
+               address-width = <16>;
+               pagesize = <32>;
        };
 };
 

diff --git a/arch/arm/boot/dts/zynq-zturn-common.dtsi b/arch/arm/boot/dts/zynq-zturn-common.dtsi
new file mode 100644 (file)
index 0000000..bf5d1c4
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zturn-common.dtsi
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *  Copyright (C) 2015 Andrea Merello <adnrea.merello@gmail.com>
+ *  Copyright (C) 2017 Alexander Graf <agraf@suse.de>
+ *
+ *  Based on zynq-zed.dts which is:
+ *  Copyright (C) 2011 - 2014 Xilinx
+ *  Copyright (C) 2012 National Instruments Corp.
+ *
+ */
+
+/dts-v1/;
+/include/ "zynq-7000.dtsi"
+
+/ {
+       compatible = "xlnx,zynq-7000";
+
+       aliases {
+               ethernet0 = &gem0;
+               serial0 = &uart1;
+               serial1 = &uart0;
+               mmc0 = &sdhci0;
+       };
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x40000000>;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               usr-led1 {
+                       label = "usr-led1";
+                       gpios = <&gpio0 0x0 0x1>;
+                       default-state = "off";
+               };
+
+               usr-led2 {
+                       label = "usr-led2";
+                       gpios = <&gpio0 0x9 0x1>;
+                       default-state = "off";
+               };
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               autorepeat;
+               K1 {
+                       label = "K1";
+                       gpios = <&gpio0 0x32 0x1>;
+                       linux,code = <0x66>;
+                       wakeup-source;
+                       autorepeat;
+               };
+       };
+};
+
+&clkc {
+       ps-clk-frequency = <33333333>;
+};
+
+&gem0 {
+       status = "okay";
+       phy-mode = "rgmii-id";
+       phy-handle = <&ethernet_phy>;
+
+       ethernet_phy: ethernet-phy@0 {
+       };
+};
+
+&sdhci0 {
+       status = "okay";
+};
+
+&uart0 {
+       status = "okay";
+};
+
+&uart1 {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+       dr_mode = "host";
+};
+
+&can0 {
+       status = "okay";
+};
+
+&i2c0 {
+       status = "okay";
+       clock-frequency = <400000>;
+
+       stlm75@49 {
+               status = "okay";
+               compatible = "lm75";
+               reg = <0x49>;
+       };
+
+       accelerometer@53 {
+               compatible = "adi,adxl345";
+               reg = <0x53>;
+               interrupt-parent = <&intc>;
+               interrupts = <0x0 0x1e 0x4>;
+       };
+};

diff --git a/arch/arm/boot/dts/zynq-zturn-v5.dts b/arch/arm/boot/dts/zynq-zturn-v5.dts
new file mode 100644 (file)
index 0000000..536632a
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zturn-v5.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+/include/ "zynq-zturn-common.dtsi"
+
+/ {
+       model = "Zynq Z-Turn MYIR Board V5";
+       compatible = "myir,zynq-zturn-v5", "xlnx,zynq-7000";
+};
+
+&gem0 {
+       ethernet_phy: ethernet-phy@0 {
+               reg = <0x3>;
+       };
+};

diff --git a/arch/arm/boot/dts/zynq-zturn.dts b/arch/arm/boot/dts/zynq-zturn.dts
index 5ec616e..620b24a 100644 (file)
--- a/arch/arm/boot/dts/zynq-zturn.dts
+++ b/arch/arm/boot/dts/zynq-zturn.dts
@@ -1,114 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0
-/*
- *  Copyright (C) 2015 Andrea Merello <adnrea.merello@gmail.com>
- *  Copyright (C) 2017 Alexander Graf <agraf@suse.de>
- *
- *  Based on zynq-zed.dts which is:
- *  Copyright (C) 2011 - 2014 Xilinx
- *  Copyright (C) 2012 National Instruments Corp.
- *
- */
 
 /dts-v1/;
-/include/ "zynq-7000.dtsi"
+/include/ "zynq-zturn-common.dtsi"
 
 / {
        model = "Zynq Z-Turn MYIR Board";
        compatible = "myir,zynq-zturn", "xlnx,zynq-7000";
-
-       aliases {
-               ethernet0 = &gem0;
-               serial0 = &uart1;
-               serial1 = &uart0;
-               mmc0 = &sdhci0;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x40000000>;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-               usr-led1 {
-                       label = "usr-led1";
-                       gpios = <&gpio0 0x0 0x1>;
-                       default-state = "off";
-               };
-
-               usr-led2 {
-                       label = "usr-led2";
-                       gpios = <&gpio0 0x9 0x1>;
-                       default-state = "off";
-               };
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-               autorepeat;
-               K1 {
-                       label = "K1";
-                       gpios = <&gpio0 0x32 0x1>;
-                       linux,code = <0x66>;
-                       wakeup-source;
-                       autorepeat;
-               };
-       };
-};
-
-&clkc {
-       ps-clk-frequency = <33333333>;
 };
 
 &gem0 {
-       status = "okay";
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethernet_phy>;
-
        ethernet_phy: ethernet-phy@0 {
                reg = <0x0>;
        };
 };
-
-&sdhci0 {
-       status = "okay";
-};
-
-&uart0 {
-       status = "okay";
-};
-
-&uart1 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-       dr_mode = "host";
-};
-
-&can0 {
-       status = "okay";
-};
-
-&i2c0 {
-       status = "okay";
-       clock-frequency = <400000>;
-
-       stlm75@49 {
-               status = "okay";
-               compatible = "lm75";
-               reg = <0x49>;
-       };
-
-       accelerometer@53 {
-               compatible = "adi,adxl345", "adxl345", "adi,adxl34x", "adxl34x";
-               reg = <0x53>;
-               interrupt-parent = <&intc>;
-               interrupts = <0x0 0x1e 0x4>;
-       };
-};

diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
index 357b78a..7b87e10 100644 (file)
--- a/arch/arm/boot/dts/zynq-zybo-z7.dts
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -25,7 +25,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               ld4 {
+               led-ld4 {
                        label = "zynq-zybo-z7:green:ld4";
                        gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
                };