ramips: merge dtsi included file for Belkin F9K1109

Only one device uses the dtsi file "rt3883_belkin_f9k110x.dtsi".
So there is no need to split the device tree.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/16318
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
index 38667a5fdacba71ac6ae24e24f23c71d5826efa0..5547ec0f483122c744ebbebd6cbc8b101d81c27b 100644 (file)
--- a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
+++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include <dt-bindings/leds/common.h>
+#include "rt3883.dtsi"
 
-#include "rt3883_belkin_f9k110x.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "belkin,f9k1109v1", "ralink,rt3883-soc";
@@ -71,18 +73,125 @@
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
+
+       rtl8367b {
+               compatible = "realtek,rtl8367b";
+               gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+               gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+               realtek,extif = <5 1 0 1 1 1 1 1 1 2>;
+       };
 };
 
 &ehci {
+       status = "okay";
+
        ehci_port2: port@2 {
                reg = <2>;
                #trigger-source-cells = <0>;
        };
 };
 
+&ethernet {
+       port@0 {
+               mediatek,fixed-link = <1000 1 1 1>;
+               phy-mode = "rgmii";
+       };
+};
+
 &ohci {
+       status = "okay";
+
        ohci_port2: port@2 {
                reg = <2>;
                #trigger-source-cells = <0>;
        };
 };
+
+&pci {
+       status = "okay";
+};
+
+&pci1 {
+       status = "okay";
+
+       wifi@0,0 {
+               compatible = "pci1814,3091";
+               reg = <0x10000 0 0 0 0>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
+               ralink,5ghz = <0>;
+       };
+};
+
+&spi0 {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "uboot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+                               };
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x7a0000>;
+                       };
+
+                       partition@7f0000 {
+                               label = "user-cfg";
+                               reg = <0x7f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&state_default {
+       gpio {
+               groups = "i2c", "jtag", "uartf";
+               function = "gpio";
+       };
+};
+
+&wmac {
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
+       ralink,2ghz = <0>;
+};

diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
deleted file mode 100644 (file)
index a0a9f63..0000000
--- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "rt3883.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       compatible = "ralink,rt3883-soc";
-
-       rtl8367b {
-               compatible = "realtek,rtl8367b";
-               gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>;
-               gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
-               realtek,extif = <5 1 0 1 1 1 1 1 1 2>;
-       };
-};
-
-&spi0 {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "uboot";
-                               reg = <0x0 0x30000>;
-                               read-only;
-                       };
-
-                       partition@30000 {
-                               label = "uboot-env";
-                               reg = <0x30000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "factory";
-                               reg = <0x40000 0x10000>;
-                               read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       eeprom_factory_0: eeprom@0 {
-                                               reg = <0x0 0x200>;
-                                       };
-
-                                       eeprom_factory_8000: eeprom@8000 {
-                                               reg = <0x8000 0x200>;
-                                       };
-                               };
-                       };
-
-                       partition@50000 {
-                               compatible = "denx,uimage";
-                               label = "firmware";
-                               reg = <0x50000 0x7a0000>;
-                       };
-
-                       partition@7f0000 {
-                               label = "user-cfg";
-                               reg = <0x7f0000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&ethernet {
-       port@0 {
-               mediatek,fixed-link = <1000 1 1 1>;
-               phy-mode = "rgmii";
-       };
-};
-
-&state_default {
-       gpio {
-               groups = "i2c", "jtag", "uartf";
-               function = "gpio";
-       };
-};
-
-&wmac {
-       nvmem-cells = <&eeprom_factory_0>;
-       nvmem-cell-names = "eeprom";
-       ralink,2ghz = <0>;
-};
-
-&pci {
-       status = "okay";
-};
-
-&pci1 {
-       status = "okay";
-
-       wifi@0,0 {
-               compatible = "pci1814,3091";
-               reg = <0x10000 0 0 0 0>;
-               ralink,5ghz = <0>;
-               nvmem-cells = <&eeprom_factory_8000>;
-               nvmem-cell-names = "eeprom";
-       };
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};