ath79: mikrotik: extract common bits for RB951x-2HnD devices

Mikrotik RouterBOARD 951Ui-2HnD and Mikrotik RouterBOARD RB951G-2HnD are
very similar devices.  Extract the DTS bits that are identical for these
two boards to a separate DTSI file.

Signed-off-by: Michał Kępień <openwrt@kempniu.pl>
(cherry picked from commit c6ef4170945c6ab5432382110389f31fea92a76c)

diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
index 3d59a30f1128fa056f4bb946291e78b26598baaa..65003cb9a1fa026df6711fe27ea565750b3d45da 100644 (file)
--- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "ar9344_mikrotik_routerboard.dtsi"
+#include "ar9344_mikrotik_routerboard-951x-2hnd.dtsi"
 
 / {
        compatible = "mikrotik,routerboard-951ui-2hnd", "qca,ar9344";
@@ -59,77 +59,6 @@
        };
 };
 
-&gpio {
-       nand_power {
-               gpio-hog;
-               gpios = <14 GPIO_ACTIVE_LOW>;
-               output-high;
-       };
-};
-
-&nand {
-       status = "okay";
-
-       nand-ecc-mode = "soft";
-       qca,nand-swap-dma;
-
-       partitions {
-               compatible = "fixed-partitions";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               partition@0 {
-                       label = "booter";
-                       reg = <0x0000000 0x0040000>;
-                       read-only;
-               };
-
-               partition@40000 {
-                       label = "kernel";
-                       reg = <0x0040000 0x03c0000>;
-               };
-
-               partition@400000 {
-                       label = "ubi";
-                       reg = <0x0400000 0x7c00000>;
-               };
-       };
-};
-
-&spi {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "mikrotik,routerboot-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "routerboot";
-                               reg = <0x0 0x0>;
-                               read-only;
-                       };
-
-                       hard_config: hard_config {
-                               read-only;
-                       };
-
-                       bios {
-                               size = <0x1000>;
-                               read-only;
-                       };
-
-                       soft_config {
-                       };
-               };
-       };
-};
-
 &eth0 {
        phy-handle = <&swphy4>;
 
@@ -143,11 +72,3 @@
 &wmac {
        qca,led-pin = /bits/ 8 <11>;
 };
-
-&usb {
-       status = "okay";
-};
-
-&usb_phy {
-       status = "okay";
-};

diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951x-2hnd.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951x-2hnd.dtsi
new file mode 100644 (file)
index 0000000..5d135f1
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951x-2hnd.dtsi
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar9344_mikrotik_routerboard.dtsi"
+
+&gpio {
+       nand_power {
+               gpio-hog;
+               gpios = <14 GPIO_ACTIVE_LOW>;
+               output-high;
+       };
+};
+
+&nand {
+       status = "okay";
+
+       nand-ecc-mode = "soft";
+       qca,nand-swap-dma;
+
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partition@0 {
+                       label = "booter";
+                       reg = <0x0000000 0x0040000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "kernel";
+                       reg = <0x0040000 0x03c0000>;
+               };
+
+               partition@400000 {
+                       label = "ubi";
+                       reg = <0x0400000 0x7c00000>;
+               };
+       };
+};
+
+&spi {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "mikrotik,routerboot-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "routerboot";
+                               reg = <0x0 0x0>;
+                               read-only;
+                       };
+
+                       hard_config: hard_config {
+                               read-only;
+                       };
+
+                       bios {
+                               size = <0x1000>;
+                               read-only;
+                       };
+
+                       soft_config {
+                       };
+               };
+       };
+};
+
+&usb {
+       status = "okay";
+};
+
+&usb_phy {
+       status = "okay";
+};