ipq806x: remove support for kernel 4.19

The target uses 5.4 as default kernel since 04/2020.

Kernel 4.19 support is not really maintained anymore, and there has
been a lot of changes between 4.19 and 5.4 on this target. Despite,
new devices are typically added for 5.4 only anyway.

Thus, make maintaining of old stuff and reviewing of new stuff
easier by removing support for kernel 4.19.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

17 files changed, 0 insertions, 7218 deletions

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
deleted file mode 100644
index 02f60c90ee..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ /dev/null
@@ -1,229 +0,0 @@
-#include "qcom-ipq8064-v1.0.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. IPQ8064/AP-148";
-	compatible = "qcom,ipq8064-ap148", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-	};
-};
-
-&qcom_pinmux {
-	i2c4_pins: i2c4_pinmux {
-		pins = "gpio12", "gpio13";
-		function = "gsbi4";
-		bias-disable;
-	};
-
-	nand_pins: nand_pins {
-		disable {
-			pins = "gpio34", "gpio35", "gpio36",
-			       "gpio37", "gpio38";
-			function = "nand";
-			drive-strength = <10>;
-			bias-disable;
-		};
-
-		pullups {
-			pins = "gpio39";
-			function = "nand";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-
-		hold {
-			pins = "gpio40", "gpio41", "gpio42",
-			       "gpio43", "gpio44", "gpio45",
-			       "gpio46", "gpio47";
-			function = "nand";
-			drive-strength = <10>;
-			bias-bus-hold;
-		};
-	};
-
-	mdio0_pins: mdio0_pins {
-		mux {
-			pins = "gpio0", "gpio1";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	rgmii2_pins: rgmii2_pins {
-		mux {
-			pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-			       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-			function = "rgmii2";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
-
-&gsbi4 {
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-	status = "okay";
-
-	serial@16340000 {
-		status = "okay";
-	};
-
-	/*
-	* The i2c device on gsbi4 should not be enabled.
-	* On ipq806x designs gsbi4 i2c is meant for exclusive
-	* RPM usage. Turning this on in kernel manifests as
-	* i2c failure for the RPM.
-	*/
-};
-
-&gsbi5 {
-	qcom,mode = <GSBI_PROT_SPI>;
-	status = "okay";
-
-	spi4: spi@1a280000 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 0>;
-
-		flash: m25p80@0 {
-			compatible = "s25fl256s1";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-
-			partitions {
-				compatible = "qcom,smem";
-			};
-		};
-	};
-};
-
-&usb3_0 {
-	status = "okay";
-};
-
-&usb3_1 {
-	status = "okay";
-};
-
-&pcie0 {
-	status = "okay";
-};
-
-&pcie1 {
-	status = "okay";
-	force_gen1 = <1>;
-};
-
-&nand {
-	status = "okay";
-
-	pinctrl-0 = <&nand_pins>;
-	pinctrl-names = "default";
-
-	cs0 {
-		reg = <0>;
-		compatible = "qcom,nandcs";
-
-		nand-ecc-strength = <4>;
-		nand-bus-width = <8>;
-		nand-ecc-step-size = <512>;
-
-		partitions {
-			compatible = "qcom,smem";
-		};
-	};
-};
-
-&gmac1 {
-	status = "okay";
-	phy-mode = "rgmii";
-	qcom,id = <1>;
-
-	pinctrl-0 = <&rgmii2_pins>;
-	pinctrl-names = "default";
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gmac2 {
-	status = "okay";
-	phy-mode = "sgmii";
-	qcom,id = <2>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&sata_phy {
-	status = "okay";
-};
-
-&sata {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
deleted file mode 100644
index de347643dc..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "qcom-ipq8064-v1.0.dtsi"
-
-/ {
-	model = "Qualcomm IPQ8064/AP161";
-	compatible = "qcom,ipq8064-ap161", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			i2c4_pins: i2c4_pinmux {
-				pins = "gpio12", "gpio13";
-				function = "gsbi4";
-				bias-disable;
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-			};
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio2", "gpio27", "gpio28",
-						"gpio29", "gpio30", "gpio31",
-						"gpio32", "gpio51", "gpio52",
-						"gpio59", "gpio60", "gpio61",
-						"gpio62" , "gpio66";
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-
-			/*
-			* The i2c device on gsbi4 should not be enabled.
-			* On ipq806x designs gsbi4 i2c is meant for exclusive
-			* RPM usage. Turning this on in kernel manifests as
-			* i2c failure for the RPM.
-			*/
-		};
-
-		gsbi5: gsbi@1a200000 {
-			qcom,mode = <GSBI_PROT_SPI>;
-			status = "okay";
-
-			spi4: spi@1a280000 {
-				status = "okay";
-				spi-max-frequency = <50000000>;
-
-				pinctrl-0 = <&spi_pins>;
-				pinctrl-names = "default";
-
-				cs-gpios = <&qcom_pinmux 20 0>;
-
-				flash: m25p80@0 {
-					compatible = "s25fl256s1";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					spi-max-frequency = <50000000>;
-					reg = <0>;
-
-					partitions {
-						compatible = "qcom,smem";
-					};
-				};
-			};
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			force_gen1 = <1>;
-		};
-
-		pcie2: pci@1b900000 {
-			status = "okay";
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "qcom,smem";
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x20080     /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-				qca,phy-rgmii-en;
-				qca,txclk-delay-en;
-				qca,rxclk-delay-en;
-			};
-
-			phy3: ethernet-phy@3 {
-				device_type = "ethernet-phy";
-				reg = <3>;
-			};
-		};
-
-		gmac0: ethernet@37000000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <0>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-			mdiobus = <&mdio0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-			mdiobus = <&mdio0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-			mdiobus = <&mdio0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
deleted file mode 100644
index 027500f038..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ /dev/null
@@ -1,479 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "TP-Link Archer C2600";
-	compatible = "tplink,c2600", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power;
-		led-failsafe = &general;
-		led-running = &power;
-		led-upgrade = &general;
-		label-mac-device = &gmac2;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio16", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33",
-					       "gpio53", "gpio66";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					bias-pull-down;
-				};
-
-				data {
-					pins = "gpio18", "gpio19";
-					drive-strength = <10>;
-				};
-
-				cs {
-					pins = "gpio20";
-					function = "gpio";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				clk {
-					pins = "gpio21";
-					drive-strength = <12>;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			usb0_pwr_en_pin: usb0_pwr_en_pin {
-				mux {
-					pins = "gpio25";
-					function = "gpio";
-					drive-strength = <10>;
-					bias-pull-up;
-					output-high;
-				};
-			};
-
-			usb1_pwr_en_pin: usb1_pwr_en_pin {
-				mux {
-					pins = "gpio23";
-					function = "gpio";
-					drive-strength = <10>;
-					bias-pull-up;
-					output-high;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		gsbi5: gsbi@1a200000 {
-			qcom,mode = <GSBI_PROT_SPI>;
-			status = "okay";
-
-			spi5: spi@1a280000 {
-				status = "okay";
-
-				pinctrl-0 = <&spi_pins>;
-				pinctrl-names = "default";
-
-				cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-				flash: m25p80@0 {
-					compatible = "jedec,spi-nor";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					spi-max-frequency = <50000000>;
-					reg = <0>;
-
-					SBL1@0 {
-						label = "SBL1";
-						reg = <0x0 0x20000>;
-						read-only;
-					};
-
-					MIBIB@20000 {
-						label = "MIBIB";
-						reg = <0x20000 0x20000>;
-						read-only;
-					};
-
-					SBL2@40000 {
-						label = "SBL2";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					SBL3@60000 {
-						label = "SBL3";
-						reg = <0x60000 0x30000>;
-						read-only;
-					};
-
-					DDRCONFIG@90000 {
-						label = "DDRCONFIG";
-						reg = <0x90000 0x10000>;
-						read-only;
-					};
-
-					SSD@a0000 {
-						label = "SSD";
-						reg = <0xa0000 0x10000>;
-						read-only;
-					};
-
-					TZ@b0000 {
-						label = "TZ";
-						reg = <0xb0000 0x30000>;
-						read-only;
-					};
-
-					RPM@e0000 {
-						label = "RPM";
-						reg = <0xe0000 0x20000>;
-						read-only;
-					};
-
-					fs-uboot@100000 {
-						label = "fs-uboot";
-						reg = <0x100000 0x70000>;
-						read-only;
-					};
-
-					uboot-env@170000 {
-						label = "uboot-env";
-						reg = <0x170000 0x40000>;
-						read-only;
-					};
-
-					radio@1b0000 {
-						label = "radio";
-						reg = <0x1b0000 0x40000>;
-						read-only;
-					};
-
-					os-image@1f0000 {
-						label = "os-image";
-						reg = <0x1f0000 0x400000>;
-					};
-
-					rootfs@5f0000 {
-						label = "rootfs";
-						reg = <0x5f0000 0x1900000>;
-					};
-
-					defaultmac: default-mac@1ef0000 {
-						label = "default-mac";
-						reg = <0x1ef0000 0x00200>;
-						read-only;
-					};
-
-					pin@1ef0200 {
-						label = "pin";
-						reg = <0x1ef0200 0x00200>;
-						read-only;
-					};
-
-					product-info@1ef0400 {
-						label = "product-info";
-						reg = <0x1ef0400 0x0fc00>;
-						read-only;
-					};
-
-					partition-table@1f00000 {
-						label = "partition-table";
-						reg = <0x1f00000 0x10000>;
-						read-only;
-					};
-
-					soft-version@1f10000 {
-						label = "soft-version";
-						reg = <0x1f10000 0x10000>;
-						read-only;
-					};
-
-					support-list@1f20000 {
-						label = "support-list";
-						reg = <0x1f20000 0x10000>;
-						read-only;
-					};
-
-					profile@1f30000 {
-						label = "profile";
-						reg = <0x1f30000 0x10000>;
-						read-only;
-					};
-
-					default-config@1f40000 {
-						label = "default-config";
-						reg = <0x1f40000 0x10000>;
-						read-only;
-					};
-
-					user-config@1f50000 {
-						label = "user-config";
-						reg = <0x1f50000 0x40000>;
-						read-only;
-					};
-
-					qos-db@1f90000 {
-						label = "qos-db";
-						reg = <0x1f90000 0x40000>;
-						read-only;
-					};
-
-					usb-config@1fd0000 {
-						label = "usb-config";
-						reg = <0x1fd0000 0x10000>;
-						read-only;
-					};
-
-					log@1fe0000 {
-						label = "log";
-						reg = <0x1fe0000 0x20000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb0_pwr_en_pin>;
-			pinctrl-names = "default";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb1_pwr_en_pin>;
-			pinctrl-names = "default";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			force_gen1 = <1>;
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&defaultmac 0x8>;
-			mtd-mac-address-increment = <1>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-
-			mtd-mac-address = <&defaultmac 0x8>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 49 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		ledswitch {
-			label = "ledswitch";
-			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_LIGHTS_TOGGLE>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		lan {
-			label = "white:lan";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb4 {
-			label = "white:usb_4";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb2 {
-			label = "white:usb_2";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "white:wps";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_amber {
-			label = "amber:wan";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
-		};
-
-		wan_white {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		general: general {
-			label = "white:general";
-			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
deleted file mode 100644
index ba4bb9022d..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ /dev/null
@@ -1,396 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Netgear Nighthawk X4 D7800";
-	compatible = "netgear,d7800", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0xe000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power_white;
-		led-failsafe = &power_amber;
-		led-running = &power_white;
-		led-upgrade = &power_amber;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio6", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-						"gpio24","gpio26", "gpio53", "gpio64";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			usb0_pwr_en_pins: usb0_pwr_en_pins {
-				mux {
-					pins = "gpio15";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-
-			usb1_pwr_en_pins: usb1_pwr_en_pins {
-				mux {
-					pins = "gpio16", "gpio68";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			ports-implemented = <0x1>;
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb0_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb1_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&pcie0_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&pcie1_pins>;
-			pinctrl-names = "default";
-			force_gen1 = <1>;
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					qcadata@0 {
-						label = "qcadata";
-						reg = <0x0000000 0x0c80000>;
-						read-only;
-					};
-
-					APPSBL@c80000 {
-						label = "APPSBL";
-						reg = <0x0c80000 0x0500000>;
-						read-only;
-					};
-
-					APPSBLENV@1180000 {
-						label = "APPSBLENV";
-						reg = <0x1180000 0x0080000>;
-						read-only;
-					};
-
-					art: art@1200000 {
-						label = "art";
-						reg = <0x1200000 0x0140000>;
-						read-only;
-					};
-
-					artbak: art@1340000 {
-						label = "artbak";
-						reg = <0x1340000 0x0140000>;
-						read-only;
-					};
-
-					kernel@1480000 {
-						label = "kernel";
-						reg = <0x1480000 0x0400000>;
-					};
-
-					ubi@1880000 {
-						label = "ubi";
-						reg = <0x1880000 0x1C00000>;
-					};
-
-					netgear@3480000 {
-						label = "netgear";
-						reg = <0x3480000 0x4480000>;
-						read-only;
-					};
-
-					reserve@7900000 {
-						label = "reserve";
-						reg = <0x7900000 0x0700000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			phy-handle = <&phy4>;
-			qcom,id = <1>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&art 6>;
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-
-			mtd-mac-address = <&art 0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		usb1 {
-			label = "white:usb1";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb2 {
-			label = "white:usb2";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_amber: power_amber {
-			label = "amber:power";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_white {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_amber {
-			label = "amber:wan";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "white:wps";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-		};
-
-		esata {
-			label = "white:esata";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_white: power_white {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		wifi {
-			label = "white:wifi";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts
deleted file mode 100644
index 35b7e0ea37..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "qcom-ipq8064-v1.0.dtsi"
-
-/ {
-	model = "Qualcomm IPQ8064/DB149";
-	compatible = "qcom,ipq8064-db149", "qcom,ipq8064";
-
-	aliases {
-		serial0 = &gsbi2_serial;
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			i2c4_pins: i2c4_pinmux {
-				pins = "gpio12", "gpio13";
-				function = "gsbi4";
-				bias-disable;
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			rgmii0_pins: rgmii0_pins {
-				mux {
-					pins = "gpio2", "gpio66";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-		};
-
-		gsbi2: gsbi@12480000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-
-			gsbi2_serial: serial@12490000 {
-				status = "okay";
-			};
-		};
-
-		gsbi5: gsbi@1a200000 {
-			qcom,mode = <GSBI_PROT_SPI>;
-			status = "okay";
-
-			spi4: spi@1a280000 {
-				status = "okay";
-				spi-max-frequency = <50000000>;
-
-				pinctrl-0 = <&spi_pins>;
-				pinctrl-names = "default";
-
-				cs-gpios = <&qcom_pinmux 20 0>;
-
-				flash: m25p80@0 {
-					compatible = "s25fl256s1";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					spi-max-frequency = <50000000>;
-					reg = <0>;
-					m25p,fast-read;
-
-					partition@0 {
-						label = "lowlevel_init";
-						reg = <0x0 0x1b0000>;
-					};
-
-					partition@1 {
-						label = "u-boot";
-						reg = <0x1b0000 0x80000>;
-					};
-
-					partition@2 {
-						label = "u-boot-env";
-						reg = <0x230000 0x40000>;
-					};
-
-					partition@3 {
-						label = "caldata";
-						reg = <0x270000 0x40000>;
-					};
-
-					partition@4 {
-						label = "firmware";
-						reg = <0x2b0000 0x1d50000>;
-					};
-				};
-			};
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-		};
-
-		pcie2: pci@1b900000 {
-			status = "okay";
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
-
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-				>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-
-			phy6: ethernet-phy@6 {
-				reg = <6>;
-			};
-
-			phy7: ethernet-phy@7 {
-				reg = <7>;
-			};
-		};
-
-		gmac0: ethernet@37000000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <0>;
-			phy-handle = <&phy4>;
-
-			pinctrl-0 = <&rgmii0_pins>;
-			pinctrl-names = "default";
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <1>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-			phy-handle = <&phy6>;
-		};
-
-		gmac3: ethernet@37600000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <3>;
-			phy-handle = <&phy7>;
-		};
-	};
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
deleted file mode 100644
index 1b8ab36c4f..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ /dev/null
@@ -1,389 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Linksys EA8500 WiFi Router";
-	compatible = "linksys,ea8500", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power;
-		led-failsafe = &power;
-		led-running = &power;
-		led-upgrade = &power;
-	};
-
-	chosen {
-		bootargs = "console=ttyMSM0,115200n8";
-		stdout-path = "serial0:115200n8";
-		append-rootblock = "ubi.mtd=";  /* append to bootargs adding the root deviceblock nbr from bootloader */
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio65", "gpio67", "gpio68";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio6", "gpio53", "gpio54";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-			force_gen1 = <1>;
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-		};
-
-		pcie2: pci@1b900000 {
-			status = "okay";
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					SBL1@0 {
-						label = "SBL1";
-						reg = <0x0000000 0x0040000>;
-						read-only;
-					};
-
-					MIBIB@40000 {
-						label = "MIBIB";
-						reg = <0x0040000 0x0140000>;
-						read-only;
-					};
-
-					SBL2@180000 {
-						label = "SBL2";
-						reg = <0x0180000 0x0140000>;
-						read-only;
-					};
-
-					SBL3@2c0000 {
-						label = "SBL3";
-						reg = <0x02c0000 0x0280000>;
-						read-only;
-					};
-
-					DDRCONFIG@540000 {
-						label = "DDRCONFIG";
-						reg = <0x0540000 0x0120000>;
-						read-only;
-					};
-
-					SSD@660000 {
-						label = "SSD";
-						reg = <0x0660000 0x0120000>;
-						read-only;
-					};
-
-					TZ@780000 {
-						label = "TZ";
-						reg = <0x0780000 0x0280000>;
-						read-only;
-					};
-
-					RPM@a00000 {
-						label = "RPM";
-						reg = <0x0a00000 0x0280000>;
-						read-only;
-					};
-
-					art: art@c80000 {
-						label = "art";
-						reg = <0x0c80000 0x0140000>;
-						read-only;
-					};
-
-					APPSBL@dc0000 {
-						label = "APPSBL";
-						reg = <0x0dc0000 0x0100000>;
-						read-only;
-					};
-
-					u_env@ec0000 {
-						label = "u_env";
-						reg = <0x0ec0000 0x0040000>;
-					};
-
-					s_env@f00000 {
-						label = "s_env";
-						reg = <0x0f00000 0x0040000>;
-					};
-
-					devinfo@f40000 {
-						label = "devinfo";
-						reg = <0x0f40000 0x0040000>;
-					};
-
-					linux@f80000 {
-						label = "kernel1";
-						reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
-					};
-
-					rootfs@1280000 {
-						label = "rootfs1";
-						reg = <0x1280000 0x2500000>;
-					};
-
-					linux2@3780000 {
-						label = "kernel2";
-						reg = <0x3780000 0x2800000>;
-					};
-
-					rootfs2@3a80000 {
-						label = "rootfs2";
-						reg = <0x3a80000 0x2500000>;
-					};
-
-					syscfg@5f80000 {
-						label = "syscfg";
-						reg = <0x5f80000 0x2080000>;
-					};
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x00010 0x2613a0    /* PWS_REG */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-			qcom,phy_mdio_addr = <4>;
-			qcom,poll_required = <1>;
-			qcom,rgmii_delay = <0>;
-			qcom,emulation = <0>;
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-		//lan
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-			qcom,phy_mdio_addr = <0>;	/* none */
-			qcom,poll_required = <0>;	/* no polling */
-			qcom,rgmii_delay = <0>;
-			qcom,emulation = <0>;
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		adm_dma: dma@18300000 {
-			status = "okay";
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 67 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART >;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		wps {
-			label = "green:wps";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			default-state = "keep";
-		};
-
-		wifi {
-			label = "green:wifi";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
deleted file mode 100644
index 1d6be1288a..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ /dev/null
@@ -1,366 +0,0 @@
-#include "qcom-ipq8064-v1.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-	model = "Netgear Nighthawk X4 R7500";
-	compatible = "netgear,r7500", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0xe000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power_white;
-		led-failsafe = &power_amber;
-		led-running = &power_white;
-		led-upgrade = &power_amber;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio6", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-						"gpio24","gpio26", "gpio53", "gpio64";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			clocks = <&gcc USB30_1_MASTER_CLK>;
-			status = "okay";
-		};
-
-		usb3_1: usb3@100f8800 {
-			clocks = <&gcc USB30_0_MASTER_CLK>;
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			force_gen1 = <1>;
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					qcadata@0 {
-						label = "qcadata";
-						reg = <0x0000000 0x0c80000>;
-						read-only;
-					};
-
-					APPSBL@c80000 {
-						label = "APPSBL";
-						reg = <0x0c80000 0x0500000>;
-						read-only;
-					};
-
-					APPSBLENV@1180000 {
-						label = "APPSBLENV";
-						reg = <0x1180000 0x0080000>;
-						read-only;
-					};
-
-					art: art@1200000 {
-						label = "art";
-						reg = <0x1200000 0x0140000>;
-						read-only;
-					};
-
-					kernel@1340000 {
-						label = "kernel";
-						reg = <0x1340000 0x0400000>;
-					};
-
-					ubi@1740000 {
-						label = "ubi";
-						reg = <0x1740000 0x1600000>;
-					};
-
-					netgear@2d40000 {
-						label = "netgear";
-						reg = <0x2d40000 0x0c00000>;
-						read-only;
-					};
-
-					reserve@3940000 {
-						label = "reserve";
-						reg = <0x3940000 0x46c0000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&art 6>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-
-			mtd-mac-address = <&art 0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		usb1 {
-			label = "white:usb1";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb2 {
-			label = "white:usb2";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_amber: power_amber {
-			label = "amber:power";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_white {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_amber {
-			label = "amber:wan";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "white:wps";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-		};
-
-		esata {
-			label = "white:esata";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_white: power_white {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		wifi {
-			label = "white:wifi";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tcsr {
-	qcom,usb-ctrl-select = <TCSR_USB_SELECT_USB3_DUAL>;
-	compatible = "qcom,tcsr";
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
deleted file mode 100644
index e9d183a8eb..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ /dev/null
@@ -1,395 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Netgear Nighthawk X4 R7500v2";
-	compatible = "netgear,r7500v2", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-
-		rsvd@5fe00000 {
-			reg = <0x5fe00000 0x200000>;
-			reusable;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power;
-		led-failsafe = &power;
-		led-running = &power;
-		led-upgrade = &power;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs noinitrd";
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio6", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-						"gpio24","gpio26", "gpio53", "gpio64";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			usb0_pwr_en_pins: usb0_pwr_en_pins {
-				mux {
-					pins = "gpio15";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-
-			usb1_pwr_en_pins: usb1_pwr_en_pins {
-				mux {
-					pins = "gpio16", "gpio68";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb0_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb1_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-			pinctrl-0 = <&pcie0_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-			pinctrl-0 = <&pcie1_pins>;
-			pinctrl-names = "default";
-			force_gen1 = <1>;
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					qcadata@0 {
-						label = "qcadata";
-						reg = <0x0000000 0x0c80000>;
-						read-only;
-					};
-
-					APPSBL@c80000 {
-						label = "APPSBL";
-						reg = <0x0c80000 0x0500000>;
-						read-only;
-					};
-
-					APPSBLENV@1180000 {
-						label = "APPSBLENV";
-						reg = <0x1180000 0x0080000>;
-						read-only;
-					};
-
-					art: art@1200000 {
-						label = "art";
-						reg = <0x1200000 0x0140000>;
-						read-only;
-					};
-
-					artbak: art@1340000 {
-						label = "artbak";
-						reg = <0x1340000 0x0140000>;
-						read-only;
-					};
-
-					kernel@1480000 {
-						label = "kernel";
-						reg = <0x1480000 0x0400000>;
-					};
-
-					ubi@1880000 {
-						label = "ubi";
-						reg = <0x1880000 0x6080000>;
-					};
-
-					reserve@7900000 {
-						label = "reserve";
-						reg = <0x7900000 0x0700000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0xaa545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&art 6>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-
-			mtd-mac-address = <&art 0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		usb1 {
-			label = "amber:usb1";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb3 {
-			label = "amber:usb3";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		status {
-			label = "amber:status";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		internet {
-			label = "white:internet";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "white:wps";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-		};
-
-		esata {
-			label = "white:esata";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		wifi {
-			label = "white:wifi";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
deleted file mode 100644
index dd272c7fc7..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "qcom-ipq8064-v1.0.dtsi"
-
-/ {
-	soc: soc {
-
-		pcie0: pci@1b500000 {
-			phy-tx0-term-offset = <0>;
-		};
-
-		pcie1: pci@1b700000 {
-			phy-tx0-term-offset = <0>;
-		};
-
-		pcie2: pci@1b900000 {
-			phy-tx0-term-offset = <0>;
-		};
-	};
-};
-
-&ss_phy_0 {
-	rx_eq = <2>;
-	tx_deamp_3_5db = <32>;
-	mpll = <0xa0>;
-};
-
-&ss_phy_1 {
-	rx_eq = <2>;
-	tx_deamp_3_5db = <32>;
-	mpll = <0xa0>;
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
deleted file mode 100644
index 8c171bc2e3..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ /dev/null
@@ -1,402 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "TP-Link Archer VR2600v";
-	compatible = "tplink,vr2600v", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power;
-		led-failsafe = &general;
-		led-running = &power;
-		led-upgrade = &general;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			led_pins: led_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio17",
-						"gpio26", "gpio53", "gpio56", "gpio66";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			button_pins: button_pins {
-				mux {
-					pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					bias-pull-down;
-				};
-
-				data {
-					pins = "gpio18", "gpio19";
-					drive-strength = <10>;
-				};
-
-				cs {
-					pins = "gpio20";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				clk {
-					pins = "gpio21";
-					drive-strength = <12>;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		gsbi5: gsbi@1a200000 {
-			qcom,mode = <GSBI_PROT_SPI>;
-			status = "okay";
-
-			spi4: spi@1a280000 {
-				status = "okay";
-
-				pinctrl-0 = <&spi_pins>;
-				pinctrl-names = "default";
-
-				cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-				flash: W25Q128@0 {
-					compatible = "jedec,spi-nor";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					spi-max-frequency = <50000000>;
-					reg = <0>;
-
-					SBL1@0 {
-						label = "SBL1";
-						reg = <0x0 0x20000>;
-						read-only;
-					};
-
-					MIBIB@20000 {
-						label = "MIBIB";
-						reg = <0x20000 0x20000>;
-						read-only;
-					};
-
-					SBL2@40000 {
-						label = "SBL2";
-						reg = <0x40000 0x40000>;
-						read-only;
-					};
-
-					SBL3@80000 {
-						label = "SBL3";
-						reg = <0x80000 0x80000>;
-						read-only;
-					};
-
-					DDRCONFIG@100000 {
-						label = "DDRCONFIG";
-						reg = <0x100000 0x10000>;
-						read-only;
-					};
-
-					SSD@110000 {
-						label = "SSD";
-						reg = <0x110000 0x10000>;
-						read-only;
-					};
-
-					TZ@120000 {
-						label = "TZ";
-						reg = <0x120000 0x80000>;
-						read-only;
-					};
-
-					RPM@1a0000 {
-						label = "RPM";
-						reg = <0x1a0000 0x80000>;
-						read-only;
-					};
-
-					APPSBL@220000 {
-						label = "APPSBL";
-						reg = <0x220000 0x80000>;
-						read-only;
-					};
-
-					APPSBLENV@2a0000 {
-						label = "APPSBLENV";
-						reg = <0x2a0000 0x40000>;
-						read-only;
-					};
-
-					OLDART@2e0000 {
-						label = "OLDART";
-						reg = <0x2e0000 0x40000>;
-						read-only;
-					};
-
-					kernel@320000 {
-						label = "kernel";
-						reg = <0x320000 0x300000>;
-					};
-
-					rootfs@620000 {
-						label = "rootfs";
-						reg = <0x620000 0x960000>;
-					};
-
-					defaultmac: default-mac@0xfaf100 {
-						label = "default-mac";
-						reg = <0xfaf100 0x00200>;
-						read-only;
-					};
-
-					ART@fc0000 {
-						label = "ART";
-						reg = <0xfc0000 0x40000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			force_gen1 = <1>;
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&defaultmac 0>;
-			mtd-mac-address-increment = <1>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-
-			mtd-mac-address = <&defaultmac 0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		dect {
-			label = "dect";
-			gpios = <&qcom_pinmux 67 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_PHONE>;
-		};
-
-		ledswitch {
-			label = "ledswitch";
-			gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_LIGHTS_TOGGLE>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		dsl {
-			label = "white:dsl";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb {
-			label = "white:usb";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		lan {
-			label = "white:lan";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g {
-			label = "white:wlan2g";
-			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g {
-			label = "white:wlan5g";
-			gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		phone {
-			label = "white:phone";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
-		};
-
-		general: general {
-			label = "white:general";
-			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
deleted file mode 100644
index 58b5296878..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ /dev/null
@@ -1,427 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "NEC Aterm WG2600HP";
-	compatible = "nec,wg2600hp", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power_green;
-		led-failsafe = &power_red;
-		led-running = &power_green;
-		led-upgrade = &power_green;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x06000000  /* PAD0_MODE */
-					0x0000c 0x00080080  /* PAD6_MODE */
-					0x000e4 0x0006a545  /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x0000004e  /* PORT0_STATUS */
-					0x00094 0x0000004e  /* PORT6_STATUS */
-					>;
-			};
-
-			ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		bridge {
-			label = "bridge";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_0>;
-			linux,input-type = <EV_SW>;
-		};
-
-		converter {
-			label = "converter";
-			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_0>;
-			linux,input-type = <EV_SW>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		converter_green {
-			label = "green:converter";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_red: power_red {
-			label = "red:power";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		active_green {
-			label = "green:active";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		active_red {
-			label = "red:active";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		power_green: power_green {
-			label = "green:power";
-			gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
-		};
-
-		converter_red {
-			label = "red:converter";
-			gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g_green {
-			label = "green:wlan2g";
-			gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g_red {
-			label = "red:wlan2g";
-			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g_green {
-			label = "green:wlan5g";
-			gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g_red {
-			label = "red:wlan5g";
-			gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>;
-		};
-
-		tv_green {
-			label = "green:tv";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-
-		tv_red {
-			label = "red:tv";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
-
-&gmac1 {
-	status = "okay";
-
-	phy-mode = "rgmii";
-	qcom,id = <1>;
-
-	pinctrl-0 = <&rgmii2_pins>;
-	pinctrl-names = "default";
-
-	mtd-mac-address = <&PRODUCTDATA 6>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gmac2 {
-	status = "okay";
-
-	phy-mode = "sgmii";
-	qcom,id = <2>;
-
-	mtd-mac-address = <&PRODUCTDATA 0>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gsbi4 {
-	status = "okay";
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
-&gsbi4_serial {
-	status = "okay";
-};
-
-&gsbi5 {
-	status = "okay";
-
-	qcom,mode = <GSBI_PROT_SPI>;
-
-	spi@1a280000 {
-		status = "okay";
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-		flash@0 {
-			compatible = "jedec,spi-nor";
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-
-			partitions {
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				SBL1@0 {
-					label = "SBL1";
-					reg = <0x0 0x20000>;
-					read-only;
-				};
-
-				MIBIB@20000 {
-					label = "MIBIB";
-					reg = <0x20000 0x20000>;
-					read-only;
-				};
-
-				SBL2@40000 {
-					label = "SBL2";
-					reg = <0x40000 0x40000>;
-					read-only;
-				};
-
-				SBL3@80000 {
-					label = "SBL3";
-					reg = <0x80000 0x80000>;
-					read-only;
-				};
-
-				DDRCONFIG@100000 {
-					label = "DDRCONFIG";
-					reg = <0x100000 0x10000>;
-					read-only;
-				};
-
-				SSD@110000 {
-					label = "SSD";
-					reg = <0x110000 0x10000>;
-					read-only;
-				};
-
-				TZ@120000 {
-					label = "TZ";
-					reg = <0x120000 0x80000>;
-					read-only;
-				};
-
-				RPM@1a0000 {
-					label = "RPM";
-					reg = <0x1a0000 0x80000>;
-					read-only;
-				};
-
-				APPSBL@220000 {
-					label = "APPSBL";
-					reg = <0x220000 0x80000>;
-					read-only;
-				};
-
-				APPSBLENV@2a0000 {
-					label = "APPSBLENV";
-					reg = <0x2a0000 0x10000>;
-				};
-
-				PRODUCTDATA: PRODUCTDATA@2b0000 {
-					label = "PRODUCTDATA";
-					reg = <0x2b0000 0x30000>;
-					read-only;
-				};
-
-				ART@2e0000 {
-					label = "ART";
-					reg = <0x2e0000 0x40000>;
-					read-only;
-				};
-
-				TP@320000 {
-					label = "TP";
-					reg = <0x320000 0x40000>;
-					read-only;
-				};
-
-				TINY@360000 {
-					label = "TINY";
-					reg = <0x360000 0x500000>;
-					read-only;
-				};
-
-				firmware@860000 {
-					compatible = "denx,uimage";
-					label = "firmware";
-					reg = <0x860000 0x17a0000>;
-				};
-			};
-		};
-	};
-};
-
-&usb3_0 {
-	status = "okay";
-
-	pinctrl-0 = <&usb_pwr_en_pins>;
-	pinctrl-names = "default";
-};
-
-&usb3_1 {
-	status = "okay";
-};
-
-&pcie0 {
-	status = "okay";
-};
-
-&pcie1 {
-	status = "okay";
-	force_gen1 = <1>;
-};
-
-&qcom_pinmux {
-	button_pins: button_pins {
-		mux {
-			pins = "gpio16", "gpio54", "gpio24", "gpio25";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	i2c4_pins: i2c4_pinmux {
-		mux {
-			pins = "gpio12", "gpio13";
-			function = "gsbi4";
-			drive-strength = <12>;
-			bias-disable;
-		};
-	};
-
-	led_pins: led_pins {
-		mux {
-			pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
-				"gpio15", "gpio55", "gpio56", "gpio57", "gpio58",
-				"gpio64", "gpio65";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-down;
-		};
-	};
-
-	spi_pins: spi_pins {
-		mux {
-			pins = "gpio18", "gpio19", "gpio21";
-			function = "gsbi5";
-			bias-pull-down;
-		};
-
-		data {
-			pins = "gpio18", "gpio19";
-			drive-strength = <10>;
-		};
-
-		cs {
-			pins = "gpio20";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-
-		clk {
-			pins = "gpio21";
-			drive-strength = <12>;
-		};
-	};
-
-	mdio0_pins: mdio0_pins {
-		mux {
-			pins = "gpio0", "gpio1";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	rgmii2_pins: rgmii2_pins {
-		mux {
-			pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-			       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-			function = "rgmii2";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	usb_pwr_en_pins: usb_pwr_en_pins {
-		mux {
-			pins = "gpio22";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-down;
-			output-high;
-		};
-	};
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
deleted file mode 100644
index 0347cac430..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- *  BSD LICENSE
- *
- *  Copyright (C) 2017 Christian Mehlis <christian@m3hlis.de>
- *  Copyright (C) 2018 Mathias Kresin <dev@kresin.me>
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *    1. Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *    2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *    3. Neither the names of the copyright holders nor the names of any
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "qcom-ipq8064-v1.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-	compatible = "compex,wpq864", "qcom,ipq8064";
-	model = "Compex WPQ864";
-
-	aliases {
-		mdio-gpio0 = &mdio0;
-		serial0 = &gsbi4_serial;
-		ethernet0 = &gmac1;
-		ethernet1 = &gmac0;
-
-		led-boot = &led_pass;
-		led-failsafe = &led_fail;
-		led-running = &led_pass;
-		led-upgrade = &led_pass;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		rpm@108000 {
-			pinctrl-0 = <&rpm_pins>;
-			pinctrl-names = "default";
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			mt29f2g08abbeah4@0 {
-				compatible = "qcom,nandcs";
-
-				reg = <0>;
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					SBL1@0 {
-						label = "SBL1";
-						reg = <0x0000000 0x0040000>;
-						read-only;
-					};
-
-					MIBIB@40000 {
-						label = "MIBIB";
-						reg = <0x0040000 0x0140000>;
-						read-only;
-					};
-
-					SBL2@180000 {
-						label = "SBL2";
-						reg = <0x0180000 0x0140000>;
-						read-only;
-					};
-
-					SBL3@2c0000 {
-						label = "SBL3";
-						reg = <0x02c0000 0x0280000>;
-						read-only;
-					};
-
-					DDRCONFIG@540000 {
-						label = "DDRCONFIG";
-						reg = <0x0540000 0x0120000>;
-						read-only;
-					};
-
-					SSD@660000 {
-						label = "SSD";
-						reg = <0x0660000 0x0120000>;
-						read-only;
-					};
-
-					TZ@780000 {
-						label = "TZ";
-						reg = <0x0780000 0x0280000>;
-						read-only;
-					};
-
-					RPM@a00000 {
-						label = "RPM";
-						reg = <0x0a00000 0x0280000>;
-						read-only;
-					};
-
-					APPSBL@c80000 {
-						label = "APPSBL";
-						reg = <0x0c80000 0x0500000>;
-						read-only;
-					};
-
-					APPSBLENV@1180000 {
-						label = "APPSBLENV";
-						reg = <0x1180000 0x0080000>;
-					};
-
-					ART@1200000 {
-						label = "ART";
-						reg = <0x1200000 0x0140000>;
-					};
-
-					ubi@1340000 {
-						label = "ubi";
-						reg = <0x1340000 0x4000000>;
-					};
-
-					BOOTCONFIG@5340000 {
-						label = "BOOTCONFIG";
-						reg = <0x5340000 0x0060000>;
-					};
-
-					SBL2-1@53a0000- {
-						label = "SBL2_1";
-						reg = <0x53a0000 0x0140000>;
-						read-only;
-					};
-
-					SBL3-1@54e0000 {
-						label = "SBL3_1";
-						reg = <0x54e0000 0x0280000>;
-						read-only;
-					};
-
-					DDRCONFIG-1@5760000 {
-						label = "DDRCONFIG_1";
-						reg = <0x5760000 0x0120000>;
-						read-only;
-					};
-
-					SSD-1@5880000 {
-						label = "SSD_1";
-						reg = <0x5880000 0x0120000>;
-						read-only;
-					};
-
-					TZ-1@59a0000 {
-						label = "TZ_1";
-						reg = <0x59a0000 0x0280000>;
-						read-only;
-					};
-
-					RPM-1@5c20000 {
-						label = "RPM_1";
-						reg = <0x5c20000 0x0280000>;
-						read-only;
-					};
-
-					BOOTCONFIG1@5ea0000 {
-						label = "BOOTCONFIG1";
-						reg = <0x5ea0000 0x0060000>;
-					};
-
-					APPSBL-1@5f00000 {
-						label = "APPSBL_1";
-						reg = <0x5f00000 0x0500000>;
-						read-only;
-					};
-
-					ubi-1@6400000 {
-						label = "ubi_1";
-						reg = <0x6400000 0x4000000>;
-					};
-
-					unused@a400000 {
-						label = "unused";
-						reg = <0xa400000 0x5c00000>;
-					};
-				};
-			};
-		};
-	};
-
-	mdio0: mdio {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		compatible = "virtual,mdio-gpio";
-
-		pinctrl-0 = <&mdio0_pins>;
-		pinctrl-names = "default";
-
-		gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-			<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-
-		ethernet-phy@0 {
-			reg = <0>;
-			qca,ar8327-initvals = <
-				0x00004 0x7600000   /* PAD0_MODE */
-				0x00008 0x1000000   /* PAD5_MODE */
-				0x0000c 0x80        /* PAD6_MODE */
-				0x000e4 0x6a545     /* MAC_POWER_SEL */
-				0x000e0 0xc74164de  /* SGMII_CTRL */
-				0x0007c 0x4e        /* PORT0_STATUS */
-				0x00094 0x4e        /* PORT6_STATUS */
-				>;
-		};
-
-		ethernet-phy@4 {
-			reg = <4>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		rss4 {
-			label = "green:rss4";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		rss3 {
-			label = "green:rss3";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		rss2 {
-			label = "orange:rss2";
-			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
-		};
-
-		rss1 {
-			label = "red:rss1";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_pass: pass {
-			label = "green:pass";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_fail: fail {
-			label = "green:fail";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb {
-			label = "green:usb";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb-pcie {
-			label = "green:usb-pcie";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-	beeper {
-		compatible = "gpio-beeper";
-
-		pinctrl-0 = <&beeper_pins>;
-		pinctrl-names = "default";
-
-		gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
-
-&gmac1 {
-	status = "okay";
-
-	pinctrl-0 = <&rgmii2_pins>;
-	pinctrl-names = "default";
-
-	phy-mode = "rgmii";
-	qcom,id = <1>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gmac2 {
-	status = "okay";
-
-	phy-mode = "sgmii";
-	qcom,id = <2>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gsbi4 {
-	status = "okay";
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
-&gsbi4_serial {
-	status = "okay";
-
-	pinctrl-0 = <&uart0_pins>;
-	pinctrl-names = "default";
-};
-
-&gsbi5 {
-	status = "okay";
-
-	qcom,mode = <GSBI_PROT_SPI>;
-
-	spi@1a280000 {
-		status = "okay";
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-		s25fl256s1@0 {
-			compatible = "jedec,spi-nor";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
-	};
-};
-
-&ss_phy_0 {		/* USB3 port 0 SS phy */
-	status = "okay";
-
-	rx_eq = <2>;
-	tx_deamp_3_5db = <32>;
-	mpll = <160>;
-};
-
-&ss_phy_1 {		/* USB3 port 1 SS phy */
-	status = "okay";
-
-	rx_eq = <2>;
-	tx_deamp_3_5db = <32>;
-	mpll = <160>;
-};
-
-&pcie0 {
-	status = "okay";
-
-	/delete-property/ pinctrl-0;
-	/delete-property/ pinctrl-names;
-	/delete-property/ perst-gpios;
-};
-
-&pcie1 {
-	status = "okay";
-};
-
-&pcie2 {
-	status = "okay";
-
-	/delete-property/ pinctrl-0;
-	/delete-property/ pinctrl-names;
-	/delete-property/ perst-gpios;
-};
-
-&qcom_pinmux {
-	pinctrl-names = "default";
-	pinctrl-0 = <&state_default>;
-
-	state_default: pinctrl0 {
-		pcie0_pcie2_perst {
-			pins = "gpio3";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-disable;
-			output-high;
-		};
-	};
-
-	led_pins: led_pins {
-		mux {
-			pins = "gpio7", "gpio8", "gpio9", "gpio22",
-			       "gpio23", "gpio24", "gpio25", "gpio53";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	button_pins: button_pins {
-		mux {
-			pins = "gpio54";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	beeper_pins: beeper_pins {
-		mux {
-			pins = "gpio55";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	rpm_pins: rpm_pins {
-		mux {
-			pins = "gpio12", "gpio13";
-			function = "gsbi4";
-			drive-strength = <10>;
-			bias-disable;
-		};
-	};
-
-	uart0_pins: uart0_pins {
-		mux {
-			pins = "gpio10", "gpio11";
-			function = "gsbi4";
-			drive-strength = <10>;
-			bias-disable;
-		};
-	};
-
-	spi_pins: spi_pins {
-		mux {
-			pins = "gpio18", "gpio19";
-			function = "gsbi5";
-			drive-strength = <10>;
-			bias-pull-down;
-		};
-
-		clk {
-			pins = "gpio21";
-			function = "gsbi5";
-			drive-strength = <12>;
-			bias-pull-down;
-		};
-
-		cs {
-			pins = "gpio20";
-			function = "gpio";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-	};
-
-	nand_pins: nand_pins {
-		disable {
-			pins = "gpio34", "gpio35", "gpio36", "gpio37",
-			       "gpio38";
-			function = "nand";
-			drive-strength = <10>;
-			bias-disable;
-		};
-
-		pullups {
-			pins = "gpio39";
-			function = "nand";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-
-		hold {
-			pins = "gpio40", "gpio41", "gpio42", "gpio43",
-			       "gpio44", "gpio45", "gpio46", "gpio47";
-			function = "nand";
-			drive-strength = <10>;
-			bias-bus-hold;
-		};
-	};
-
-	mdio0_pins: mdio0_pins {
-		mux {
-			pins = "gpio0", "gpio1";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	rgmii2_pins: rgmii2_pins {
-		mux {
-			pins = "gpio27", "gpio28", "gpio29", "gpio30",
-			       "gpio31", "gpio32", "gpio51", "gpio52",
-			       "gpio59", "gpio60", "gpio61", "gpio62";
-			function = "rgmii2";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-};
-
-&usb3_0 {
-	status = "okay";
-};
-
-
-&usb3_1 {
-	status = "okay";
-};
-
-&tcsr {
-	qcom,usb-ctrl-select = <TCSR_USB_SELECT_USB3_DUAL>;
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
deleted file mode 100644
index 874e54b4a1..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ /dev/null
@@ -1,520 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "qcom-ipq8064-v2.0.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Buffalo WXR-2533DHP";
-	compatible = "buffalo,wxr-2533dhp", "qcom,ipq8064";
-
-	memory@42000000 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-
-		led-boot = &power;
-		led-failsafe = &diag;
-		led-running = &power;
-		led-upgrade = &power;
-	};
-
-	chosen {
-		/* use "ubi_rootfs" volume in "ubi" partition as rootfs */
-		bootargs = "ubi.block=0,1 root=/dev/ubiblock0_1 rootfstype=squashfs";
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs@0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					ubi@0 {
-						label = "ubi";
-						reg = <0x0000000 0x4000000>;
-					};
-
-					rootfs_1@4000000 {
-						label = "rootfs_1";
-						reg = <0x4000000 0x4000000>;
-					};
-				};
-			};
-		};
-
-		mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x07600000  /* PAD0_MODE */
-					0x00008 0x01000000  /* PAD5_MODE */
-					0x0000c 0x00000080  /* PAD6_MODE */
-					0x00050 0xcc35cc35  /* LED_CTRL0 */
-					0x00054 0xca35ca35  /* LED_CTRL1 */
-					0x00058 0xc935c935  /* LED_CTRL2 */
-					0x0005c 0x03ffff00  /* LED_CTRL3 */
-					0x000e4 0x0006a545  /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x0000007e  /* PORT0_STATUS */
-					0x00094 0x0000007e  /* PORT6_STATUS */
-					>;
-			};
-
-			ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		usb {
-			label = "green:usb";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "usbport";
-			trigger-sources = <&hub_port0 &hub_port1>;
-		};
-
-		guestport {
-			label = "green:guestport";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		diag: diag {
-			label = "orange:diag";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		internet_orange {
-			label = "orange:internet";
-			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
-		};
-
-		internet_white {
-			label = "white:internet";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		wireless_orange {
-			label = "orange:wireless";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		wireless_white {
-			label = "white:wireless";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-		};
-
-		router_orange {
-			label = "orange:router";
-			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
-		};
-
-		router_white {
-			label = "white:router";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		power {
-			label = "power";
-			gpios = <&qcom_pinmux 58 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_POWER>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		eject {
-			label = "eject";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_EJECTCD>;
-		};
-
-		guest {
-			label = "guest";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_0>;
-		};
-
-		ap {
-			label = "ap";
-			gpios = <&qcom_pinmux 55 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_1>;
-			linux,input-type = <EV_SW>;
-		};
-
-		router {
-			label = "router";
-			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_1>;
-			linux,input-type = <EV_SW>;
-		};
-
-		auto {
-			label = "auto";
-			gpios = <&qcom_pinmux 57 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_1>;
-			linux,input-type = <EV_SW>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
-
-&gmac1 {
-	status = "okay";
-
-	phy-mode = "rgmii";
-	qcom,id = <1>;
-
-	pinctrl-0 = <&rgmii2_pins>;
-	pinctrl-names = "default";
-
-	mtd-mac-address = <&ART 6>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gmac2 {
-	status = "okay";
-
-	phy-mode = "sgmii";
-	qcom,id = <2>;
-
-	mtd-mac-address = <&ART 0>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-};
-
-&gsbi4 {
-	status = "okay";
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
-&gsbi4_serial {
-	status = "okay";
-
-	pinctrl-0 = <&uart0_pins>;
-	pinctrl-names = "default";
-};
-
-&gsbi5 {
-	status = "okay";
-	qcom,mode = <GSBI_PROT_SPI>;
-
-	spi@1a280000 {
-		status = "okay";
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-		flash@0 {
-			compatible = "jedec,spi-nor";
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-
-			partitions {
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				SBL1@0 {
-					label = "SBL1";
-					reg = <0x0 0x10000>;
-					read-only;
-				};
-
-				MIBIB@10000 {
-					label = "MIBIB";
-					reg = <0x10000 0x20000>;
-					read-only;
-				};
-
-				SBL2@30000 {
-					label = "SBL2";
-					reg = <0x30000 0x30000>;
-					read-only;
-				};
-
-				SBL3@60000 {
-					label = "SBL3";
-					reg = <0x60000 0x30000>;
-					read-only;
-				};
-
-				DDRCONFIG@90000 {
-					label = "DDRCONFIG";
-					reg = <0x90000 0x10000>;
-					read-only;
-				};
-
-				SSD@a0000 {
-					label = "SSD";
-					reg = <0xa0000 0x10000>;
-					read-only;
-				};
-
-				TZ@b0000 {
-					label = "TZ";
-					reg = <0xb0000 0x30000>;
-					read-only;
-				};
-
-				RPM@e0000 {
-					label = "RPM";
-					reg = <0xe0000 0x20000>;
-					read-only;
-				};
-
-				APPSBL@100000 {
-					label = "APPSBL";
-					reg = <0x100000 0x70000>;
-					read-only;
-				};
-
-				APPSBLENV@170000 {
-					label = "APPSBLENV";
-					reg = <0x170000 0x10000>;
-					read-only;
-				};
-
-				ART: ART@180000 {
-					label = "ART";
-					reg = <0x180000 0x40000>;
-					read-only;
-				};
-
-				BOOTCONFIG@1c0000 {
-					label = "BOOTCONFIG";
-					reg = <0x1c0000 0x10000>;
-					read-only;
-				};
-
-				APPSBL_1@1d0000 {
-					label = "APPSBL_1";
-					reg = <0x1d0000 0x70000>;
-					read-only;
-				};
-			};
-		};
-	};
-};
-
-&usb3_0 {
-	status = "okay";
-
-	pinctrl-0 = <&usb_pwr_en_pins>;
-	pinctrl-names = "default";
-};
-
-&usb3_1 {
-	status = "okay";
-};
-
-&dwc3_0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	hub_port0: port@1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
-	};
-};
-
-&dwc3_1 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	hub_port1: port@1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
-	};
-};
-
-&pcie0 {
-	status = "okay";
-};
-
-&pcie1 {
-	status = "okay";
-	force_gen1 = <1>;
-};
-
-&qcom_pinmux {
-	button_pins: button_pins {
-		mux {
-			pins = "gpio6", "gpio54", "gpio55", "gpio56", "gpio57",
-				"gpio58", "gpio64", "gpio65";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	led_pins: led_pins {
-		mux {
-			pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio22",
-				"gpio23", "gpio24", "gpio25", "gpio26", "gpio53";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-
-	uart0_pins: uart0_pins {
-		mux {
-			pins = "gpio10", "gpio11";
-			function = "gsbi4";
-			drive-strength = <12>;
-			bias-disable;
-		};
-	};
-
-	spi_pins: spi_pins {
-		mux {
-			pins = "gpio18", "gpio19", "gpio21";
-			function = "gsbi5";
-			bias-pull-down;
-		};
-
-		data {
-			pins = "gpio18", "gpio19";
-			drive-strength = <10>;
-		};
-
-		cs{
-			pins = "gpio20";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-
-		clk {
-			pins = "gpio21";
-			drive-strength = <12>;
-		};
-	};
-
-	mdio0_pins: mdio0_pins {
-		mux {
-			pins = "gpio0", "gpio1";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	nand_pins: nand_pins {
-		disable {
-			pins = "gpio34", "gpio35", "gpio36",
-			       "gpio37", "gpio38";
-			function = "nand";
-			drive-strength = <10>;
-			bias-disable;
-		};
-
-		pullups {
-			pins = "gpio39";
-			function = "nand";
-			drive-strength = <10>;
-			bias-pull-up;
-		};
-
-		hold {
-			pins = "gpio40", "gpio41", "gpio42",
-			       "gpio43", "gpio44", "gpio45",
-			       "gpio46", "gpio47";
-			function = "nand";
-			drive-strength = <10>;
-			bias-bus-hold;
-		};
-	};
-
-	rgmii2_pins: rgmii2_pins {
-		mux {
-			pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-			       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-			function = "rgmii2";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	usb_pwr_en_pins: usb_pwr_en_pins {
-		mux{
-			pins = "gpio68";
-			function = "gpio";
-			drive-strength = <2>;
-			bias-pull-up;
-			output-high;
-		};
-	};
-};
\ No newline at end of file
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi
deleted file mode 100644
index a542af7866..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ /dev/null
@@ -1,1512 +0,0 @@
-/dts-v1/;
-
-#include "skeleton.dtsi"
-#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
-#include <dt-bindings/mfd/qcom-rpm.h>
-#include <dt-bindings/clock/qcom,rpmcc.h>
-#include <dt-bindings/clock/qcom,lcc-ipq806x.h>
-#include <dt-bindings/soc/qcom,gsbi.h>
-#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Qualcomm IPQ8064";
-	compatible = "qcom,ipq8064";
-	interrupt-parent = <&intc>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			compatible = "qcom,krait";
-			enable-method = "qcom,kpss-acc-v1";
-			device_type = "cpu";
-			reg = <0>;
-			next-level-cache = <&L2>;
-			qcom,acc = <&acpu0_aux>;
-			qcom,saw = <&saw0>;
-			clocks = <&kraitcc 0>, <&kraitcc 4>;
-			clock-names = "cpu", "l2";
-			clock-latency = <100000>;
-			cpu-supply = <&smb208_s2a>;
-			operating-points-v2 = <&opp_table0>;
-			voltage-tolerance = <5>;
-			cooling-min-state = <0>;
-			cooling-max-state = <10>;
-			#cooling-cells = <2>;
-			cpu-idle-states = <&CPU_SPC>;
-		};
-
-		cpu1: cpu@1 {
-			compatible = "qcom,krait";
-			enable-method = "qcom,kpss-acc-v1";
-			device_type = "cpu";
-			reg = <1>;
-			next-level-cache = <&L2>;
-			qcom,acc = <&acpu1_aux>;
-			qcom,saw = <&saw1>;
-			clocks = <&kraitcc 1>, <&kraitcc 4>;
-			clock-names = "cpu", "l2";
-			clock-latency = <100000>;
-			cpu-supply = <&smb208_s2b>;
-			operating-points-v2 = <&opp_table0>;
-			voltage-tolerance = <5>;
-			cooling-min-state = <0>;
-			cooling-max-state = <10>;
-			#cooling-cells = <2>;
-			cpu-idle-states = <&CPU_SPC>;
-		};
-
-		L2: l2-cache {
-			compatible = "cache";
-			cache-level = <2>;
-			qcom,saw = <&saw_l2>;
-		};
-
-		qcom,l2 {
-			qcom,l2-rates = <384000000 1000000000 1200000000>;
-			qcom,l2-cpufreq = <384000000 600000000 1200000000>;
-			qcom,l2-volt = <1100000 1100000 1150000>;
-			qcom,l2-supply = <&smb208_s1a>;
-		};
-
-		idle-states {
-			CPU_SPC: spc {
-				compatible = "qcom,idle-state-spc",
-						"arm,idle-state";
-				status = "okay";
-				entry-latency-us = <400>;
-				exit-latency-us = <900>;
-				min-residency-us = <3000>;
-			};
-		};
-	};
-
-	opp_table0: opp_table0 {
-		compatible = "operating-points-v2-qcom-cpu";
-		nvmem-cells = <&speedbin_efuse>;
-
-		opp-384000000 {
-			opp-hz = /bits/ 64 <384000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1000000>;
-			opp-microvolt-speed0-pvs1-v0 = <925000>;
-			opp-microvolt-speed0-pvs2-v0 = <875000>;
-			opp-microvolt-speed0-pvs3-v0 = <800000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-600000000 {
-			opp-hz = /bits/ 64 <600000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1050000>;
-			opp-microvolt-speed0-pvs1-v0 = <975000>;
-			opp-microvolt-speed0-pvs2-v0 = <925000>;
-			opp-microvolt-speed0-pvs3-v0 = <850000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-800000000 {
-			opp-hz = /bits/ 64 <800000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1100000>;
-			opp-microvolt-speed0-pvs1-v0 = <1025000>;
-			opp-microvolt-speed0-pvs2-v0 = <995000>;
-			opp-microvolt-speed0-pvs3-v0 = <900000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1000000000 {
-			opp-hz = /bits/ 64 <1000000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1150000>;
-			opp-microvolt-speed0-pvs1-v0 = <1075000>;
-			opp-microvolt-speed0-pvs2-v0 = <1025000>;
-			opp-microvolt-speed0-pvs3-v0 = <950000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1200000000 {
-			opp-hz = /bits/ 64 <1200000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1200000>;
-			opp-microvolt-speed0-pvs1-v0 = <1125000>;
-			opp-microvolt-speed0-pvs2-v0 = <1075000>;
-			opp-microvolt-speed0-pvs3-v0 = <1000000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1400000000 {
-			opp-hz = /bits/ 64 <1400000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1250000>;
-			opp-microvolt-speed0-pvs1-v0 = <1175000>;
-			opp-microvolt-speed0-pvs2-v0 = <1125000>;
-			opp-microvolt-speed0-pvs3-v0 = <1050000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-	};
-
-	thermal-zones {
-		tsens_tz_sensor0 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 0>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor1 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 1>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor2 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 2>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor3 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 3>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor4 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 4>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor5 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 5>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor6 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 6>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor7 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 7>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor8 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 8>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor9 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 9>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor10 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 10>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-	};
-
-	cpu-pmu {
-		compatible = "qcom,krait-pmu";
-		interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
-					  IRQ_TYPE_LEVEL_HIGH)>;
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		nss@40000000 {
-			reg = <0x40000000 0x1000000>;
-			no-map;
-		};
-
-		smem: smem@41000000 {
-			reg = <0x41000000 0x200000>;
-			no-map;
-		};
-	};
-
-	clocks {
-		cxo_board {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
-		pxo_board {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
-		sleep_clk: sleep_clk {
-			compatible = "fixed-clock";
-			clock-frequency = <32768>;
-			#clock-cells = <0>;
-		};
-	};
-
-	fab-scaling {
-		compatible = "qcom,fab-scaling";
-		clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>;
-		clock-names = "apps-fab-clk", "ddr-fab-clk";
-		fab_freq_high = <533000000>;
-		fab_freq_nominal = <400000000>;
-		cpu_freq_threshold = <1000000000>;
-	};
-
-	firmware {
-		scm {
-			compatible = "qcom,scm-ipq806x";
-		};
-	};
-
-	soc: soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-
-		lpass@28100000 {
-			compatible = "qcom,lpass-cpu";
-			status = "disabled";
-			clocks = <&lcc AHBIX_CLK>,
-					<&lcc MI2S_OSR_CLK>,
-					<&lcc MI2S_BIT_CLK>;
-			clock-names = "ahbix-clk",
-					"mi2s-osr-clk",
-					"mi2s-bit-clk";
-			interrupts = <GIC_SPI 85 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "lpass-irq-lpaif";
-			reg = <0x28100000 0x10000>;
-			reg-names = "lpass-lpaif";
-		};
-
-		qfprom: qfprom@700000 {
-			compatible = "qcom,qfprom", "syscon";
-			reg = <0x700000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			status = "okay";
-			tsens_calib: calib@400 {
-				reg = <0x400 0xb>;
-			};
-			tsens_backup: backup@410 {
-				reg = <0x410 0xb>;
-			};
-			speedbin_efuse: speedbin@0c0 {
-				reg = <0x0c0 0x4>;
-			};
-		};
-
-		rpm@108000 {
-			compatible = "qcom,rpm-ipq8064";
-			reg = <0x108000 0x1000>;
-			qcom,ipc = <&l2cc 0x8 2>;
-
-			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "ack",
-					  "err",
-					  "wakeup";
-
-			clocks = <&gcc RPM_MSG_RAM_H_CLK>;
-			clock-names = "ram";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			rpmcc: clock-controller {
-				compatible	= "qcom,rpmcc-ipq806x", "qcom,rpmcc";
-				#clock-cells = <1>;
-			};
-
-			regulators {
-				compatible = "qcom,rpm-smb208-regulators";
-
-				smb208_s1a: s1a {
-					regulator-min-microvolt = <1050000>;
-					regulator-max-microvolt = <1150000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-
-				};
-
-				smb208_s1b: s1b {
-					regulator-min-microvolt = <1050000>;
-					regulator-max-microvolt = <1150000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-
-				smb208_s2a: s2a {
-					regulator-min-microvolt = < 800000>;
-					regulator-max-microvolt = <1250000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-
-				smb208_s2b: s2b {
-					regulator-min-microvolt = < 800000>;
-					regulator-max-microvolt = <1250000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-			};
-		};
-
-		rng@1a500000 {
-			compatible = "qcom,prng";
-			reg = <0x1a500000 0x200>;
-			clocks = <&gcc PRNG_CLK>;
-			clock-names = "core";
-		};
-
-		qcom_pinmux: pinmux@800000 {
-			compatible = "qcom,ipq8064-pinctrl";
-			reg = <0x800000 0x4000>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-
-			pcie0_pins: pcie0_pinmux {
-				mux {
-					pins = "gpio3";
-					function = "pcie1_rst";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			pcie1_pins: pcie1_pinmux {
-				mux {
-					pins = "gpio48";
-					function = "pcie2_rst";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			pcie2_pins: pcie2_pinmux {
-				mux {
-					pins = "gpio63";
-					function = "pcie3_rst";
-					drive-strength = <12>;
-					bias-disable;
-					output-low;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-			};
-
-			leds_pins: leds_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9",
-					       "gpio26", "gpio53";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-down;
-					output-low;
-				};
-			};
-
-			buttons_pins: buttons_pins {
-				mux {
-					pins = "gpio54";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		intc: interrupt-controller@2000000 {
-			compatible = "qcom,msm-qgic2";
-			interrupt-controller;
-			#interrupt-cells = <3>;
-			reg = <0x02000000 0x1000>,
-			      <0x02002000 0x1000>;
-		};
-
-		timer@200a000 {
-			compatible = "qcom,kpss-timer",
-				"qcom,kpss-wdt-ipq8064", "qcom,msm-timer";
-			interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-				     <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-				     <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-				     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-				     <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>;
-			reg = <0x0200a000 0x100>;
-			clock-frequency = <25000000>,
-					  <32768>;
-			clocks = <&sleep_clk>;
-			clock-names = "sleep";
-			cpu-offset = <0x80000>;
-		};
-
-		acpu0_aux: clock-controller@2088000 {
-			compatible = "qcom,kpss-acc-v1";
-			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
-			clock-output-names = "acpu0_aux";
-		};
-
-		acpu1_aux: clock-controller@2098000 {
-			compatible = "qcom,kpss-acc-v1";
-			reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
-			clock-output-names = "acpu1_aux";
-		};
-
-		l2cc: clock-controller@2011000 {
-			compatible = "qcom,kpss-gcc", "syscon";
-			reg = <0x2011000 0x1000>;
-			clock-output-names = "acpu_l2_aux";
-		};
-
-		kraitcc: clock-controller {
-			compatible = "qcom,krait-cc-v1";
-			#clock-cells = <1>;
-		};
-
-		saw0: regulator@2089000 {
-			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
-			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
-			regulator;
-		};
-
-		saw1: regulator@2099000 {
-			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
-			reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
-			regulator;
-		};
-
-		saw_l2: regulator@02012000 {
-			compatible = "qcom,saw2", "syscon";
-			reg = <0x02012000 0x1000>;
-			regulator;
-		};
-
-		sic_non_secure: sic-non-secure@12100000 {
-			compatible = "syscon";
-			reg = <0x12100000 0x10000>;
-		};
-
-		gsbi2: gsbi@12480000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <2>;
-			reg = <0x12480000 0x100>;
-			clocks = <&gcc GSBI2_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi2_serial: serial@12490000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x12490000 0x1000>,
-				      <0x12480000 0x1000>;
-				interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@124a0000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x124a0000 0x1000>;
-				interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-
-		};
-
-		gsbi4: gsbi@16300000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <4>;
-			reg = <0x16300000 0x100>;
-			clocks = <&gcc GSBI4_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi4_serial: serial@16340000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x16340000 0x1000>,
-				      <0x16300000 0x1000>;
-				interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@16380000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x16380000 0x1000>;
-				interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
-		gsbi5: gsbi@1a200000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <5>;
-			reg = <0x1a200000 0x100>;
-			clocks = <&gcc GSBI5_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi5_serial: serial@1a240000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x1a240000 0x1000>,
-				      <0x1a200000 0x1000>;
-				interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@1a280000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x1a280000 0x1000>;
-				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-
-			spi@1a280000 {
-				compatible = "qcom,spi-qup-v1.1.1";
-				reg = <0x1a280000 0x1000>;
-				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
-		gsbi7: gsbi@16600000 {
-			status = "disabled";
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <7>;
-			reg = <0x16600000 0x100>;
-			clocks = <&gcc GSBI7_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			syscon-tcsr = <&tcsr>;
-
-			gsbi7_serial: serial@16640000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x16640000 0x1000>,
-				      <0x16600000 0x1000>;
-				interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-		};
-
-		sata_phy: sata-phy@1b400000 {
-			compatible = "qcom,ipq806x-sata-phy";
-			reg = <0x1b400000 0x200>;
-
-			clocks = <&gcc SATA_PHY_CFG_CLK>;
-			clock-names = "cfg";
-
-			#phy-cells = <0>;
-			status = "disabled";
-		};
-
-		sata: sata@29000000 {
-			compatible = "qcom,ipq806x-ahci", "generic-ahci";
-			reg = <0x29000000 0x180>;
-
-			ports-implemented = <0x1>;
-
-			interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;
-
-			clocks = <&gcc SFAB_SATA_S_H_CLK>,
-				 <&gcc SATA_H_CLK>,
-				 <&gcc SATA_A_CLK>,
-				 <&gcc SATA_RXOOB_CLK>,
-				 <&gcc SATA_PMALIVE_CLK>;
-			clock-names = "slave_face", "iface", "core",
-					"rxoob", "pmalive";
-
-			assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;
-			assigned-clock-rates = <100000000>, <100000000>;
-
-			phys = <&sata_phy>;
-			phy-names = "sata-phy";
-			status = "disabled";
-		};
-
-		qcom,ssbi@500000 {
-			compatible = "qcom,ssbi";
-			reg = <0x00500000 0x1000>;
-			qcom,controller-type = "pmic-arbiter";
-		};
-
-		gcc: clock-controller@900000 {
-			compatible = "qcom,gcc-ipq8064";
-			reg = <0x00900000 0x4000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-			#power-domain-cells = <1>;
-		};
-
-		tsens: thermal-sensor@900000 {
-			compatible = "qcom,ipq8064-tsens";
-			reg = <0x900000 0x3680>;
-			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
-			nvmem-cell-names = "calib", "calib_backup";
-			interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
-			#thermal-sensor-cells = <1>;
-		};
-
-		tcsr: syscon@1a400000 {
-			compatible = "qcom,tcsr-ipq8064", "syscon";
-			reg = <0x1a400000 0x100>;
-		};
-
-		lcc: clock-controller@28000000 {
-			compatible = "qcom,lcc-ipq8064";
-			reg = <0x28000000 0x1000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-		};
-
-		sfpb_mutex_block: syscon@1200600 {
-			compatible = "syscon";
-			reg = <0x01200600 0x100>;
-		};
-
-		hs_phy_0: hs_phy_0 {
-			compatible = "qcom,dwc3-hs-usb-phy";
-			regmap = <&usb3_0>;
-			clocks = <&gcc USB30_0_UTMI_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		ss_phy_0: ss_phy_0 {
-			compatible = "qcom,dwc3-ss-usb-phy";
-			regmap = <&usb3_0>;
-			clocks = <&gcc USB30_0_MASTER_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		usb3_0: usb3@110f8800 {
-			compatible = "qcom,dwc3", "syscon";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x110f8800 0x8000>;
-			clocks = <&gcc USB30_0_MASTER_CLK>;
-			clock-names = "core";
-
-			ranges;
-
-			resets = <&gcc USB30_0_MASTER_RESET>;
-			reset-names = "master";
-
-			status = "disabled";
-
-			dwc3_0: dwc3@11000000 {
-				compatible = "snps,dwc3";
-				reg = <0x11000000 0xcd00>;
-				interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-				phys = <&hs_phy_0>, <&ss_phy_0>;
-				phy-names = "usb2-phy", "usb3-phy";
-				dr_mode = "host";
-				snps,dis_u3_susphy_quirk;
-			};
-		};
-
-		hs_phy_1: hs_phy_1 {
-			compatible = "qcom,dwc3-hs-usb-phy";
-			regmap = <&usb3_1>;
-			clocks = <&gcc USB30_1_UTMI_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		ss_phy_1: ss_phy_1 {
-			compatible = "qcom,dwc3-ss-usb-phy";
-			regmap = <&usb3_1>;
-			clocks = <&gcc USB30_1_MASTER_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		usb3_1: usb3@100f8800 {
-			compatible = "qcom,dwc3", "syscon";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x100f8800 0x8000>;
-			clocks = <&gcc USB30_1_MASTER_CLK>;
-			clock-names = "core";
-
-			ranges;
-
-			resets = <&gcc USB30_1_MASTER_RESET>;
-			reset-names = "master";
-
-			status = "disabled";
-
-			dwc3_1: dwc3@10000000 {
-				compatible = "snps,dwc3";
-				reg = <0x10000000 0xcd00>;
-				interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
-				phys = <&hs_phy_1>, <&ss_phy_1>;
-				phy-names = "usb2-phy", "usb3-phy";
-				dr_mode = "host";
-				snps,dis_u3_susphy_quirk;
-			};
-		};
-
-		pcie0: pci@1b500000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b500000 0x1000
-			       0x1b502000 0x80
-			       0x1b600000 0x100
-			       0x0ff00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <0>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x0fe00000 0x0fe00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_A_CLK>,
-				 <&gcc PCIE_H_CLK>,
-				 <&gcc PCIE_PHY_CLK>,
-				 <&gcc PCIE_AUX_CLK>,
-				 <&gcc PCIE_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_ACLK_RESET>,
-				 <&gcc PCIE_HCLK_RESET>,
-				 <&gcc PCIE_POR_RESET>,
-				 <&gcc PCIE_PCI_RESET>,
-				 <&gcc PCIE_PHY_RESET>,
-				 <&gcc PCIE_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie0_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-
-			phy-tx0-term-offset = <7>;
-
-			status = "disabled";
-		};
-
-		pcie1: pci@1b700000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b700000 0x1000
-			       0x1b702000 0x80
-			       0x1b800000 0x100
-			       0x31f00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <1>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x31e00000 0x31e00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_1_A_CLK>,
-				 <&gcc PCIE_1_H_CLK>,
-				 <&gcc PCIE_1_PHY_CLK>,
-				 <&gcc PCIE_1_AUX_CLK>,
-				 <&gcc PCIE_1_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_1_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_1_ACLK_RESET>,
-				 <&gcc PCIE_1_HCLK_RESET>,
-				 <&gcc PCIE_1_POR_RESET>,
-				 <&gcc PCIE_1_PCI_RESET>,
-				 <&gcc PCIE_1_PHY_RESET>,
-				 <&gcc PCIE_1_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie1_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-
-			phy-tx0-term-offset = <7>;
-
-			status = "disabled";
-		};
-
-		pcie2: pci@1b900000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b900000 0x1000
-			       0x1b902000 0x80
-			       0x1ba00000 0x100
-			       0x35f00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <2>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x35e00000 0x35e00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x32000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_2_A_CLK>,
-				 <&gcc PCIE_2_H_CLK>,
-				 <&gcc PCIE_2_PHY_CLK>,
-				 <&gcc PCIE_2_AUX_CLK>,
-				 <&gcc PCIE_2_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_2_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_2_ACLK_RESET>,
-				 <&gcc PCIE_2_HCLK_RESET>,
-				 <&gcc PCIE_2_POR_RESET>,
-				 <&gcc PCIE_2_PCI_RESET>,
-				 <&gcc PCIE_2_PHY_RESET>,
-				 <&gcc PCIE_2_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie2_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>;
-
-			phy-tx0-term-offset = <7>;
-
-			status = "disabled";
-		};
-
-		adm_dma: dma@18300000 {
-			compatible = "qcom,adm";
-			reg = <0x18300000 0x100000>;
-			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-
-			clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
-			clock-names = "core", "iface";
-
-			resets = <&gcc ADM0_RESET>,
-				 <&gcc ADM0_PBUS_RESET>,
-				 <&gcc ADM0_C0_RESET>,
-				 <&gcc ADM0_C1_RESET>,
-				 <&gcc ADM0_C2_RESET>;
-			reset-names = "clk", "pbus", "c0", "c1", "c2";
-			qcom,ee = <0>;
-
-			status = "disabled";
-		};
-
-		nand: nand@1ac00000 {
-			compatible = "qcom,ipq806x-nand";
-			reg = <0x1ac00000 0x800>;
-
-			clocks = <&gcc EBI2_CLK>,
-				 <&gcc EBI2_AON_CLK>;
-			clock-names = "core", "aon";
-
-			dmas = <&adm_dma 3>;
-			dma-names = "rxtx";
-			qcom,cmd-crci = <15>;
-			qcom,data-crci = <3>;
-
-			status = "disabled";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		nss_common: syscon@03000000 {
-			compatible = "syscon";
-			reg = <0x03000000 0x0000FFFF>;
-		};
-
-		qsgmii_csr: syscon@1bb00000 {
-			compatible = "syscon";
-			reg = <0x1bb00000 0x000001FF>;
-		};
-
-		stmmac_axi_setup: stmmac-axi-config {
-			snps,wr_osr_lmt = <7>;
-			snps,rd_osr_lmt = <7>;
-			snps,blen = <16 0 0 0 0 0 0>;
-		};
-
-		gmac0: ethernet@37000000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37000000 0x200000>;
-			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE1_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE1_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac1: ethernet@37200000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37200000 0x200000>;
-			interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE2_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE2_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac2: ethernet@37400000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37400000 0x200000>;
-			interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE3_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE3_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac3: ethernet@37600000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37600000 0x200000>;
-			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE4_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE4_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		/* Temporary fixed regulator */
-		vsdcc_fixed: vsdcc-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "SDCC Power";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-		};
-
-		sdcc1bam:dma@12402000 {
-			compatible = "qcom,bam-v1.3.0";
-			reg = <0x12402000 0x8000>;
-			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&gcc SDC1_H_CLK>;
-			clock-names = "bam_clk";
-			#dma-cells = <1>;
-			qcom,ee = <0>;
-                };
-
-		sdcc3bam:dma@12182000 {
-			compatible = "qcom,bam-v1.3.0";
-			reg = <0x12182000 0x8000>;
-			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&gcc SDC3_H_CLK>;
-			clock-names = "bam_clk";
-			#dma-cells = <1>;
-			qcom,ee = <0>;
-		};
-
-		amba {
-			compatible = "arm,amba-bus";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			sdcc1: sdcc@12400000 {
-				status          = "disabled";
-				compatible      = "arm,pl18x", "arm,primecell";
-				arm,primecell-periphid = <0x00051180>;
-				reg             = <0x12400000 0x2000>;
-				interrupts      = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-names = "cmd_irq";
-				clocks          = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
-				clock-names     = "mclk", "apb_pclk";
-				bus-width       = <8>;
-				max-frequency   = <96000000>;
-				non-removable;
-				cap-sd-highspeed;
-				cap-mmc-highspeed;
-				vmmc-supply = <&vsdcc_fixed>;
-				dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
-				dma-names = "tx", "rx";
-			};
-
-			sdcc3: sdcc@12180000 {
-				compatible      = "arm,pl18x", "arm,primecell";
-				arm,primecell-periphid = <0x00051180>;
-				status          = "disabled";
-				reg             = <0x12180000 0x2000>;
-				interrupts      = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-names = "cmd_irq";
-				clocks          = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>;
-				clock-names     = "mclk", "apb_pclk";
-				bus-width       = <8>;
-				cap-sd-highspeed;
-				cap-mmc-highspeed;
-				max-frequency   = <192000000>;
-				#mmc-ddr-1_8v;
-				sd-uhs-sdr104;
-				sd-uhs-ddr50;
-				vqmmc-supply = <&vsdcc_fixed>;
-				dmas = <&sdcc3bam 2>, <&sdcc3bam 1>;
-				dma-names = "tx", "rx";
-			};
-		};
-	};
-
-	sfpb_mutex: sfpb-mutex {
-		compatible = "qcom,sfpb-mutex";
-		syscon = <&sfpb_mutex_block 4 4>;
-
-		#hwlock-cells = <1>;
-	};
-
-	smem {
-		compatible = "qcom,smem";
-		memory-region = <&smem>;
-		hwlocks = <&sfpb_mutex 3>;
-	};
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
deleted file mode 100644
index 2cff2f65bc..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ /dev/null
@@ -1,371 +0,0 @@
-#include "qcom-ipq8065.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "ZyXEL NBG6817";
-	compatible = "zyxel,nbg6817", "qcom,ipq8065", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-		sdcc1 = &sdcc1;
-
-		led-boot = &power;
-		led-failsafe = &power;
-		led-running = &power;
-		led-upgrade = &power;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd";
-		stdout-path = "serial0:115200n8";
-		append-rootblock = "root=/dev/mmcblk0p";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio53", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				mux {
-					pins = "gpio9", "gpio26", "gpio33", "gpio64";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-down;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-
-				clk {
-					pins = "gpio1";
-					input-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-
-				tx {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
-					input-disable;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-
-				cs {
-					pins = "gpio20";
-					drive-strength = <12>;
-				};
-			};
-
-			usb0_pwr_en_pins: usb0_pwr_en_pins {
-				mux {
-					pins = "gpio16", "gpio17";
-					function = "gpio";
-					drive-strength = <12>;
-				};
-
-				pwr {
-					pins = "gpio17";
-					bias-pull-down;
-					output-high;
-				};
-
-				ovc {
-					pins = "gpio16";
-					bias-pull-up;
-				};
-			};
-
-			usb1_pwr_en_pins: usb1_pwr_en_pins {
-				mux {
-					pins = "gpio14", "gpio15";
-					function = "gpio";
-					drive-strength = <12>;
-				};
-
-				pwr {
-					pins = "gpio14";
-					bias-pull-down;
-					output-high;
-				};
-
-				ovc {
-					pins = "gpio15";
-					bias-pull-up;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		gsbi5: gsbi@1a200000 {
-			qcom,mode = <GSBI_PROT_SPI>;
-			status = "okay";
-
-			spi4: spi@1a280000 {
-				status = "okay";
-
-				pinctrl-0 = <&spi_pins>;
-				pinctrl-names = "default";
-
-				cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-				flash: m25p80@0 {
-					compatible = "jedec,spi-nor";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					spi-max-frequency = <51200000>;
-					reg = <0>;
-
-					partitions {
-						compatible = "qcom,smem";
-					};
-				};
-			};
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb0_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb1_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-			pinctrl-0 = <&pcie0_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-			pinctrl-0 = <&pcie1_pins>;
-			pinctrl-names = "default";
-			force_gen1 = <1>;
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0xaa545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
-					0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
-					0x00978 0x19008643  /* QM_PORT1_CTRL0 */
-					0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
-					0x00980 0x19008643  /* QM_PORT2_CTRL0 */
-					0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
-					0x00988 0x19008643  /* QM_PORT3_CTRL0 */
-					0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
-					0x00990 0x19008643  /* QM_PORT4_CTRL0 */
-					0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
-					0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
-					0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
-					0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
-					0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-				qca,ar8327-initvals = <
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x0000c 0x80        /* PAD6_MODE */
-					>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-			qcom,phy_mdio_addr = <4>;
-			qcom,poll_required = <0>;
-			qcom,rgmii_delay = <1>;
-			qcom,phy_mii_type = <0>;
-			qcom,emulation = <0>;
-			qcom,irq = <255>;
-			mdiobus = <&mdio0>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-			qcom,phy_mdio_addr = <0>;	/* none */
-			qcom,poll_required = <0>;	/* no polling */
-			qcom,rgmii_delay = <0>;
-			qcom,phy_mii_type = <1>;
-			qcom,emulation = <0>;
-			qcom,irq = <258>;
-			mdiobus = <&mdio0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		amba {
-			sdcc1: sdcc@12400000 {
-				status = "okay";
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-			linux,input-type = <EV_SW>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		internet {
-			label = "white:internet";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-
-		power: power {
-			label = "white:power";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		wifi2g {
-			label = "amber:wifi2g";
-			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
-		};
-
-		/* wifi2g amber from the manual is missing */
-
-		wifi5g {
-			label = "amber:wifi5g";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		/* wifi5g amber from the manual is missing */
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
deleted file mode 100644
index 50ffcdab07..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ /dev/null
@@ -1,531 +0,0 @@
-#include "qcom-ipq8065.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Netgear Nighthawk X4S R7800";
-	compatible = "netgear,r7800", "qcom,ipq8065", "qcom,ipq8064";
-
-	memory@0 {
-		reg = <0x42000000 0x1e000000>;
-		device_type = "memory";
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		rsvd@41200000 {
-			reg = <0x41200000 0x300000>;
-			no-map;
-		};
-
-		rsvd@5fe00000 {
-			reg = <0x5fe00000 0x200000>;
-			reusable;
-		};
-	};
-
-	aliases {
-		serial0 = &gsbi4_serial;
-		mdio-gpio0 = &mdio0;
-
-		led-boot = &power_white;
-		led-failsafe = &power_amber;
-		led-running = &power_white;
-		led-upgrade = &power_amber;
-		label-mac-device = &gmac2;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	soc {
-		pinmux@800000 {
-			button_pins: button_pins {
-				mux {
-					pins = "gpio6", "gpio54", "gpio65";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			led_pins: led_pins {
-				pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-					"gpio24","gpio26", "gpio53", "gpio64";
-				function = "gpio";
-				drive-strength = <2>;
-				bias-pull-down;
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-
-				clk {
-					pins = "gpio1";
-					input-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-
-				tx {
-					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
-					input-disable;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					bias-pull-down;
-				};
-
-				data {
-					pins = "gpio18", "gpio19";
-					drive-strength = <10>;
-				};
-
-				cs {
-					pins = "gpio20";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				clk {
-					pins = "gpio21";
-					drive-strength = <12>;
-				};
-			};
-
-			spi6_pins: spi6_pins {
-				mux {
-					pins = "gpio55", "gpio56", "gpio58";
-					function = "gsbi6";
-					bias-pull-down;
-				};
-
-				mosi {
-					pins = "gpio55";
-					drive-strength = <12>;
-				};
-
-				miso {
-					pins = "gpio56";
-					drive-strength = <14>;
-				};
-
-				cs {
-					pins = "gpio57";
-					drive-strength = <12>;
-					bias-pull-up;
-				};
-
-				clk {
-					pins = "gpio58";
-					drive-strength = <12>;
-				};
-
-				reset {
-					pins = "gpio33";
-					drive-strength = <10>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-
-			usb0_pwr_en_pins: usb0_pwr_en_pins {
-				mux {
-					pins = "gpio15";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-
-			usb1_pwr_en_pins: usb1_pwr_en_pins {
-				mux {
-					pins = "gpio16", "gpio68";
-					function = "gpio";
-					drive-strength = <12>;
-					bias-pull-down;
-					output-high;
-				};
-			};
-		};
-
-		gsbi@16300000 {
-			qcom,mode = <GSBI_PROT_I2C_UART>;
-			status = "okay";
-			serial@16340000 {
-				status = "okay";
-			};
-			/*
-			 * The i2c device on gsbi4 should not be enabled.
-			 * On ipq806x designs gsbi4 i2c is meant for exclusive
-			 * RPM usage. Turning this on in kernel manifests as
-			 * i2c failure for the RPM.
-			 */
-		};
-
-		sata-phy@1b400000 {
-			status = "okay";
-		};
-
-		sata@29000000 {
-			ports-implemented = <0x1>;
-			status = "okay";
-		};
-
-		usb3_0: usb3@110f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb0_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-
-			pinctrl-0 = <&usb1_pwr_en_pins>;
-			pinctrl-names = "default";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-
-			bridge@0,0 {
-				reg = <0x00000000 0 0 0 0>;
-				#address-cells = <3>;
-				#size-cells = <2>;
-				ranges;
-
-				wifi@1,0 {
-					compatible = "pci168c,0046";
-					reg = <0x00010000 0 0 0 0>;
-
-					mtd-mac-address = <&art 6>;
-					mtd-mac-address-increment = <(1)>;
-				};
-			};
-		};
-
-		pcie1: pci@1b700000 {
-			status = "okay";
-			force_gen1 = <1>;
-
-			bridge@0,0 {
-				reg = <0x00000000 0 0 0 0>;
-				#address-cells = <3>;
-				#size-cells = <2>;
-				ranges;
-
-				wifi@1,0 {
-					compatible = "pci168c,0046";
-					reg = <0x00010000 0 0 0 0>;
-
-					mtd-mac-address = <&art 6>;
-					mtd-mac-address-increment = <(2)>;
-				};
-			};
-		};
-
-		nand@1ac00000 {
-			status = "okay";
-
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-
-			cs0 {
-				reg = <0>;
-				compatible = "qcom,nandcs";
-
-				nand-ecc-strength = <4>;
-				nand-bus-width = <8>;
-				nand-ecc-step-size = <512>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					qcadata@0 {
-						label = "qcadata";
-						reg = <0x0000000 0x0c80000>;
-						read-only;
-					};
-
-					APPSBL@c80000 {
-						label = "APPSBL";
-						reg = <0x0c80000 0x0500000>;
-						read-only;
-					};
-
-					APPSBLENV@1180000 {
-						label = "APPSBLENV";
-						reg = <0x1180000 0x0080000>;
-						read-only;
-					};
-
-					art: art@1200000 {
-						label = "art";
-						reg = <0x1200000 0x0140000>;
-						read-only;
-					};
-
-					artbak: art@1340000 {
-						label = "artbak";
-						reg = <0x1340000 0x0140000>;
-						read-only;
-					};
-
-					kernel@1480000 {
-						label = "kernel";
-						reg = <0x1480000 0x0400000>;
-					};
-
-					ubi@1880000 {
-						label = "ubi";
-						reg = <0x1880000 0x6080000>;
-					};
-
-					reserve@7900000 {
-						label = "reserve";
-						reg = <0x7900000 0x0700000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
-				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0xaa545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
-					0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
-					0x00978 0x19008643  /* QM_PORT1_CTRL0 */
-					0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
-					0x00980 0x19008643  /* QM_PORT2_CTRL0 */
-					0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
-					0x00988 0x19008643  /* QM_PORT3_CTRL0 */
-					0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
-					0x00990 0x19008643  /* QM_PORT4_CTRL0 */
-					0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
-					0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
-					0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
-					0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
-					0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
-					>;
-				qca,ar8327-vlans = <
-					0x1	0x5e	    /* VLAN1 Ports 1/2/3/4/6 */
-					0x2	0x21	    /* VLAN2 Ports 0/5 */
-				>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-				qca,ar8327-initvals = <
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x0000c 0x80        /* PAD6_MODE */
-					>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,id = <1>;
-			qcom,phy_mdio_addr = <4>;
-			qcom,poll_required = <0>;
-			qcom,rgmii_delay = <1>;
-			qcom,phy_mii_type = <0>;
-			qcom,emulation = <0>;
-			qcom,irq = <255>;
-			mdiobus = <&mdio0>;
-
-			pinctrl-0 = <&rgmii2_pins>;
-			pinctrl-names = "default";
-
-			mtd-mac-address = <&art 6>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		gmac2: ethernet@37400000 {
-			status = "okay";
-			phy-mode = "sgmii";
-			qcom,id = <2>;
-			qcom,phy_mdio_addr = <0>;	/* none */
-			qcom,poll_required = <0>;	/* no polling */
-			qcom,rgmii_delay = <0>;
-			qcom,phy_mii_type = <1>;
-			qcom,emulation = <0>;
-			qcom,irq = <258>;
-			mdiobus = <&mdio0>;
-
-			mtd-mac-address = <&art 0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wifi {
-			label = "wifi";
-			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-			debounce-interval = <60>;
-			wakeup-source;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-			wakeup-source;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-			wakeup-source;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
-
-		power_white: power_white {
-			label = "white:power";
-			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-			default-state = "keep";
-		};
-
-		power_amber: power_amber {
-			label = "amber:power";
-			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_white {
-			label = "white:wan";
-			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_amber {
-			label = "amber:wan";
-			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb1 {
-			label = "white:usb1";
-			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-		};
-
-		usb2 {
-			label = "white:usb2";
-			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		esata {
-			label = "white:esata";
-			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		wifi {
-			label = "white:wifi";
-			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "white:wps";
-			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&adm_dma {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi
deleted file mode 100644
index fdd4697887..0000000000
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "qcom-ipq8064-v2.0.dtsi"
-
-/ {
-	model = "Qualcomm IPQ8065";
-	compatible = "qcom,ipq8065", "qcom,ipq8064";
-
-	soc: soc {
-
-		rpm@108000 {
-
-			regulators {
-
-				smb208_s2a: s2a {
-					regulator-min-microvolt = <775000>;
-					regulator-max-microvolt = <1275000>;
-				};
-
-				smb208_s2b: s2b {
-					regulator-min-microvolt = <775000>;
-					regulator-max-microvolt = <1275000>;
-				};
-			};
-		};
-	};
-	
-	cpus {
-		qcom,l2 {
-			qcom,l2-cpufreq = <384000000 600000000 1400000000>;
-		};
-
-		idle-states {
-			CPU_SPC: spc {
-				status = "disabled";
-			};
-		};
-	};
-};
-
-&opp_table0 {
-	compatible = "operating-points-v2-qcom-cpu";
-	nvmem-cells = <&speedbin_efuse>;
-
-	/* 
-	 * On ipq8065 1.2 ghz freq is not present
-	 * Remove it to make cpufreq work and not
-	 * complain for missing definition
-	 */
-
-	/delete-node/opp-1200000000;
-
-	opp-384000000 {
-		opp-hz = /bits/ 64 <384000000>;
-		opp-microvolt-speed0-pvs0-v0 = <975000>;
-		opp-microvolt-speed0-pvs1-v0 = <950000>;
-		opp-microvolt-speed0-pvs2-v0 = <925000>;
-		opp-microvolt-speed0-pvs3-v0 = <900000>;
-		opp-microvolt-speed0-pvs4-v0 = <875000>;
-		opp-microvolt-speed0-pvs5-v0 = <825000>;
-		opp-microvolt-speed0-pvs6-v0 = <775000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-
-	opp-600000000 {
-		opp-hz = /bits/ 64 <600000000>;
-		opp-microvolt-speed0-pvs0-v0 = <1000000>;
-		opp-microvolt-speed0-pvs1-v0 = <975000>;
-		opp-microvolt-speed0-pvs2-v0 = <950000>;
-		opp-microvolt-speed0-pvs3-v0 = <925000>;
-		opp-microvolt-speed0-pvs4-v0 = <900000>;
-		opp-microvolt-speed0-pvs5-v0 = <850000>;
-		opp-microvolt-speed0-pvs6-v0 = <800000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-
-	opp-800000000 {
-		opp-hz = /bits/ 64 <800000000>;
-		opp-microvolt-speed0-pvs0-v0 = <1050000>;
-		opp-microvolt-speed0-pvs1-v0 = <1025000>;
-		opp-microvolt-speed0-pvs2-v0 = <1000000>;
-		opp-microvolt-speed0-pvs3-v0 = <975000>;
-		opp-microvolt-speed0-pvs4-v0 = <950000>;
-		opp-microvolt-speed0-pvs5-v0 = <900000>;
-		opp-microvolt-speed0-pvs6-v0 = <850000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-
-	opp-1000000000 {
-		opp-hz = /bits/ 64 <1000000000>;
-		opp-microvolt-speed0-pvs0-v0 = <1100000>;
-		opp-microvolt-speed0-pvs1-v0 = <1075000>;
-		opp-microvolt-speed0-pvs2-v0 = <1050000>;
-		opp-microvolt-speed0-pvs3-v0 = <1025000>;
-		opp-microvolt-speed0-pvs4-v0 = <1000000>;
-		opp-microvolt-speed0-pvs5-v0 = <950000>;
-		opp-microvolt-speed0-pvs6-v0 = <900000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-
-	opp-1400000000 {
-		opp-hz = /bits/ 64 <1400000000>;
-		opp-microvolt-speed0-pvs0-v0 = <1175000>;
-		opp-microvolt-speed0-pvs1-v0 = <1150000>;
-		opp-microvolt-speed0-pvs2-v0 = <1125000>;
-		opp-microvolt-speed0-pvs3-v0 = <1100000>;
-		opp-microvolt-speed0-pvs4-v0 = <1075000>;
-		opp-microvolt-speed0-pvs5-v0 = <1025000>;
-		opp-microvolt-speed0-pvs6-v0 = <975000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-
-	opp-1725000000 {
-		opp-hz = /bits/ 64 <1725000000>;
-		opp-microvolt-speed0-pvs0-v0 = <1262500>;
-		opp-microvolt-speed0-pvs1-v0 = <1225000>;
-		opp-microvolt-speed0-pvs2-v0 = <1200000>;
-		opp-microvolt-speed0-pvs3-v0 = <1175000>;
-		opp-microvolt-speed0-pvs4-v0 = <1150000>;
-		opp-microvolt-speed0-pvs5-v0 = <1100000>;
-		opp-microvolt-speed0-pvs6-v0 = <1050000>;
-		opp-supported-hw = <0x1>;
-		clock-latency-ns = <100000>;
-	};
-};