ARM: dts: socfpga: Rename socfpga_cyclone5_de0_{sockit,nano_soc}
authorMarek Vasut <marex@denx.de>
Wed, 29 Aug 2018 15:15:04 +0000 (17:15 +0200)
committerDinh Nguyen <dinguyen@kernel.org>
Thu, 30 Aug 2018 13:38:26 +0000 (08:38 -0500)
Rename DT source for DE0 Nano SoC . The board name is really DE0-Nano-SoC
or Atlas SoC, and it is not to be confused with SoCkit board, which is a
different one. Rename the DT source file to match the board name and to
avoid this possible mixup with another different board.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts [new file with mode: 0644]
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts [deleted file]

index b5bd3de87c331ed9f7e85d43767c46c3831dfbcc..1036d396da83673eaed788039b16bd20be7e1a06 100644 (file)
@@ -892,7 +892,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria10_socdk_sdmmc.dtb \
        socfpga_cyclone5_mcvevk.dtb \
        socfpga_cyclone5_socdk.dtb \
-       socfpga_cyclone5_de0_sockit.dtb \
+       socfpga_cyclone5_de0_nano_soc.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
        socfpga_cyclone5_sodia.dtb \
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
new file mode 100644 (file)
index 0000000..b280e64
--- /dev/null
@@ -0,0 +1,112 @@
+/*
+ * Copyright Altera Corporation (C) 2015. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "socfpga_cyclone5.dtsi"
+
+/ {
+       model = "Terasic DE-0(Atlas)";
+       compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";
+
+       chosen {
+               bootargs = "earlyprintk";
+               stdout-path = "serial0:115200n8";
+       };
+
+       memory@0 {
+               name = "memory";
+               device_type = "memory";
+               reg = <0x0 0x40000000>; /* 1GB */
+       };
+
+       aliases {
+               ethernet0 = &gmac1;
+       };
+
+       regulator_3_3v: 3-3-v-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "3.3V";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               hps0 {
+                       label = "hps_led0";
+                       gpios = <&portb 24 0>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+
+       txd0-skew-ps = <0>; /* -420ps */
+       txd1-skew-ps = <0>; /* -420ps */
+       txd2-skew-ps = <0>; /* -420ps */
+       txd3-skew-ps = <0>; /* -420ps */
+       rxd0-skew-ps = <420>; /* 0ps */
+       rxd1-skew-ps = <420>; /* 0ps */
+       rxd2-skew-ps = <420>; /* 0ps */
+       rxd3-skew-ps = <420>; /* 0ps */
+       txen-skew-ps = <0>; /* -420ps */
+       txc-skew-ps = <1860>; /* 960ps */
+       rxdv-skew-ps = <420>; /* 0ps */
+       rxc-skew-ps = <1680>; /* 780ps */
+
+       max-frame-size = <3800>;
+};
+
+&gpio0 {
+       status = "okay";
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&i2c0 {
+       status = "okay";
+       clock-frequency = <100000>;
+
+       adxl345: adxl345@0 {
+               compatible = "adi,adxl345";
+               reg = <0x53>;
+
+               interrupt-parent = <&portc>;
+               interrupts = <3 2>;
+       };
+};
+
+&mmc0 {
+       vmmc-supply = <&regulator_3_3v>;
+       vqmmc-supply = <&regulator_3_3v>;
+       status = "okay";
+};
+
+&uart0 {
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
deleted file mode 100644 (file)
index b280e64..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Altera Corporation (C) 2015. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "socfpga_cyclone5.dtsi"
-
-/ {
-       model = "Terasic DE-0(Atlas)";
-       compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";
-
-       chosen {
-               bootargs = "earlyprintk";
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               name = "memory";
-               device_type = "memory";
-               reg = <0x0 0x40000000>; /* 1GB */
-       };
-
-       aliases {
-               ethernet0 = &gmac1;
-       };
-
-       regulator_3_3v: 3-3-v-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               hps0 {
-                       label = "hps_led0";
-                       gpios = <&portb 24 0>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-};
-
-&gmac1 {
-       status = "okay";
-       phy-mode = "rgmii";
-
-       txd0-skew-ps = <0>; /* -420ps */
-       txd1-skew-ps = <0>; /* -420ps */
-       txd2-skew-ps = <0>; /* -420ps */
-       txd3-skew-ps = <0>; /* -420ps */
-       rxd0-skew-ps = <420>; /* 0ps */
-       rxd1-skew-ps = <420>; /* 0ps */
-       rxd2-skew-ps = <420>; /* 0ps */
-       rxd3-skew-ps = <420>; /* 0ps */
-       txen-skew-ps = <0>; /* -420ps */
-       txc-skew-ps = <1860>; /* 960ps */
-       rxdv-skew-ps = <420>; /* 0ps */
-       rxc-skew-ps = <1680>; /* 780ps */
-
-       max-frame-size = <3800>;
-};
-
-&gpio0 {
-       status = "okay";
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
-&i2c0 {
-       status = "okay";
-       clock-frequency = <100000>;
-
-       adxl345: adxl345@0 {
-               compatible = "adi,adxl345";
-               reg = <0x53>;
-
-               interrupt-parent = <&portc>;
-               interrupts = <3 2>;
-       };
-};
-
-&mmc0 {
-       vmmc-supply = <&regulator_3_3v>;
-       vqmmc-supply = <&regulator_3_3v>;
-       status = "okay";
-};
-
-&uart0 {
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};