ARM: dts: zynq: Rename dts for Z-turn board

Makes naming in line with other Zynq boards.

Signed-off-by: Anton Gerasimov <tossel@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3f10762b7d73b172a7c604fdde2b957d8054185f..207fbda307bafd2f82914c9a860adc1c07084a99 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -143,7 +143,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
        zynq-zc770-xm012.dtb \
        zynq-zc770-xm013.dtb \
        zynq-zed.dtb \
-       zynq-zturn-myir.dtb \
+       zynq-zturn.dtb \
        zynq-zybo.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-mini-emmc.dtb                    \

diff --git a/arch/arm/dts/zynq-zturn-myir.dts b/arch/arm/dts/zynq-zturn-myir.dts
deleted file mode 100644 (file)
index 8aa384b..0000000
--- a/arch/arm/dts/zynq-zturn-myir.dts
+++ /dev/null
@@ -1,124 +0,0 @@
-// 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"
-
-/ {
-       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";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               autorepeat;
-               K1 {
-                       label = "K1";
-                       gpios = <&gpio0 0x32 0x1>;
-                       linux,code = <0x66>;
-                       gpio-key,wakeup;
-                       autorepeat;
-               };
-       };
-};
-
-&clkc {
-       ps-clk-frequency = <33333333>;
-};
-
-&qspi {
-       u-boot,dm-pre-reloc;
-       status = "okay";
-};
-
-&gem0 {
-       status = "okay";
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethernet_phy>;
-
-       ethernet_phy: ethernet-phy@0 {
-               reg = <0x0>;
-       };
-};
-
-&sdhci0 {
-       u-boot,dm-pre-reloc;
-       status = "okay";
-};
-
-&uart0 {
-       u-boot,dm-pre-reloc;
-       status = "okay";
-};
-
-&uart1 {
-       u-boot,dm-pre-reloc;
-       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/dts/zynq-zturn.dts b/arch/arm/dts/zynq-zturn.dts
new file mode 100644 (file)
index 0000000..8aa384b
--- /dev/null
+++ b/arch/arm/dts/zynq-zturn.dts
@@ -0,0 +1,124 @@
+// 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"
+
+/ {
+       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";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+               K1 {
+                       label = "K1";
+                       gpios = <&gpio0 0x32 0x1>;
+                       linux,code = <0x66>;
+                       gpio-key,wakeup;
+                       autorepeat;
+               };
+       };
+};
+
+&clkc {
+       ps-clk-frequency = <33333333>;
+};
+
+&qspi {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&gem0 {
+       status = "okay";
+       phy-mode = "rgmii-id";
+       phy-handle = <&ethernet_phy>;
+
+       ethernet_phy: ethernet-phy@0 {
+               reg = <0x0>;
+       };
+};
+
+&sdhci0 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&uart0 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&uart1 {
+       u-boot,dm-pre-reloc;
+       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/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
index 9013239a8f1bdf62d0c568dcdd9b79ac3323a5f6..3fadbe9d0bc3922755dfb266d7f306dcdf3eed4c 100644 (file)
--- a/configs/zynq_z_turn_defconfig
+++ b/configs/zynq_z_turn_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
-CONFIG_DEFAULT_DEVICE_TREE="zynq-zturn-myir"
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zturn"
 CONFIG_DEBUG_UART=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y