ipq40xx: merge DTS for Linksys WHW03 V1 and V2

No changes other than the merging itself are intended in this commit.

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15345
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
index c835a2216e5a9e218e87563dd8f443f2c7cba3eb..70c3b561c02619bb524118e252f1633600c44930 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
@@ -1,82 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-#include <dt-bindings/leds/common.h>
+#include "qcom-ipq4019-whw03.dtsi"
 
 / {
        model = "Linksys WHW03 (Velop)";
        compatible = "linksys,whw03", "qcom,ipq4019";
 
-       aliases {
-               led-boot = &led_blue;
-               led-failsafe = &led_red;
-               led-running = &led_blue;
-               led-upgrade = &led_red;
-       };
-
        // Default bootargs include rootfstype=ext4 and need to be overriden.
        chosen {
                bootargs-append = " rootfstype=squashfs";
        };
-
-       soc {
-               ess-tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-       };
-
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
 };
 
-
 &tlmm {
-       mdio_pins: mdio-pinmux {
-               mux-1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-
-               mux-2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
        sd_pins: sd-pinmux {
                pins = "gpio23", "gpio24", "gpio25", "gpio26",
                        "gpio27", "gpio28", "gpio29", "gpio30",
@@ -90,262 +26,46 @@
                bias-disable;
        };
 
-       serial_0_pins: serial0-pinmux {
-               pins = "gpio16", "gpio17";
-               function = "blsp_uart0";
-               bias-disable;
-       };
-
-       serial_1_pins: serial1-pinmux {
-               pins = "gpio8", "gpio9", "gpio10", "gpio11";
-               function = "blsp_uart1";
-               bias-disable;
-       };
-
        spi_0_pins: spi-0-pinmux {
                pins = "gpio12", "gpio13", "gpio14", "gpio15";
                function = "blsp_spi0";
                bias-disable;
        };
-
-       spi_1_pins: spi-1-pinmux {
-               mux-1 {
-                       pins = "gpio44", "gpio46", "gpio47";
-                       function = "blsp_spi1";
-                       bias-disable;
-               };
-
-               mux-2 {
-                       pins = "gpio45", "gpio49";
-                       function = "gpio";
-                       bias-pull-up;
-                       output-high;
-               };
-
-               host-interrupt {
-                       pins = "gpio42";
-                       function = "gpio";
-                       input;
-               };
-       };
-
-       wifi_0_pins: wifi0-pinmux {
-               pins = "gpio52";
-               function = "gpio";
-               drive-strength = <6>;
-               bias-pull-up;
-               output-high;
-       };
-
-       zigbee-0 {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               bias-disable;
-               output-low;
-       };
-
-       zigbee-1 {
-               gpio-hog;
-               gpios = <50 GPIO_ACTIVE_HIGH>;
-               bias-disable;
-               input;
-       };
-
-       bluetooth-enable {
-               gpio-hog;
-               gpios = <32 GPIO_ACTIVE_HIGH>;
-               output-high;
-       };
 };
 
 &mdio {
        status = "okay";
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";
-       reset-gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
-};
-
-&ethphy0 {
-       status = "disabled";
-};
-
-&ethphy1 {
-       status = "disabled";
-};
-
-&ethphy2 {
-       status = "disabled";
-};
-
-&watchdog {
-       status = "okay";
-};
-
-&prng {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       num-channels = <4>;
-       qcom,num-ees = <2>;
 
-       status = "okay";
-};
-
-&crypto {
-       status = "okay";
+       reset-gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
 };
 
 &vqmmc {
        status = "okay";
 };
 
-&blsp1_uart1 {
-       status = "okay";
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-};
-
-&blsp1_uart2 {
-       status = "okay";
-       pinctrl-0 = <&serial_1_pins>;
-       pinctrl-names = "default";
-
-       bluetooth {
-               compatible = "csr,8811";
-
-               enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-&blsp1_spi2 {
-       pinctrl-0 = <&spi_1_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-
-       zigbee@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               compatible = "silabs,em3581";
-               reg = <0>;
-               spi-max-frequency = <12000000>;
-       };
-};
-
-&blsp1_i2c3 {
-       pinctrl-0 = <&i2c_0_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-
-       // RGB LEDs
-       pca9633: led-controller@62 {
-               compatible = "nxp,pca9633";
-               nxp,hw-blink;
-               reg = <0x62>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               led_red: red@0 {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <0>;
-               };
-
-               led_green: green@1 {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <1>;
-               };
-
-               led_blue: blue@2 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <2>;
-               };
-       };
-};
-
 &sdhci {
-       vqmmc-supply = <&vqmmc>;
+       status = "okay";
        pinctrl-0 = <&sd_pins>;
        pinctrl-names = "default";
+
        cd-gpios = <&tlmm 22 GPIO_ACTIVE_LOW>;
        sd-ldo-gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
-       status = "okay";
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
-       clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00000000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&gmac {
-       status = "okay";
-};
-
-&switch {
-       status = "okay";
-};
-
-&swport4 {
-       status = "okay";
-       label = "lan";
-};
 
-&swport5 {
-       status = "okay";
-       label = "wan";
+       vqmmc-supply = <&vqmmc>;
 };
 
 &wifi0 {
-       pinctrl-0 = <&wifi_0_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-
-       qcom,coexist-support = <1>;
-       qcom,coexist-gpio-pin = <52>;
-
        qcom,ath10k-calibration-variant = "linksys-whw03";
 };
 
 &wifi1 {
-       status = "okay";
-
-       ieee80211-freq-limit = <5170000 5330000>;
        qcom,ath10k-calibration-variant = "linksys-whw03";
 };
 
 &wifi2 {
-       status = "okay";
+       reg = <0x00000000 0 0 0 0>;
 
-       ieee80211-freq-limit = <5490000 5835000>;
        qcom,ath10k-calibration-variant = "linksys-whw03";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
new file mode 100644 (file)
index 0000000..ce8d666
--- /dev/null
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
@@ -0,0 +1,293 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+       aliases {
+               led-boot = &led_blue;
+               led-failsafe = &led_red;
+               led-running = &led_blue;
+               led-upgrade = &led_red;
+       };
+
+       soc {
+               ess-tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "reset";
+                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+               };
+       };
+};
+
+&tlmm {
+       mdio_pins: mdio-pinmux {
+               mux-1 {
+                       pins = "gpio6";
+                       function = "mdio";
+                       bias-pull-up;
+               };
+
+               mux-2 {
+                       pins = "gpio7";
+                       function = "mdc";
+                       bias-pull-up;
+               };
+       };
+
+       serial_0_pins: serial0-pinmux {
+               pins = "gpio16", "gpio17";
+               function = "blsp_uart0";
+               bias-disable;
+       };
+
+       serial_1_pins: serial1-pinmux {
+               pins = "gpio8", "gpio9", "gpio10", "gpio11";
+               function = "blsp_uart1";
+               bias-disable;
+       };
+
+       spi_1_pins: spi-1-pinmux {
+               mux-1 {
+                       pins = "gpio44", "gpio46", "gpio47";
+                       function = "blsp_spi1";
+                       bias-disable;
+               };
+
+               mux-2 {
+                       pins = "gpio45", "gpio49";
+                       function = "gpio";
+                       bias-pull-up;
+                       output-high;
+               };
+
+               host-interrupt {
+                       pins = "gpio42";
+                       function = "gpio";
+                       input;
+               };
+       };
+
+       wifi_0_pins: wifi0-pinmux {
+               pins = "gpio52";
+               function = "gpio";
+               drive-strength = <6>;
+               bias-pull-up;
+               output-high;
+       };
+
+       zigbee-0 {
+               gpio-hog;
+               gpios = <29 GPIO_ACTIVE_HIGH>;
+               bias-disable;
+               output-low;
+       };
+
+       zigbee-1 {
+               gpio-hog;
+               gpios = <50 GPIO_ACTIVE_HIGH>;
+               bias-disable;
+               input;
+       };
+
+       bluetooth-enable {
+               gpio-hog;
+               gpios = <32 GPIO_ACTIVE_HIGH>;
+               output-high;
+       };
+};
+
+&ethphy0 {
+       status = "disabled";
+};
+
+&ethphy1 {
+       status = "disabled";
+};
+
+&ethphy2 {
+       status = "disabled";
+};
+
+&watchdog {
+       status = "okay";
+};
+
+&prng {
+       status = "okay";
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&cryptobam {
+       status = "okay";
+       num-channels = <4>;
+       qcom,num-ees = <2>;
+};
+
+&crypto {
+       status = "okay";
+};
+
+&blsp1_uart1 {
+       status = "okay";
+       pinctrl-0 = <&serial_0_pins>;
+       pinctrl-names = "default";
+};
+
+&blsp1_uart2 {
+       status = "okay";
+       pinctrl-0 = <&serial_1_pins>;
+       pinctrl-names = "default";
+
+       bluetooth {
+               compatible = "csr,8811";
+
+               enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+&blsp1_spi2 {
+       status = "okay";
+       pinctrl-0 = <&spi_1_pins>;
+       pinctrl-names = "default";
+
+       cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
+
+       zigbee@0 {
+               compatible = "silabs,em3581";
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               spi-max-frequency = <12000000>;
+       };
+};
+
+&blsp1_i2c3 {
+       status = "okay";
+       pinctrl-0 = <&i2c_0_pins>;
+       pinctrl-names = "default";
+
+       // RGB LEDs
+       pca9633: led-controller@62 {
+               compatible = "nxp,pca9633";
+               nxp,hw-blink;
+               reg = <0x62>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               led_red: red@0 {
+                       color = <LED_COLOR_ID_RED>;
+                       function = LED_FUNCTION_INDICATOR;
+                       reg = <0>;
+               };
+
+               led_green: green@1 {
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_INDICATOR;
+                       reg = <1>;
+               };
+
+               led_blue: blue@2 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_INDICATOR;
+                       reg = <2>;
+               };
+       };
+};
+
+&pcie0 {
+       status = "okay";
+
+       perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+       wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
+       clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>;
+
+       bridge@0,0 {
+               reg = <0x00000000 0 0 0 0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               ranges;
+
+               wifi2: wifi@1,0 {
+                       compatible = "qcom,ath10k";
+               };
+       };
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport4 {
+       status = "okay";
+       label = "lan";
+};
+
+&swport5 {
+       status = "okay";
+       label = "wan";
+};
+
+&wifi0 {
+       status = "okay";
+       pinctrl-0 = <&wifi_0_pins>;
+       pinctrl-names = "default";
+
+       qcom,coexist-support = <1>;
+       qcom,coexist-gpio-pin = <52>;
+};
+
+&wifi1 {
+       status = "okay";
+
+       ieee80211-freq-limit = <5170000 5330000>;
+};
+
+&wifi2 {
+       status = "okay";
+
+       ieee80211-freq-limit = <5490000 5835000>;
+};

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
index ccee293e9688587fe74595728eac5cb2e3cda8f4..d6aaf93b2974629d455abd320c6d7edb3dcf26af 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
@@ -1,101 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-#include <dt-bindings/leds/common.h>
+#include "qcom-ipq4019-whw03.dtsi"
 
 / {
        model = "Linksys WHW03 V2 (Velop)";
        compatible = "linksys,whw03v2", "qcom,ipq4019";
 
-       aliases {
-               led-boot = &led_blue;
-               led-failsafe = &led_red;
-               led-running = &led_blue;
-               led-upgrade = &led_red;
-       };
-
        // Default bootargs include rootfstype=ext4 and need to be overriden.
        chosen {
                bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
                stdout-path = &blsp1_uart1;
        };
-
-       soc {
-               ess-tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-       };
-
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
 };
 
-
 &tlmm {
-       mdio_pins: mdio-pinmux {
-               mux-1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-
-               mux-2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
        i2c_0_pins: i2c-0-pinmux {
                pins = "gpio20", "gpio21";
                function = "blsp_i2c0";
                bias-disable;
        };
 
-       serial_0_pins: serial0-pinmux {
-               pins = "gpio16", "gpio17";
-               function = "blsp_uart0";
-               bias-disable;
-       };
-
-       serial_1_pins: serial1-pinmux {
-               pins = "gpio8", "gpio9", "gpio10", "gpio11";
-               function = "blsp_uart1";
-               bias-disable;
-       };
-
        spi_0_pins: spi-0-pinmux {
                mux {
                        pins = "gpio13", "gpio14", "gpio15";
@@ -111,74 +35,23 @@
                        output-high;
                };
        };
+};
 
-       spi_1_pins: spi-1-pinmux {
-               mux-1 {
-                       pins = "gpio44", "gpio46", "gpio47";
-                       function = "blsp_spi1";
-                       bias-disable;
-               };
-
-               mux-2 {
-                       pins = "gpio31", "gpio45", "gpio49";
-                       function = "gpio";
-                       bias-pull-up;
-                       output-high;
-               };
-
-               host-interrupt {
-                       pins = "gpio42";
-                       function = "gpio";
-                       input;
-               };
-       };
-
-       wifi_0_pins: wifi0-pinmux {
-               pins = "gpio52";
+&spi_1_pins {
+       mux-wake {
+               pins = "gpio31";
                function = "gpio";
-               drive-strength = <6>;
                bias-pull-up;
                output-high;
        };
-
-       zigbee-0 {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               bias-disable;
-               output-low;
-       };
-
-       zigbee-1 {
-               gpio-hog;
-               gpios = <50 GPIO_ACTIVE_HIGH>;
-               bias-disable;
-               input;
-       };
-
-       bluetooth-enable {
-               gpio-hog;
-               gpios = <32 GPIO_ACTIVE_HIGH>;
-               output-high;
-       };
 };
 
 &mdio {
        status = "okay";
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";
-       phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
-};
 
-&ethphy0 {
-       status = "disabled";
-};
-
-&ethphy1 {
-       status = "disabled";
-};
-
-&ethphy2 {
-       status = "disabled";
+       phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
 };
 
 &ethphy3 {
@@ -193,98 +66,6 @@
        reg = <0x1d>;
 };
 
-&watchdog {
-       status = "okay";
-};
-
-&prng {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       num-channels = <4>;
-       qcom,num-ees = <2>;
-
-       status = "okay";
-};
-
-&crypto {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       status = "okay";
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-};
-
-&blsp1_uart2 {
-       status = "okay";
-       pinctrl-0 = <&serial_1_pins>;
-       pinctrl-names = "default";
-
-       bluetooth {
-               compatible = "csr,8811";
-
-               enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-&blsp1_spi2 {
-       pinctrl-0 = <&spi_1_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-
-       zigbee@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               compatible = "silabs,em3581";
-               reg = <0>;
-               spi-max-frequency = <12000000>;
-       };
-};
-
-&blsp1_i2c3 {
-       pinctrl-0 = <&i2c_0_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-
-       // RGB LEDs
-       pca9633: led-controller@62 {
-               compatible = "nxp,pca9633";
-               nxp,hw-blink;
-               reg = <0x62>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               led_red: red@0 {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <0>;
-               };
-
-               led_green: green@1 {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <1>;
-               };
-
-               led_blue: blue@2 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_INDICATOR;
-                       reg = <2>;
-               };
-       };
-};
-
 &usb3_ss_phy {
        status = "okay";
 };
@@ -421,63 +202,17 @@
        };
 };
 
-&pcie0 {
-       status = "okay";
-
-       perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
-       clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&gmac {
-       status = "okay";
-};
-
-&switch {
-       status = "okay";
-};
-
 &swport4 {
-       status = "okay";
-       label = "lan";
-
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_gmac1>;
 };
 
 &swport5 {
-       status = "okay";
-       label = "wan";
-
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &wifi0 {
-       pinctrl-0 = <&wifi_0_pins>;
-       pinctrl-names = "default";
-
-       status = "okay";
-
-       qcom,coexist-support = <1>;
-       qcom,coexist-gpio-pin = <52>;
-
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";
@@ -485,9 +220,6 @@
 };
 
 &wifi1 {
-       status = "okay";
-
-       ieee80211-freq-limit = <5170000 5330000>;
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";
@@ -495,9 +227,8 @@
 };
 
 &wifi2 {
-       status = "okay";
+       reg = <0x00010000 0 0 0 0>;
 
-       ieee80211-freq-limit = <5490000 5835000>;
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";