ath79: refactor ZTE MF28x dts files
authorAndreas Böhler <dev@aboehler.at>
Mon, 10 Apr 2023 21:31:34 +0000 (23:31 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 6 May 2023 18:59:46 +0000 (20:59 +0200)
Move common dts entries of ZTE MF281 and ZTE MF286 to a common .dtsi file
to reduce redundancies.

Signed-off-by: Andreas Böhler <dev@aboehler.at>
target/linux/ath79/dts/qca9563_zte_mf281.dts
target/linux/ath79/dts/qca9563_zte_mf286.dtsi
target/linux/ath79/dts/qca9563_zte_mf28x.dtsi [new file with mode: 0644]

index 2f4b7316bf919ee125f324839f0dfe93de6f8e44..9205061e2432bf2205ef1e1803648bba4519487c 100644 (file)
 // Copyright (c) 2021, 2022 Lech Perczak
 // Copyright (c) 2022 David Bauer <mail@david-bauer.net>
 
-#include "qca956x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "qca9563_zte_mf28x.dtsi"
 
 / {
        model = "ZTE MF281";
        compatible = "zte,mf281", "qca,qca9563";
 
-       aliases {
-               led-boot = &led_debug;
-               led-failsafe = &led_debug;
-               led-running = &led_debug;
-               led-upgrade = &led_debug;
-               label-mac-device = &eth0;
-       };
-
        leds {
-               compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&enable_wlan_led_gpio>;
-
-               /* Hidden SMD LED below signal strength LEDs.
-                * Visible through slits underside of the case.
-                */
-               led_debug: debug {
-                       label = "green:debug";
-                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
        };
+};
 
-       keys {
-               compatible = "gpio-keys";
+&led_debug {
+       label = "green:debug";
+       color = <LED_COLOR_ID_GREEN>;
+};
 
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
+&boot_flash {
+       partitions {
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0xa0000>;
+                       read-only;
                };
 
-               wps {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
+               partition@80000 {
+                       label = "u-boot-env";
+                       reg = <0xa0000 0x20000>;
+                       read-only;
                };
        };
-
-       /* This GPIO is used to reset whole board _including_ the modem */
-       gpio-restart {
-               compatible = "gpio-restart";
-               gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-               active-delay = <3000>;
-               inactive-delay = <1000>;
-       };
 };
 
-&spi {
-       status = "okay";
+&system_flash {
+       partitions {
+               partition@0 {
+                       label = "fota-flag";
+                       reg = <0x000000 0xa0000>;
+                       read-only;
+               };
 
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
+               partition@a0000 {
+                       label = "art";
+                       reg = <0xa0000 0x80000>;
+                       read-only;
 
-               partitions {
-                       compatible = "fixed-partitions";
+                       compatible = "nvmem-cells";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0xa0000>;
-                               read-only;
+                       cal_caldata_1000: cal@1000 {
+                               reg = <0x1000 0x440>;
                        };
 
-                       partition@80000 {
-                               label = "u-boot-env";
-                               reg = <0xa0000 0x20000>;
-                               read-only;
+                       cal_caldata_5000: cal@5000 {
+                               reg = <0x5000 0x2f20>;
                        };
                };
-       };
 
-       flash@1 {
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <25000000>;
+               partition@120000 {
+                       label = "mac";
+                       reg = <0x120000 0x80000>;
+                       read-only;
 
-               partitions {
-                       compatible = "fixed-partitions";
+                       compatible = "nvmem-cells";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       partition@0 {
-                               label = "fota-flag";
-                               reg = <0x000000 0xa0000>;
-                               read-only;
-                       };
-
-                       partition@a0000 {
-                               label = "art";
-                               reg = <0xa0000 0x80000>;
-                               read-only;
-
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_caldata_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               cal_caldata_5000: cal@5000 {
-                                       reg = <0x5000 0x2f20>;
-                               };
-                       };
-
-                       partition@120000 {
-                               label = "mac";
-                               reg = <0x120000 0x80000>;
-                               read-only;
-
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_mac_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-                       };
-
-                       partition@1a0000 {
-                               label = "reserved2";
-                               reg = <0x1a0000 0xc0000>;
-                               read-only;
-                       };
-
-                       partition@260000 {
-                               label = "cfg-param";
-                               reg = <0x260000 0x400000>;
-                               read-only;
+                       macaddr_mac_0: macaddr@0 {
+                               reg = <0x0 0x6>;
                        };
+               };
 
-                       partition@660000 {
-                               label = "log";
-                               reg = <0x660000 0x400000>;
-                               read-only;
-                       };
+               partition@1a0000 {
+                       label = "reserved2";
+                       reg = <0x1a0000 0xc0000>;
+                       read-only;
+               };
 
-                       partition@a60000 {
-                               label = "oops";
-                               reg = <0xa60000 0xa0000>;
-                               read-only;
-                       };
+               partition@260000 {
+                       label = "cfg-param";
+                       reg = <0x260000 0x400000>;
+                       read-only;
+               };
 
-                       partition@b00000 {
-                               label = "reserved3";
-                               reg = <0xb00000 0x500000>;
-                               read-only;
-                       };
+               partition@660000 {
+                       label = "log";
+                       reg = <0x660000 0x400000>;
+                       read-only;
+               };
 
-                       partition@1000000 {
-                               label = "web";
-                               reg = <0x1000000 0x800000>;
-                               read-only;
-                       };
+               partition@a60000 {
+                       label = "oops";
+                       reg = <0xa60000 0xa0000>;
+                       read-only;
+               };
 
-                       partition@1800000 {
-                               label = "firmware";
-                               reg = <0x1800000 0x1d00000>;
+               partition@b00000 {
+                       label = "reserved3";
+                       reg = <0xb00000 0x500000>;
+                       read-only;
+               };
 
-                               compatible = "fixed-partitions";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+               partition@1000000 {
+                       label = "web";
+                       reg = <0x1000000 0x800000>;
+                       read-only;
+               };
 
-                               partition@0 {
-                                       label = "kernel";
-                                       reg = <0x0 0x600000>;
-                               };
+               partition@1800000 {
+                       label = "firmware";
+                       reg = <0x1800000 0x1d00000>;
 
-                               partition@600000 {
-                                       label = "ubi";
-                                       reg = <0x600000 0x1700000>;
-                               };
-                       };
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-                       partition@3500000 {
-                               label = "data";
-                               reg = <0x3500000 0x1900000>;
-                               read-only;
+                       partition@0 {
+                               label = "kernel";
+                               reg = <0x0 0x600000>;
                        };
 
-                       partition@4e00000 {
-                               label = "fota";
-                               reg = <0x4e00000 0x3200000>;
-                               read-only;
+                       partition@600000 {
+                               label = "ubi";
+                               reg = <0x600000 0x1700000>;
                        };
                };
-       };
-};
 
-&mdio0 {
-       status = "okay";
-
-       phy0: ethernet-phy@0 {
-               reg = <0>;
-               phy-mode = "sgmii";
+               partition@3500000 {
+                       label = "data";
+                       reg = <0x3500000 0x1900000>;
+                       read-only;
+               };
 
-               qca,ar8327-initvals = <
-                       0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x7c 0x0000007e /* PORT0_STATUS */
-               >;
+               partition@4e00000 {
+                       label = "fota";
+                       reg = <0x4e00000 0x3200000>;
+                       read-only;
+               };
        };
 };
 
 &eth0 {
-       status = "okay";
-
-       phy-mode = "sgmii";
-       phy-handle = <&phy0>;
-
        nvmem-cells = <&macaddr_mac_0>;
        nvmem-cell-names = "mac-address";
 };
 
-&pcie {
-       status = "okay";
-
-       wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0 0 0 0 0>;
-
-               nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
-               nvmem-cell-names = "mac-address", "pre-calibration";
-               mac-address-increment = <1>;
-       };
+&wifi_ath10k {
+       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
+       nvmem-cell-names = "mac-address", "pre-calibration";
+       mac-address-increment = <1>;
 };
 
 &pinmux {
 };
 
 &wmac {
-       status = "okay";
-
        nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&usb_phy0 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-};
-
-&usb_phy1 {
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};
index f794195c3f0f918bfad3a92b57687023a9dfebfe..df9a9d3f6989f9585c9b73af8a1c36111a3f7dc8 100644 (file)
@@ -1,36 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 // Copyright (c) 2021 Cezary Jackiewicz
 // Copyright (c) 2021, 2022 Lech Perczak
-#include "qca956x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "qca9563_zte_mf28x.dtsi"
 
 / {
-       aliases {
-               led-boot = &led_debug;
-               led-failsafe = &led_debug;
-               led-running = &led_debug;
-               led-upgrade = &led_debug;
-               label-mac-device = &eth0;
-       };
-
        leds {
-               compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&enable_wlan_led_gpio>;
 
-               /* Hidden SMD LED below signal strength LEDs.
-                * Visible through slits underside of the case,
-                * and slightly through the case below signal state LEDs
-                */
-               led_debug: led-0 {
-                       function = LED_FUNCTION_DEBUG;
-                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
-
                led-1 {
                        function = LED_FUNCTION_WLAN;
                        color = <LED_COLOR_ID_BLUE>;
        };
 
        keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
                wifi {
                        label = "wifi";
                        linux,code = <KEY_RFKILL>;
                        debounce-interval = <60>;
                };
        };
-
-       /* This GPIO is used to reset whole board _including_ the modem */
-       gpio-restart {
-               compatible = "gpio-restart";
-               gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-               active-delay = <3000>;
-               inactive-delay = <1000>;
-       };
-};
-
-&spi {
-       status = "okay";
-
-       boot_flash: flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-               };
-       };
-
-       system_flash: flash@1 {
-               compatible = "spi-nand";
-               reg = <1>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy0: ethernet-phy@0 {
-               reg = <0>;
-               phy-mode = "sgmii";
-
-               qca,ar8327-initvals = <
-                       0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x7c 0x0000007e /* PORT0_STATUS */
-               >;
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       phy-mode = "sgmii";
-       phy-handle = <&phy0>;
-};
-
-&pcie {
-       status = "okay";
-
-       wifi_ath10k: wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0 0 0 0 0>;
-       };
 };
 
 &pinmux {
                pinctrl-single,bits = <0x10 0x0 0xff000000>;
        };
 };
-
-&wmac {
-       status = "okay";
-};
-
-&usb_phy0 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-};
-
-&usb_phy1 {
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};
diff --git a/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi b/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi
new file mode 100644 (file)
index 0000000..1edcd7e
--- /dev/null
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+// Copyright (c) 2021 Cezary Jackiewicz
+// Copyright (c) 2021, 2022 Lech Perczak
+#include "qca956x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+       aliases {
+               led-boot = &led_debug;
+               led-failsafe = &led_debug;
+               led-running = &led_debug;
+               led-upgrade = &led_debug;
+               label-mac-device = &eth0;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               /* Hidden SMD LED below signal strength LEDs.
+                * Visible through slits underside of the case,
+                * and slightly through the case below signal state LEDs
+                */
+               led_debug: led-0 {
+                       function = LED_FUNCTION_DEBUG;
+                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               wps {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       /* This GPIO is used to reset whole board _including_ the modem */
+       gpio-restart {
+               compatible = "gpio-restart";
+               gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+               active-delay = <3000>;
+               inactive-delay = <1000>;
+       };
+};
+
+&spi {
+       status = "okay";
+
+       boot_flash: flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
+       };
+
+       system_flash: flash@1 {
+               compatible = "spi-nand";
+               reg = <1>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               phy-mode = "sgmii";
+
+               qca,ar8327-initvals = <
+                       0x04 0x00080080 /* PORT0 PAD MODE CTRL */
+                       0x7c 0x0000007e /* PORT0_STATUS */
+               >;
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       phy-mode = "sgmii";
+       phy-handle = <&phy0>;
+};
+
+&pcie {
+       status = "okay";
+
+       wifi_ath10k: wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x0 0 0 0 0>;
+       };
+};
+
+&wmac {
+       status = "okay";
+};
+
+&usb_phy0 {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
+&usb_phy1 {
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};