ipq40xx: build DEVICE_DTS based on SOC and device name
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Sat, 21 Dec 2019 00:07:06 +0000 (01:07 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 27 Dec 2019 17:00:15 +0000 (18:00 +0100)
This patch uses the SOC variable to calculate DTS names automatically
based on the SOC and the device definition node name.

This reduces redundancy and (by having to choose DTS name
appropriately) will unify the naming of a device in different places
(image/Makefile, DTS name, compatible, image name). This is supposed
to make life easier for developers and reviewers.

Since the kernel uses a "soc-device.dts" scheme for this target, we
use this for the derivation of DEVICE_DTS, too, and rename the files
not having followed it so far.

Note that for some devices the kernel itself is inconsistent, leaving
us with a manual overwrite for ap.dk01.1-c1 and ap.dk04.1-c1.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
27 files changed:
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts [deleted file]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi [new file with mode: 0644]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts [deleted file]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts [deleted file]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts [deleted file]
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi [new file with mode: 0644]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts [deleted file]
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019.dtsi [deleted file]
target/linux/ipq40xx/image/Makefile
target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch
target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
deleted file mode 100644 (file)
index 9576e14..0000000
+++ /dev/null
@@ -1,289 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "AVM FRITZ!Box 4040";
-       compatible = "avm,fritzbox-4040", "qcom,ipq4019";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &flash;
-               led-running = &power;
-               led-upgrade = &flash;
-       };
-
-       soc {
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               qca8075: ess-switch@c000000 {
-                       status = "okay";
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-
-                       enable-usb-power {
-                               gpio-hog;
-                               line-name = "enable USB3 power";
-                               gpios = <7 GPIO_ACTIVE_HIGH>;
-                               output-high;
-                       };
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       switch-leds {
-               compatible = "gpio-leds";
-
-               wlan {
-                       label = "fritz4040:green:wlan";
-                       gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               panic: info_red {
-                       label = "fritz4040:red:info";
-                       gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               wan {
-                       label = "fritz4040:green:wan";
-                       gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               power: power {
-                       label = "fritz4040:green:power";
-                       gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>;
-               };
-
-               lan {
-                       label = "fritz4040:green:lan";
-                       gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>;
-               };
-
-               flash: info_amber {
-                       label = "fritz4040:amber:info";
-                       gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               status = "okay";
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "APPSBLENV"; /* uboot env - empty */
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition6@f0000 {
-                               label = "urlader"; /* APPSBL */
-                               reg = <0x000f0000 0x0002dc000>;
-                               read-only;
-                       };
-                       partition7@11dc00 {
-                               /* make a backup of this partition! */
-                               label = "urlader_config";
-                               reg = <0x0011dc00 0x00002400>;
-                               read-only;
-                       };
-                       partition8@120000 {
-                               label = "tffs1";
-                               reg = <0x00120000 0x00080000>;
-                               read-only;
-                       };
-                       partition9@1a0000 {
-                               label = "tffs2";
-                               reg = <0x001a0000 0x00080000>;
-                               read-only;
-                       };
-                       partition10@220000 {
-                               label = "uboot";
-                               reg = <0x00220000 0x00080000>;
-                               read-only;
-                       };
-                       partition11@2A0000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x002a0000 0x01c60000>;
-                       };
-                       partition12@1f00000 {
-                               label = "jffs2";
-                               reg = <0x01f00000 0x00100000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
new file mode 100644 (file)
index 0000000..9576e14
--- /dev/null
@@ -0,0 +1,289 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+       model = "AVM FRITZ!Box 4040";
+       compatible = "avm,fritzbox-4040", "qcom,ipq4019";
+
+       aliases {
+               led-boot = &power;
+               led-failsafe = &flash;
+               led-running = &power;
+               led-upgrade = &flash;
+       };
+
+       soc {
+               mdio@90000 {
+                       status = "okay";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2@60f8800 {
+                       status = "okay";
+               };
+
+               usb3@8af8800 {
+                       status = "okay";
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               qca8075: ess-switch@c000000 {
+                       status = "okay";
+
+                       #gpio-cells = <2>;
+                       gpio-controller;
+
+                       enable-usb-power {
+                               gpio-hog;
+                               line-name = "enable USB3 power";
+                               gpios = <7 GPIO_ACTIVE_HIGH>;
+                               output-high;
+                       };
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               wlan {
+                       label = "wlan";
+                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RFKILL>;
+               };
+
+               wps {
+                       label = "wps";
+                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
+       };
+
+       switch-leds {
+               compatible = "gpio-leds";
+
+               wlan {
+                       label = "fritz4040:green:wlan";
+                       gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>;
+               };
+
+               panic: info_red {
+                       label = "fritz4040:red:info";
+                       gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
+               };
+
+               wan {
+                       label = "fritz4040:green:wan";
+                       gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>;
+               };
+
+               power: power {
+                       label = "fritz4040:green:power";
+                       gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>;
+               };
+
+               lan {
+                       label = "fritz4040:green:lan";
+                       gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>;
+               };
+
+               flash: info_amber {
+                       label = "fritz4040:amber:info";
+                       gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&tlmm {
+       serial_pins: serial_pinmux {
+               mux {
+                       pins = "gpio60", "gpio61";
+                       function = "blsp_uart0";
+                       bias-disable;
+               };
+       };
+
+       spi_0_pins: spi_0_pinmux {
+               mux {
+                       function = "blsp_spi0";
+                       pins = "gpio55", "gpio56", "gpio57";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+
+               mux_cs {
+                       function = "gpio";
+                       pins = "gpio54";
+                       drive-strength = <2>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp1_spi1 { /* BLSP1 QUP1 */
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+               spi-max-frequency = <24000000>;
+               status = "okay";
+               m25p,fast-read;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition0@0 {
+                               label = "SBL1";
+                               reg = <0x00000000 0x00040000>;
+                               read-only;
+                       };
+                       partition1@40000 {
+                               label = "MIBIB";
+                               reg = <0x00040000 0x00020000>;
+                               read-only;
+                       };
+                       partition2@60000 {
+                               label = "QSEE";
+                               reg = <0x00060000 0x00060000>;
+                               read-only;
+                       };
+                       partition3@c0000 {
+                               label = "CDT";
+                               reg = <0x000c0000 0x00010000>;
+                               read-only;
+                       };
+                       partition4@d0000 {
+                               label = "DDRPARAMS";
+                               reg = <0x000d0000 0x00010000>;
+                               read-only;
+                       };
+                       partition5@e0000 {
+                               label = "APPSBLENV"; /* uboot env - empty */
+                               reg = <0x000e0000 0x00010000>;
+                               read-only;
+                       };
+                       partition6@f0000 {
+                               label = "urlader"; /* APPSBL */
+                               reg = <0x000f0000 0x0002dc000>;
+                               read-only;
+                       };
+                       partition7@11dc00 {
+                               /* make a backup of this partition! */
+                               label = "urlader_config";
+                               reg = <0x0011dc00 0x00002400>;
+                               read-only;
+                       };
+                       partition8@120000 {
+                               label = "tffs1";
+                               reg = <0x00120000 0x00080000>;
+                               read-only;
+                       };
+                       partition9@1a0000 {
+                               label = "tffs2";
+                               reg = <0x001a0000 0x00080000>;
+                               read-only;
+                       };
+                       partition10@220000 {
+                               label = "uboot";
+                               reg = <0x00220000 0x00080000>;
+                               read-only;
+                       };
+                       partition11@2A0000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x002a0000 0x01c60000>;
+                       };
+                       partition12@1f00000 {
+                               label = "jffs2";
+                               reg = <0x01f00000 0x00100000>;
+                       };
+               };
+       };
+};
+
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};
+
+&wifi1 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts
new file mode 100644 (file)
index 0000000..8db5588
--- /dev/null
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019-e2600ac.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       model = "Qxwlan E2600AC c1";
+       compatible = "qxwlan,e2600ac-c1", "qcom,ipq4019";
+};
+
+&blsp1_spi1 {
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
+
+       flash@0 {
+               reg = <0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <24000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "0:SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+                       partition@40000 {
+                               label = "0:MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+                       partition@60000 {
+                               label = "0:QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "0:CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+                       partition@d0000 {
+                               label = "0:DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+                       partition@e0000 {
+                               label = "0:APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+                       partition@f0000 {
+                               label = "0:APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+                       partition@170000 {
+                               label = "0:ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+                       partition@180000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x180000 0x1e80000>;
+                       };
+               };
+       };
+};
+
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts
new file mode 100644 (file)
index 0000000..d88de61
--- /dev/null
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019-e2600ac.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       model = "Qxwlan E2600AC c2";
+       compatible = "qxwlan,e2600ac-c2", "qcom,ipq4019";
+};
+
+&blsp1_spi1 {
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
+
+       flash@0 {
+               reg = <0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <24000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "0:SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+                       partition@40000 {
+                               label = "0:MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+                       partition@60000 {
+                               label = "0:QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "0:CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+                       partition@d0000 {
+                               label = "0:DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+                       partition@e0000 {
+                               label = "0:APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+                       partition@f0000 {
+                               label = "0:APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+                       partition@170000 {
+                               label = "0:ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&nand {
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       nand@0 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "ubi";
+                               reg = <0x00000000 0x04000000>;
+                       };
+               };
+       };
+};
+
+&tlmm {
+       nand_pins: nand-pins {
+
+               pullups {
+                       pins = "gpio53", "gpio58", "gpio59";
+                       function = "qpic";
+                       bias-pull-up;
+               };
+
+               pulldowns {
+                       pins = "gpio54", "gpio55", "gpio56",
+                               "gpio57", "gpio60", "gpio61",
+                               "gpio62", "gpio63", "gpio64",
+                               "gpio65", "gpio66", "gpio67",
+                               "gpio68", "gpio69";
+                       function = "qpic";
+                       bias-pull-down;
+               };
+       };
+};
+
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi
new file mode 100644 (file)
index 0000000..527df7e
--- /dev/null
@@ -0,0 +1,262 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+
+       model = "Qxwlan E2600AC";
+       compatible = "qcom,ipq4019";
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x10000000>; /* 256MB */
+       };
+
+       soc {
+               mdio@90000 {
+                       status = "okay";
+                       pinctrl-0 = <&mdio_pins>;
+                       pinctrl-names = "default";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       /* select hostmode */
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+                       status = "okay";
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2: usb2@60f8800 {
+                       status = "okay";
+
+                       dwc3@6000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb2_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               serial@78af000 {
+                       pinctrl-0 = <&serial_0_pins>;
+                       pinctrl-names = "default";
+                       status = "okay";
+               };
+
+               serial@78b0000 {
+                       pinctrl-0 = <&serial_1_pins>;
+                       pinctrl-names = "default";
+                       status = "okay";
+               };
+
+               i2c@78b7000 { /* BLSP1 QUP2 */
+                       pinctrl-0 = <&i2c_0_pins>;
+                       pinctrl-names = "default";
+
+                       status = "okay";
+               };
+
+               usb3: usb3@8af8800 {
+                       status = "okay";
+
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb3_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               usb3_port2: port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               ess-switch@c000000 {
+                       status = "okay";
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+
+               leds {
+                       compatible = "gpio-leds";
+
+                       led1 {
+                               label = "e2600ac:green:wlan0";
+                               gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led2 {
+                               label = "e2600ac:green:wlan1";
+                               gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led3 {
+                               label = "e2600ac:green:usb";
+                               gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
+                               trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
+                               linux,default-trigger = "usbport";
+                       };
+
+                       led4 {
+                               label = "e2600ac:green:ctrl1";
+                               gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led5 {
+                               label = "e2600ac:green:ctrl2";
+                               gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led6 {
+                               label = "e2600ac:green:ctrl3";
+                               gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
+                       };
+               };
+
+               keys {
+                       compatible = "gpio-keys";
+
+                       reset {
+                               label = "reset";
+                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                               linux,code = <KEY_RESTART>;
+                       };
+               };
+       };
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&tlmm {
+       i2c_0_pins: i2c-0-pinmux {
+               mux {
+                       pins = "gpio20", "gpio21";
+                       function = "blsp_i2c0";
+                       bias-disable;
+               };
+       };
+
+       mdio_pins: mdio_pinmux {
+               mux_1 {
+                       pins = "gpio6";
+                       function = "mdio";
+                       bias-pull-up;
+               };
+               mux_2 {
+                       pins = "gpio7";
+                       function = "mdc";
+                       bias-pull-up;
+               };
+       };
+
+       serial_0_pins: serial0-pinmux {
+               mux {
+                       pins = "gpio16", "gpio17";
+                       function = "blsp_uart0";
+                       bias-disable;
+               };
+       };
+
+       serial_1_pins: serial1_pinmux {
+               mux {
+                       pins = "gpio8", "gpio9";
+                       function = "blsp_uart1";
+                       bias-disable;
+               };
+       };
+
+       spi_0_pins: spi_0_pinmux {
+               pinmux {
+                       function = "blsp_spi0";
+                       pins = "gpio13", "gpio14", "gpio15";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+               pinmux_cs {
+                       function = "gpio";
+                       pins = "gpio12";
+                       drive-strength = <2>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
+};
+
+&wifi1 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
+};
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts
new file mode 100644 (file)
index 0000000..cfc3037
--- /dev/null
@@ -0,0 +1,399 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/*
+ * Device Tree Source for Linksys EA8300 (Dallas)
+ *
+ * Copyright (C) 2019 Jeff Kletsky
+ *
+ */
+
+/dts-v1/;
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+       model = "Linksys EA8300 (Dallas)";
+       compatible = "linksys,ea8300", "qcom,ipq4019";
+
+
+       aliases {
+               led-boot = &led_wps_amber;
+               led-failsafe = &led_wps;
+               led-running = &led_linksys;
+               led-upgrade = &led_world;
+               serial0 = &blsp1_uart1;
+       };
+
+
+       leds {
+               compatible = "gpio-leds";
+
+               // Retain node names from running OEM on EA8300
+
+               // Front panel LEDs, top to bottom
+
+               led_plug: diag {
+                       label = "ea8300:amber:plug";
+                       gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_world: internet {
+                       label = "ea8300:amber:world";
+                       gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_wps: wps {
+                       label = "ea8300:white:wps";
+                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_wps_amber: wps_amber {
+                       label = "ea8300:amber:wps";
+                       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
+               };
+
+               led_linksys: pwr {
+                       label = "ea8300:white:linksys";
+                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
+               };
+
+               // On back panel, above USB socket
+
+               led_usb: usb {
+                       label = "ea8300:green:usb";
+                       gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&usb3_port1>, <&usb3_port2>,
+                                         <&usb2_port1>;
+                       linux,default-trigger = "usbport";
+               };
+       };
+
+
+       keys {
+               compatible = "gpio-keys";
+
+               button@0 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+               };
+
+               button@1 {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+
+       //
+       // OEM U-Boot provides either
+       // init=/sbin/init rootfstype=ubifs ubi.mtd=11,2048 \
+       //                 root=ubi0:ubifs rootwait rw
+       // or the same with ubi.mtd=13,2048
+       //
+
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
+       };
+
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x10000000>;
+       };
+
+
+       soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
+               mdio@90000 {
+                       status = "okay";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2@60f8800 {
+                       status = "okay";
+
+                       dwc3@6000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb2_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               usb3@8af8800 {
+                       status = "okay";
+
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb3_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               usb3_port2: port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               ess-switch@c000000 {
+                       status = "okay";
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+       };
+};
+
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp1_uart1 {
+       status = "okay";
+       pinctrl-0 = <&serial_0_pins>;
+       pinctrl-names = "default";
+
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&nand {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "sbl1";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "mibib";
+                               reg = <0x100000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@200000 {
+                               label = "qsee";
+                               reg = <0x200000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@300000 {
+                               label = "cdt";
+                               reg = <0x300000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@380000 {
+                               label = "appsblenv";
+                               reg = <0x380000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@400000 {
+                               label = "ART";
+                               reg = <0x400000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@480000 {
+                               label = "appsbl";
+                               reg = <0x480000 0x200000>;
+                               read-only;
+                       };
+
+                       partition@680000 {
+                               label = "u_env";
+                               reg = <0x680000 0x80000>;
+                               // writable -- U-Boot environment
+                       };
+
+                       partition@700000 {
+                               label = "s_env";
+                               reg = <0x700000 0x40000>;
+                               // writable -- Boot counter records
+                       };
+
+                       partition@740000 {
+                               label = "devinfo";
+                               reg = <0x740000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@780000 {
+                               label = "kernel";
+                               reg = <0x780000 0x5800000>;
+                       };
+
+                       partition@a80000 {
+                               label = "rootfs";
+                               reg = <0xa80000 0x5500000>;
+                       };
+
+                       partition@5f80000 {
+                               label = "alt_kernel";
+                               reg = <0x5f80000 0x5800000>;
+                       };
+
+                       partition@6280000 {
+                               label = "alt_rootfs";
+                               reg = <0x6280000 0x5500000>;
+                       };
+
+                       partition@b780000 {
+                               label = "sysdiag";
+                               reg = <0xb780000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@b880000 {
+                               label = "syscfg";
+                               reg = <0xb880000 0x4680000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pcie0 {
+       status = "okay";
+
+       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
+       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+
+       bridge@0,0 {
+               reg = <0x00000000 0 0 0 0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               ranges;
+
+               wifi2: wifi@1,0 {
+                       compatible = "qcom,ath10k";
+                       reg = <0x00010000 0 0 0 0>;
+               };
+       };
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&tlmm {
+       serial_0_pins: serial0-pinmux {
+               pins = "gpio16", "gpio17";
+               function = "blsp_uart0";
+               bias-disable;
+       };
+
+       nand_pins: nand_pins {
+               pullups {
+                       pins = "gpio53", "gpio58", "gpio59";
+                       function = "qpic";
+                       bias-pull-up;
+               };
+
+               // gpio61 controls led_usb
+
+               pulldowns {
+                       pins =  "gpio55", "gpio56", "gpio57",
+                               "gpio60", "gpio62", "gpio63",
+                               "gpio64", "gpio65", "gpio66",
+                               "gpio67", "gpio68", "gpio69";
+                       function = "qpic";
+                       bias-pull-down;
+               };
+       };
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
+
+&wifi1 {
+       status = "okay";
+       ieee80211-freq-limit = <5170000 5330000>;
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
+
+&wifi2 {
+       status = "okay";
+       ieee80211-freq-limit = <5490000 5835000>;
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts
deleted file mode 100644 (file)
index cfc3037..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/*
- * Device Tree Source for Linksys EA8300 (Dallas)
- *
- * Copyright (C) 2019 Jeff Kletsky
- *
- */
-
-/dts-v1/;
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Linksys EA8300 (Dallas)";
-       compatible = "linksys,ea8300", "qcom,ipq4019";
-
-
-       aliases {
-               led-boot = &led_wps_amber;
-               led-failsafe = &led_wps;
-               led-running = &led_linksys;
-               led-upgrade = &led_world;
-               serial0 = &blsp1_uart1;
-       };
-
-
-       leds {
-               compatible = "gpio-leds";
-
-               // Retain node names from running OEM on EA8300
-
-               // Front panel LEDs, top to bottom
-
-               led_plug: diag {
-                       label = "ea8300:amber:plug";
-                       gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_world: internet {
-                       label = "ea8300:amber:world";
-                       gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps: wps {
-                       label = "ea8300:white:wps";
-                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps_amber: wps_amber {
-                       label = "ea8300:amber:wps";
-                       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               led_linksys: pwr {
-                       label = "ea8300:white:linksys";
-                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-               };
-
-               // On back panel, above USB socket
-
-               led_usb: usb {
-                       label = "ea8300:green:usb";
-                       gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&usb3_port1>, <&usb3_port2>,
-                                         <&usb2_port1>;
-                       linux,default-trigger = "usbport";
-               };
-       };
-
-
-       keys {
-               compatible = "gpio-keys";
-
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-               };
-
-               button@1 {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-
-       //
-       // OEM U-Boot provides either
-       // init=/sbin/init rootfstype=ubifs ubi.mtd=11,2048 \
-       //                 root=ubi0:ubifs rootwait rw
-       // or the same with ubi.mtd=13,2048
-       //
-
-       chosen {
-               bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
-       };
-
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-};
-
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       status = "okay";
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&nand {
-       status = "okay";
-
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "sbl1";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "mibib";
-                               reg = <0x100000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@200000 {
-                               label = "qsee";
-                               reg = <0x200000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@300000 {
-                               label = "cdt";
-                               reg = <0x300000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@380000 {
-                               label = "appsblenv";
-                               reg = <0x380000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@400000 {
-                               label = "ART";
-                               reg = <0x400000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@480000 {
-                               label = "appsbl";
-                               reg = <0x480000 0x200000>;
-                               read-only;
-                       };
-
-                       partition@680000 {
-                               label = "u_env";
-                               reg = <0x680000 0x80000>;
-                               // writable -- U-Boot environment
-                       };
-
-                       partition@700000 {
-                               label = "s_env";
-                               reg = <0x700000 0x40000>;
-                               // writable -- Boot counter records
-                       };
-
-                       partition@740000 {
-                               label = "devinfo";
-                               reg = <0x740000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@780000 {
-                               label = "kernel";
-                               reg = <0x780000 0x5800000>;
-                       };
-
-                       partition@a80000 {
-                               label = "rootfs";
-                               reg = <0xa80000 0x5500000>;
-                       };
-
-                       partition@5f80000 {
-                               label = "alt_kernel";
-                               reg = <0x5f80000 0x5800000>;
-                       };
-
-                       partition@6280000 {
-                               label = "alt_rootfs";
-                               reg = <0x6280000 0x5500000>;
-                       };
-
-                       partition@b780000 {
-                               label = "sysdiag";
-                               reg = <0xb780000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@b880000 {
-                               label = "syscfg";
-                               reg = <0xb880000 0x4680000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       serial_0_pins: serial0-pinmux {
-               pins = "gpio16", "gpio17";
-               function = "blsp_uart0";
-               bias-disable;
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               // gpio61 controls led_usb
-
-               pulldowns {
-                       pins =  "gpio55", "gpio56", "gpio57",
-                               "gpio60", "gpio62", "gpio63",
-                               "gpio64", "gpio65", "gpio66",
-                               "gpio67", "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi1 {
-       status = "okay";
-       ieee80211-freq-limit = <5170000 5330000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi2 {
-       status = "okay";
-       ieee80211-freq-limit = <5490000 5835000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts
deleted file mode 100644 (file)
index d5ee068..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c1";
-       compatible = "qxwlan,e2600ac-c1", "qcom,ipq4019";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x180000 0x1e80000>;
-                       };
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts
deleted file mode 100644 (file)
index 09ebde9..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c2";
-       compatible = "qxwlan,e2600ac-c2", "qcom,ipq4019";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "ubi";
-                               reg = <0x00000000 0x04000000>;
-                       };
-               };
-       };
-};
-
-&tlmm {
-       nand_pins: nand-pins {
-
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi
deleted file mode 100644 (file)
index 527df7e..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-
-       model = "Qxwlan E2600AC";
-       compatible = "qcom,ipq4019";
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>; /* 256MB */
-       };
-
-       soc {
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               serial@78af000 {
-                       pinctrl-0 = <&serial_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               serial@78b0000 {
-                       pinctrl-0 = <&serial_1_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               i2c@78b7000 { /* BLSP1 QUP2 */
-                       pinctrl-0 = <&i2c_0_pins>;
-                       pinctrl-names = "default";
-
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-
-                       led1 {
-                               label = "e2600ac:green:wlan0";
-                               gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led2 {
-                               label = "e2600ac:green:wlan1";
-                               gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led3 {
-                               label = "e2600ac:green:usb";
-                               gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-                               trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
-                               linux,default-trigger = "usbport";
-                       };
-
-                       led4 {
-                               label = "e2600ac:green:ctrl1";
-                               gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led5 {
-                               label = "e2600ac:green:ctrl2";
-                               gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led6 {
-                               label = "e2600ac:green:ctrl3";
-                               gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
-                       };
-               };
-
-               keys {
-                       compatible = "gpio-keys";
-
-                       reset {
-                               label = "reset";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_RESTART>;
-                       };
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       i2c_0_pins: i2c-0-pinmux {
-               mux {
-                       pins = "gpio20", "gpio21";
-                       function = "blsp_i2c0";
-                       bias-disable;
-               };
-       };
-
-       mdio_pins: mdio_pinmux {
-               mux_1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-               mux_2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial_0_pins: serial0-pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       serial_1_pins: serial1_pinmux {
-               mux {
-                       pins = "gpio8", "gpio9";
-                       function = "blsp_uart1";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio13", "gpio14", "gpio15";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
deleted file mode 100644 (file)
index b2a3294..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "AVM FRITZ!Box 4040";
-       compatible = "avm,fritzbox-4040";
-
-       aliases {
-               led-boot = &power;
-               led-failsafe = &flash;
-               led-running = &power;
-               led-upgrade = &flash;
-               label-mac-device = &gmac0;
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               qca8075: ess-switch@c000000 {
-                       status = "okay";
-
-                       #gpio-cells = <2>;
-                       gpio-controller;
-
-                       enable-usb-power {
-                               gpio-hog;
-                               line-name = "enable USB3 power";
-                               gpios = <7 GPIO_ACTIVE_HIGH>;
-                               output-high;
-                       };
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RFKILL>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       switch-leds {
-               compatible = "gpio-leds";
-
-               wlan {
-                       label = "fritz4040:green:wlan";
-                       gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               panic: info_red {
-                       label = "fritz4040:red:info";
-                       gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               wan {
-                       label = "fritz4040:green:wan";
-                       gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               power: power {
-                       label = "fritz4040:green:power";
-                       gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>;
-               };
-
-               lan {
-                       label = "fritz4040:green:lan";
-                       gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>;
-               };
-
-               flash: info_amber {
-                       label = "fritz4040:amber:info";
-                       gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               mux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               mux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_spi1 { /* BLSP1 QUP1 */
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <24000000>;
-               status = "okay";
-               m25p,fast-read;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition0@0 {
-                               label = "SBL1";
-                               reg = <0x00000000 0x00040000>;
-                               read-only;
-                       };
-                       partition1@40000 {
-                               label = "MIBIB";
-                               reg = <0x00040000 0x00020000>;
-                               read-only;
-                       };
-                       partition2@60000 {
-                               label = "QSEE";
-                               reg = <0x00060000 0x00060000>;
-                               read-only;
-                       };
-                       partition3@c0000 {
-                               label = "CDT";
-                               reg = <0x000c0000 0x00010000>;
-                               read-only;
-                       };
-                       partition4@d0000 {
-                               label = "DDRPARAMS";
-                               reg = <0x000d0000 0x00010000>;
-                               read-only;
-                       };
-                       partition5@e0000 {
-                               label = "APPSBLENV"; /* uboot env - empty */
-                               reg = <0x000e0000 0x00010000>;
-                               read-only;
-                       };
-                       partition6@f0000 {
-                               label = "urlader"; /* APPSBL */
-                               reg = <0x000f0000 0x0002dc000>;
-                               read-only;
-                       };
-                       partition7@11dc00 {
-                               /* make a backup of this partition! */
-                               label = "urlader_config";
-                               reg = <0x0011dc00 0x00002400>;
-                               read-only;
-                       };
-                       partition8@120000 {
-                               label = "tffs1";
-                               reg = <0x00120000 0x00080000>;
-                               read-only;
-                       };
-                       partition9@1a0000 {
-                               label = "tffs2";
-                               reg = <0x001a0000 0x00080000>;
-                               read-only;
-                       };
-                       partition10@220000 {
-                               label = "uboot";
-                               reg = <0x00220000 0x00080000>;
-                               read-only;
-                       };
-                       partition11@2A0000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x002a0000 0x01c60000>;
-                       };
-                       partition12@1f00000 {
-                               label = "jffs2";
-                               reg = <0x01f00000 0x00100000>;
-                       };
-               };
-       };
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
new file mode 100644 (file)
index 0000000..b2a3294
--- /dev/null
@@ -0,0 +1,292 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+       model = "AVM FRITZ!Box 4040";
+       compatible = "avm,fritzbox-4040";
+
+       aliases {
+               led-boot = &power;
+               led-failsafe = &flash;
+               led-running = &power;
+               led-upgrade = &flash;
+               label-mac-device = &gmac0;
+       };
+
+       soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
+               mdio@90000 {
+                       status = "okay";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2@60f8800 {
+                       status = "okay";
+               };
+
+               usb3@8af8800 {
+                       status = "okay";
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               qca8075: ess-switch@c000000 {
+                       status = "okay";
+
+                       #gpio-cells = <2>;
+                       gpio-controller;
+
+                       enable-usb-power {
+                               gpio-hog;
+                               line-name = "enable USB3 power";
+                               gpios = <7 GPIO_ACTIVE_HIGH>;
+                               output-high;
+                       };
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               wlan {
+                       label = "wlan";
+                       gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RFKILL>;
+               };
+
+               wps {
+                       label = "wps";
+                       gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
+       };
+
+       switch-leds {
+               compatible = "gpio-leds";
+
+               wlan {
+                       label = "fritz4040:green:wlan";
+                       gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>;
+               };
+
+               panic: info_red {
+                       label = "fritz4040:red:info";
+                       gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
+               };
+
+               wan {
+                       label = "fritz4040:green:wan";
+                       gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>;
+               };
+
+               power: power {
+                       label = "fritz4040:green:power";
+                       gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>;
+               };
+
+               lan {
+                       label = "fritz4040:green:lan";
+                       gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>;
+               };
+
+               flash: info_amber {
+                       label = "fritz4040:amber:info";
+                       gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&tlmm {
+       serial_pins: serial_pinmux {
+               mux {
+                       pins = "gpio60", "gpio61";
+                       function = "blsp_uart0";
+                       bias-disable;
+               };
+       };
+
+       spi_0_pins: spi_0_pinmux {
+               mux {
+                       function = "blsp_spi0";
+                       pins = "gpio55", "gpio56", "gpio57";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+
+               mux_cs {
+                       function = "gpio";
+                       pins = "gpio54";
+                       drive-strength = <2>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp1_spi1 { /* BLSP1 QUP1 */
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <24000000>;
+               status = "okay";
+               m25p,fast-read;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition0@0 {
+                               label = "SBL1";
+                               reg = <0x00000000 0x00040000>;
+                               read-only;
+                       };
+                       partition1@40000 {
+                               label = "MIBIB";
+                               reg = <0x00040000 0x00020000>;
+                               read-only;
+                       };
+                       partition2@60000 {
+                               label = "QSEE";
+                               reg = <0x00060000 0x00060000>;
+                               read-only;
+                       };
+                       partition3@c0000 {
+                               label = "CDT";
+                               reg = <0x000c0000 0x00010000>;
+                               read-only;
+                       };
+                       partition4@d0000 {
+                               label = "DDRPARAMS";
+                               reg = <0x000d0000 0x00010000>;
+                               read-only;
+                       };
+                       partition5@e0000 {
+                               label = "APPSBLENV"; /* uboot env - empty */
+                               reg = <0x000e0000 0x00010000>;
+                               read-only;
+                       };
+                       partition6@f0000 {
+                               label = "urlader"; /* APPSBL */
+                               reg = <0x000f0000 0x0002dc000>;
+                               read-only;
+                       };
+                       partition7@11dc00 {
+                               /* make a backup of this partition! */
+                               label = "urlader_config";
+                               reg = <0x0011dc00 0x00002400>;
+                               read-only;
+                       };
+                       partition8@120000 {
+                               label = "tffs1";
+                               reg = <0x00120000 0x00080000>;
+                               read-only;
+                       };
+                       partition9@1a0000 {
+                               label = "tffs2";
+                               reg = <0x001a0000 0x00080000>;
+                               read-only;
+                       };
+                       partition10@220000 {
+                               label = "uboot";
+                               reg = <0x00220000 0x00080000>;
+                               read-only;
+                       };
+                       partition11@2A0000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x002a0000 0x01c60000>;
+                       };
+                       partition12@1f00000 {
+                               label = "jffs2";
+                               reg = <0x01f00000 0x00100000>;
+                       };
+               };
+       };
+};
+
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};
+
+&wifi1 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
+};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts
new file mode 100644 (file)
index 0000000..df1df25
--- /dev/null
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019-e2600ac.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       model = "Qxwlan E2600AC c1";
+       compatible = "qxwlan,e2600ac-c1";
+};
+
+&blsp1_spi1 {
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
+
+       flash@0 {
+               reg = <0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <24000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "0:SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+                       partition@40000 {
+                               label = "0:MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+                       partition@60000 {
+                               label = "0:QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "0:CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+                       partition@d0000 {
+                               label = "0:DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+                       partition@e0000 {
+                               label = "0:APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+                       partition@f0000 {
+                               label = "0:APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+                       partition@170000 {
+                               label = "0:ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+                       partition@180000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x180000 0x1e80000>;
+                       };
+               };
+       };
+};
+
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts
new file mode 100644 (file)
index 0000000..9348ef4
--- /dev/null
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019-e2600ac.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       model = "Qxwlan E2600AC c2";
+       compatible = "qxwlan,e2600ac-c2";
+};
+
+&blsp1_spi1 {
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
+
+       flash@0 {
+               reg = <0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <24000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "0:SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+                       partition@40000 {
+                               label = "0:MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+                       partition@60000 {
+                               label = "0:QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "0:CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+                       partition@d0000 {
+                               label = "0:DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+                       partition@e0000 {
+                               label = "0:APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+                       partition@f0000 {
+                               label = "0:APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+                       partition@170000 {
+                               label = "0:ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&nand {
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       nand@0 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "ubi";
+                               reg = <0x00000000 0x04000000>;
+                       };
+               };
+       };
+};
+
+&tlmm {
+       nand_pins: nand-pins {
+
+               pullups {
+                       pins = "gpio53", "gpio58", "gpio59";
+                       function = "qpic";
+                       bias-pull-up;
+               };
+
+               pulldowns {
+                       pins = "gpio54", "gpio55", "gpio56",
+                               "gpio57", "gpio60", "gpio61",
+                               "gpio62", "gpio63", "gpio64",
+                               "gpio65", "gpio66", "gpio67",
+                               "gpio68", "gpio69";
+                       function = "qpic";
+                       bias-pull-down;
+               };
+       };
+};
+
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi
new file mode 100644 (file)
index 0000000..f4af2ba
--- /dev/null
@@ -0,0 +1,266 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ *
+ * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
+ *
+ */
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+
+       model = "Qxwlan E2600AC";
+       compatible = "qcom,ipq4019";
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x10000000>; /* 256MB */
+       };
+
+       soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
+               mdio@90000 {
+                       status = "okay";
+                       pinctrl-0 = <&mdio_pins>;
+                       pinctrl-names = "default";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       /* select hostmode */
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+                       status = "okay";
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2: usb2@60f8800 {
+                       status = "okay";
+
+                       dwc3@6000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb2_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               serial@78af000 {
+                       pinctrl-0 = <&serial_0_pins>;
+                       pinctrl-names = "default";
+                       status = "okay";
+               };
+
+               serial@78b0000 {
+                       pinctrl-0 = <&serial_1_pins>;
+                       pinctrl-names = "default";
+                       status = "okay";
+               };
+
+               i2c@78b7000 { /* BLSP1 QUP2 */
+                       pinctrl-0 = <&i2c_0_pins>;
+                       pinctrl-names = "default";
+
+                       status = "okay";
+               };
+
+               usb3: usb3@8af8800 {
+                       status = "okay";
+
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb3_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               usb3_port2: port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               ess-switch@c000000 {
+                       status = "okay";
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+
+               leds {
+                       compatible = "gpio-leds";
+
+                       led1 {
+                               label = "e2600ac:green:wlan0";
+                               gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led2 {
+                               label = "e2600ac:green:wlan1";
+                               gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led3 {
+                               label = "e2600ac:green:usb";
+                               gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
+                               trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
+                               linux,default-trigger = "usbport";
+                       };
+
+                       led4 {
+                               label = "e2600ac:green:ctrl1";
+                               gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led5 {
+                               label = "e2600ac:green:ctrl2";
+                               gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
+                       };
+
+                       led6 {
+                               label = "e2600ac:green:ctrl3";
+                               gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
+                       };
+               };
+
+               keys {
+                       compatible = "gpio-keys";
+
+                       reset {
+                               label = "reset";
+                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                               linux,code = <KEY_RESTART>;
+                       };
+               };
+       };
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&tlmm {
+       i2c_0_pins: i2c-0-pinmux {
+               mux {
+                       pins = "gpio20", "gpio21";
+                       function = "blsp_i2c0";
+                       bias-disable;
+               };
+       };
+
+       mdio_pins: mdio_pinmux {
+               mux_1 {
+                       pins = "gpio6";
+                       function = "mdio";
+                       bias-pull-up;
+               };
+               mux_2 {
+                       pins = "gpio7";
+                       function = "mdc";
+                       bias-pull-up;
+               };
+       };
+
+       serial_0_pins: serial0-pinmux {
+               mux {
+                       pins = "gpio16", "gpio17";
+                       function = "blsp_uart0";
+                       bias-disable;
+               };
+       };
+
+       serial_1_pins: serial1_pinmux {
+               mux {
+                       pins = "gpio8", "gpio9";
+                       function = "blsp_uart1";
+                       bias-disable;
+               };
+       };
+
+       spi_0_pins: spi_0_pinmux {
+               pinmux {
+                       function = "blsp_spi0";
+                       pins = "gpio13", "gpio14", "gpio15";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+               pinmux_cs {
+                       function = "gpio";
+                       pins = "gpio12";
+                       drive-strength = <2>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
+};
+
+&wifi1 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
+};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts
new file mode 100644 (file)
index 0000000..cfc3037
--- /dev/null
@@ -0,0 +1,399 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/*
+ * Device Tree Source for Linksys EA8300 (Dallas)
+ *
+ * Copyright (C) 2019 Jeff Kletsky
+ *
+ */
+
+/dts-v1/;
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+       model = "Linksys EA8300 (Dallas)";
+       compatible = "linksys,ea8300", "qcom,ipq4019";
+
+
+       aliases {
+               led-boot = &led_wps_amber;
+               led-failsafe = &led_wps;
+               led-running = &led_linksys;
+               led-upgrade = &led_world;
+               serial0 = &blsp1_uart1;
+       };
+
+
+       leds {
+               compatible = "gpio-leds";
+
+               // Retain node names from running OEM on EA8300
+
+               // Front panel LEDs, top to bottom
+
+               led_plug: diag {
+                       label = "ea8300:amber:plug";
+                       gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_world: internet {
+                       label = "ea8300:amber:world";
+                       gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_wps: wps {
+                       label = "ea8300:white:wps";
+                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_wps_amber: wps_amber {
+                       label = "ea8300:amber:wps";
+                       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
+               };
+
+               led_linksys: pwr {
+                       label = "ea8300:white:linksys";
+                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
+               };
+
+               // On back panel, above USB socket
+
+               led_usb: usb {
+                       label = "ea8300:green:usb";
+                       gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&usb3_port1>, <&usb3_port2>,
+                                         <&usb2_port1>;
+                       linux,default-trigger = "usbport";
+               };
+       };
+
+
+       keys {
+               compatible = "gpio-keys";
+
+               button@0 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+               };
+
+               button@1 {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+
+       //
+       // OEM U-Boot provides either
+       // init=/sbin/init rootfstype=ubifs ubi.mtd=11,2048 \
+       //                 root=ubi0:ubifs rootwait rw
+       // or the same with ubi.mtd=13,2048
+       //
+
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
+       };
+
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x10000000>;
+       };
+
+
+       soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
+               mdio@90000 {
+                       status = "okay";
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2@60f8800 {
+                       status = "okay";
+
+                       dwc3@6000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb2_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               usb3@8af8800 {
+                       status = "okay";
+
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               usb3_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               usb3_port2: port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               crypto@8e3a000 {
+                       status = "okay";
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               ess-switch@c000000 {
+                       status = "okay";
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+       };
+};
+
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp1_uart1 {
+       status = "okay";
+       pinctrl-0 = <&serial_0_pins>;
+       pinctrl-names = "default";
+
+};
+
+&cryptobam {
+       status = "okay";
+};
+
+&nand {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "sbl1";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "mibib";
+                               reg = <0x100000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@200000 {
+                               label = "qsee";
+                               reg = <0x200000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@300000 {
+                               label = "cdt";
+                               reg = <0x300000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@380000 {
+                               label = "appsblenv";
+                               reg = <0x380000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@400000 {
+                               label = "ART";
+                               reg = <0x400000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@480000 {
+                               label = "appsbl";
+                               reg = <0x480000 0x200000>;
+                               read-only;
+                       };
+
+                       partition@680000 {
+                               label = "u_env";
+                               reg = <0x680000 0x80000>;
+                               // writable -- U-Boot environment
+                       };
+
+                       partition@700000 {
+                               label = "s_env";
+                               reg = <0x700000 0x40000>;
+                               // writable -- Boot counter records
+                       };
+
+                       partition@740000 {
+                               label = "devinfo";
+                               reg = <0x740000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@780000 {
+                               label = "kernel";
+                               reg = <0x780000 0x5800000>;
+                       };
+
+                       partition@a80000 {
+                               label = "rootfs";
+                               reg = <0xa80000 0x5500000>;
+                       };
+
+                       partition@5f80000 {
+                               label = "alt_kernel";
+                               reg = <0x5f80000 0x5800000>;
+                       };
+
+                       partition@6280000 {
+                               label = "alt_rootfs";
+                               reg = <0x6280000 0x5500000>;
+                       };
+
+                       partition@b780000 {
+                               label = "sysdiag";
+                               reg = <0xb780000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@b880000 {
+                               label = "syscfg";
+                               reg = <0xb880000 0x4680000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pcie0 {
+       status = "okay";
+
+       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
+       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+
+       bridge@0,0 {
+               reg = <0x00000000 0 0 0 0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               ranges;
+
+               wifi2: wifi@1,0 {
+                       compatible = "qcom,ath10k";
+                       reg = <0x00010000 0 0 0 0>;
+               };
+       };
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&tlmm {
+       serial_0_pins: serial0-pinmux {
+               pins = "gpio16", "gpio17";
+               function = "blsp_uart0";
+               bias-disable;
+       };
+
+       nand_pins: nand_pins {
+               pullups {
+                       pins = "gpio53", "gpio58", "gpio59";
+                       function = "qpic";
+                       bias-pull-up;
+               };
+
+               // gpio61 controls led_usb
+
+               pulldowns {
+                       pins =  "gpio55", "gpio56", "gpio57",
+                               "gpio60", "gpio62", "gpio63",
+                               "gpio64", "gpio65", "gpio66",
+                               "gpio67", "gpio68", "gpio69";
+                       function = "qpic";
+                       bias-pull-down;
+               };
+       };
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
+
+&wifi1 {
+       status = "okay";
+       ieee80211-freq-limit = <5170000 5330000>;
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
+
+&wifi2 {
+       status = "okay";
+       ieee80211-freq-limit = <5490000 5835000>;
+       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts
deleted file mode 100644 (file)
index cfc3037..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/*
- * Device Tree Source for Linksys EA8300 (Dallas)
- *
- * Copyright (C) 2019 Jeff Kletsky
- *
- */
-
-/dts-v1/;
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       model = "Linksys EA8300 (Dallas)";
-       compatible = "linksys,ea8300", "qcom,ipq4019";
-
-
-       aliases {
-               led-boot = &led_wps_amber;
-               led-failsafe = &led_wps;
-               led-running = &led_linksys;
-               led-upgrade = &led_world;
-               serial0 = &blsp1_uart1;
-       };
-
-
-       leds {
-               compatible = "gpio-leds";
-
-               // Retain node names from running OEM on EA8300
-
-               // Front panel LEDs, top to bottom
-
-               led_plug: diag {
-                       label = "ea8300:amber:plug";
-                       gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_world: internet {
-                       label = "ea8300:amber:world";
-                       gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps: wps {
-                       label = "ea8300:white:wps";
-                       gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_wps_amber: wps_amber {
-                       label = "ea8300:amber:wps";
-                       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
-                       panic-indicator;
-               };
-
-               led_linksys: pwr {
-                       label = "ea8300:white:linksys";
-                       gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-               };
-
-               // On back panel, above USB socket
-
-               led_usb: usb {
-                       label = "ea8300:green:usb";
-                       gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&usb3_port1>, <&usb3_port2>,
-                                         <&usb2_port1>;
-                       linux,default-trigger = "usbport";
-               };
-       };
-
-
-       keys {
-               compatible = "gpio-keys";
-
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-               };
-
-               button@1 {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-
-       //
-       // OEM U-Boot provides either
-       // init=/sbin/init rootfstype=ubifs ubi.mtd=11,2048 \
-       //                 root=ubi0:ubifs rootwait rw
-       // or the same with ubi.mtd=13,2048
-       //
-
-       chosen {
-               bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro";
-       };
-
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>;
-       };
-
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-       };
-};
-
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       status = "okay";
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&nand {
-       status = "okay";
-
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "sbl1";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "mibib";
-                               reg = <0x100000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@200000 {
-                               label = "qsee";
-                               reg = <0x200000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@300000 {
-                               label = "cdt";
-                               reg = <0x300000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@380000 {
-                               label = "appsblenv";
-                               reg = <0x380000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@400000 {
-                               label = "ART";
-                               reg = <0x400000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@480000 {
-                               label = "appsbl";
-                               reg = <0x480000 0x200000>;
-                               read-only;
-                       };
-
-                       partition@680000 {
-                               label = "u_env";
-                               reg = <0x680000 0x80000>;
-                               // writable -- U-Boot environment
-                       };
-
-                       partition@700000 {
-                               label = "s_env";
-                               reg = <0x700000 0x40000>;
-                               // writable -- Boot counter records
-                       };
-
-                       partition@740000 {
-                               label = "devinfo";
-                               reg = <0x740000 0x40000>;
-                               read-only;
-                       };
-
-                       partition@780000 {
-                               label = "kernel";
-                               reg = <0x780000 0x5800000>;
-                       };
-
-                       partition@a80000 {
-                               label = "rootfs";
-                               reg = <0xa80000 0x5500000>;
-                       };
-
-                       partition@5f80000 {
-                               label = "alt_kernel";
-                               reg = <0x5f80000 0x5800000>;
-                       };
-
-                       partition@6280000 {
-                               label = "alt_rootfs";
-                               reg = <0x6280000 0x5500000>;
-                       };
-
-                       partition@b780000 {
-                               label = "sysdiag";
-                               reg = <0xb780000 0x100000>;
-                               read-only;
-                       };
-
-                       partition@b880000 {
-                               label = "syscfg";
-                               reg = <0xb880000 0x4680000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&pcie0 {
-       status = "okay";
-
-       perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
-       };
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       serial_0_pins: serial0-pinmux {
-               pins = "gpio16", "gpio17";
-               function = "blsp_uart0";
-               bias-disable;
-       };
-
-       nand_pins: nand_pins {
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               // gpio61 controls led_usb
-
-               pulldowns {
-                       pins =  "gpio55", "gpio56", "gpio57",
-                               "gpio60", "gpio62", "gpio63",
-                               "gpio64", "gpio65", "gpio66",
-                               "gpio67", "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi1 {
-       status = "okay";
-       ieee80211-freq-limit = <5170000 5330000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
-
-&wifi2 {
-       status = "okay";
-       ieee80211-freq-limit = <5490000 5835000>;
-       qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts
deleted file mode 100644 (file)
index ab0ec76..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c1";
-       compatible = "qxwlan,e2600ac-c1";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x180000 0x1e80000>;
-                       };
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts
deleted file mode 100644 (file)
index 1c6e859..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019-qxwlan-e2600ac.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Qxwlan E2600AC c2";
-       compatible = "qxwlan,e2600ac-c2";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&nand {
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand@0 {
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "ubi";
-                               reg = <0x00000000 0x04000000>;
-                       };
-               };
-       };
-};
-
-&tlmm {
-       nand_pins: nand-pins {
-
-               pullups {
-                       pins = "gpio53", "gpio58", "gpio59";
-                       function = "qpic";
-                       bias-pull-up;
-               };
-
-               pulldowns {
-                       pins = "gpio54", "gpio55", "gpio56",
-                               "gpio57", "gpio60", "gpio61",
-                               "gpio62", "gpio63", "gpio64",
-                               "gpio65", "gpio66", "gpio67",
-                               "gpio68", "gpio69";
-                       function = "qpic";
-                       bias-pull-down;
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi
deleted file mode 100644 (file)
index f4af2ba..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT
- *
- * Copyright (c) 2018 Peng Zhang <sd20@qxwlan.com>
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-
-       model = "Qxwlan E2600AC";
-       compatible = "qcom,ipq4019";
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>; /* 256MB */
-       };
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       /* select hostmode */
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2: usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               serial@78af000 {
-                       pinctrl-0 = <&serial_0_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               serial@78b0000 {
-                       pinctrl-0 = <&serial_1_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
-               i2c@78b7000 { /* BLSP1 QUP2 */
-                       pinctrl-0 = <&i2c_0_pins>;
-                       pinctrl-names = "default";
-
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               crypto@8e3a000 {
-                       status = "okay";
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-
-                       led1 {
-                               label = "e2600ac:green:wlan0";
-                               gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led2 {
-                               label = "e2600ac:green:wlan1";
-                               gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led3 {
-                               label = "e2600ac:green:usb";
-                               gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-                               trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>;
-                               linux,default-trigger = "usbport";
-                       };
-
-                       led4 {
-                               label = "e2600ac:green:ctrl1";
-                               gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led5 {
-                               label = "e2600ac:green:ctrl2";
-                               gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
-                       };
-
-                       led6 {
-                               label = "e2600ac:green:ctrl3";
-                               gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
-                       };
-               };
-
-               keys {
-                       compatible = "gpio-keys";
-
-                       reset {
-                               label = "reset";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_RESTART>;
-                       };
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&cryptobam {
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       i2c_0_pins: i2c-0-pinmux {
-               mux {
-                       pins = "gpio20", "gpio21";
-                       function = "blsp_i2c0";
-                       bias-disable;
-               };
-       };
-
-       mdio_pins: mdio_pinmux {
-               mux_1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-               mux_2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial_0_pins: serial0-pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-
-       serial_1_pins: serial1_pinmux {
-               mux {
-                       pins = "gpio8", "gpio9";
-                       function = "blsp_uart1";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio13", "gpio14", "gpio15";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
-
-&wifi1 {
-       status = "okay";
-       qcom,ath10k-calibration-variant = "Qxwlan-E2600AC";
-};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts
new file mode 100644 (file)
index 0000000..63fbfb6
--- /dev/null
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/dts-v1/;
+
+#include "qcom-ipq4019-u4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+       model = "Unielec U4019 (32M)";
+       compatible = "unielec,u4019-32m","unielec,u4019","qcom,ipq4019";
+};
+
+&blsp1_spi1 {
+       pinctrl-0 = <&spi_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
+
+       flash@0 {
+               reg = <0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <24000000>;
+               broken-flash-reset;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "0:SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+                       partition@40000 {
+                               label = "0:MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+                       partition@60000 {
+                               label = "0:QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+                       partition@c0000 {
+                               label = "0:CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+                       partition@d0000 {
+                               label = "0:DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+                       partition@e0000 {
+                               label = "0:APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+                       partition@f0000 {
+                               label = "0:APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+                       partition@170000 {
+                               label = "0:ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+                       partition@180000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x180000 0x1e80000>;
+                       };
+               };
+       };
+};
+
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi
new file mode 100644 (file)
index 0000000..c768e25
--- /dev/null
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+       compatible = "unielec,u4019","qcom,ipq4019";
+
+       soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
+               mdio@90000 {
+                       status = "okay";
+                       pinctrl-0 = <&mdio_pins>;
+                       pinctrl-names = "default";
+                       reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
+                       reset-delay-us = <2000>;
+               };
+
+               ess-psgmii@98000 {
+                       status = "okay";
+               };
+
+               tcsr@1949000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1949000 0x100>;
+                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+               };
+
+               tcsr@194b000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x194b000 0x100>;
+                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+                       status = "okay";
+               };
+
+               ess_tcsr@1953000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1953000 0x1000>;
+                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+               };
+
+               tcsr@1957000 {
+                       compatible = "qcom,tcsr";
+                       reg = <0x1957000 0x100>;
+                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+               };
+
+               usb2@60f8800 {
+                       status = "okay";
+
+                       dwc3@6000000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               usb3@8af8800 {
+                       status = "okay";
+
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
+               };
+
+               watchdog@b017000 {
+                       status = "okay";
+               };
+
+               ess-switch@c000000 {
+                       status = "okay";
+               };
+
+               edma@c080000 {
+                       status = "okay";
+               };
+
+               aliases {
+                       led-boot = &led_status;
+                       led-failsafe = &led_status;
+                       led-running = &led_status;
+                       led-upgrade = &led_status;
+                       serial0 = &blsp1_uart1;
+                       serial1 = &blsp1_uart2;
+               };
+
+               leds {
+                       compatible = "gpio-leds";
+                       pinctrl-0 = <&led_pins>;
+                       pinctrl-names = "default";
+
+                       led_status: led2 {
+                               label = "u4019:green:led2";
+                               gpios = <&tlmm 68 GPIO_ACTIVE_LOW>;
+                       };
+               };
+
+               keys {
+                       compatible = "gpio-keys";
+
+                       reset {
+                               label = "reset";
+                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                               linux,code = <KEY_RESTART>;
+                       };
+               };
+       };
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&blsp1_uart2 {
+       pinctrl-0 = <&serial_1_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&qpic_bam {
+       status = "okay";
+};
+
+&tlmm {
+       mdio_pins: mdio_pinmux {
+               mux_1 {
+                       pins = "gpio6";
+                       function = "mdio";
+                       bias-pull-up;
+               };
+               mux_2 {
+                       pins = "gpio7";
+                       function = "mdc";
+                       bias-pull-up;
+               };
+       };
+
+       serial_0_pins: serial0-pinmux {
+               mux {
+                       pins = "gpio16", "gpio17";
+                       function = "blsp_uart0";
+                       bias-disable;
+               };
+       };
+       serial_1_pins: serial1_pinmux {
+               mux {
+                       pins = "gpio8", "gpio9";
+                       function = "blsp_uart1";
+                       bias-disable;
+               };
+       };
+
+       spi_0_pins: spi_0_pinmux {
+               pinmux {
+                       function = "blsp_spi0";
+                       pins = "gpio13", "gpio14", "gpio15";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+
+               pinmux_cs {
+                       function = "gpio";
+                       pins = "gpio12";
+                       drive-strength = <2>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+
+       led_pins: led_pinmux {
+               mux {
+                       function = "gpio";
+                       pins = "gpio68";
+                       bias-disabled;
+                       output-low;
+               };
+       };
+};
+
+&usb3_ss_phy {
+       status = "okay";
+};
+
+&usb3_hs_phy {
+       status = "okay";
+};
+
+&usb2_hs_phy {
+       status = "okay";
+};
+
+&wifi0 {
+       status = "okay";
+};
+
+&wifi1 {
+       status = "okay";
+};
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts
deleted file mode 100644 (file)
index 606ac16..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-
-#include "qcom-ipq4019-unielec-u4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       model = "Unielec U4019 (32M)";
-       compatible = "unielec,u4019-32m","unielec,u4019","qcom,ipq4019";
-};
-
-&blsp1_spi1 {
-       pinctrl-0 = <&spi_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-       cs-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
-
-       flash@0 {
-               reg = <0>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <24000000>;
-               broken-flash-reset;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "0:SBL1";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-                       partition@40000 {
-                               label = "0:MIBIB";
-                               reg = <0x40000 0x20000>;
-                               read-only;
-                       };
-                       partition@60000 {
-                               label = "0:QSEE";
-                               reg = <0x60000 0x60000>;
-                               read-only;
-                       };
-                       partition@c0000 {
-                               label = "0:CDT";
-                               reg = <0xc0000 0x10000>;
-                               read-only;
-                       };
-                       partition@d0000 {
-                               label = "0:DDRPARAMS";
-                               reg = <0xd0000 0x10000>;
-                               read-only;
-                       };
-                       partition@e0000 {
-                               label = "0:APPSBLENV";
-                               reg = <0xe0000 0x10000>;
-                               read-only;
-                       };
-                       partition@f0000 {
-                               label = "0:APPSBL";
-                               reg = <0xf0000 0x80000>;
-                               read-only;
-                       };
-                       partition@170000 {
-                               label = "0:ART";
-                               reg = <0x170000 0x10000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               compatible = "denx,fit";
-                               label = "firmware";
-                               reg = <0x180000 0x1e80000>;
-                       };
-               };
-       };
-};
-
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019.dtsi
deleted file mode 100644 (file)
index c768e25..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
-       compatible = "unielec,u4019","qcom,ipq4019";
-
-       soc {
-               rng@22000 {
-                       status = "okay";
-               };
-
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-                       reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
-                       reset-delay-us = <2000>;
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               tcsr@1949000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1949000 0x100>;
-                       qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
-               };
-
-               tcsr@194b000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x194b000 0x100>;
-                       qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
-                       status = "okay";
-               };
-
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
-               };
-
-               tcsr@1957000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1957000 0x100>;
-                       qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
-               };
-
-               usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
-               watchdog@b017000 {
-                       status = "okay";
-               };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
-               aliases {
-                       led-boot = &led_status;
-                       led-failsafe = &led_status;
-                       led-running = &led_status;
-                       led-upgrade = &led_status;
-                       serial0 = &blsp1_uart1;
-                       serial1 = &blsp1_uart2;
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-                       pinctrl-0 = <&led_pins>;
-                       pinctrl-names = "default";
-
-                       led_status: led2 {
-                               label = "u4019:green:led2";
-                               gpios = <&tlmm 68 GPIO_ACTIVE_LOW>;
-                       };
-               };
-
-               keys {
-                       compatible = "gpio-keys";
-
-                       reset {
-                               label = "reset";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_RESTART>;
-                       };
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp1_uart1 {
-       pinctrl-0 = <&serial_0_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&blsp1_uart2 {
-       pinctrl-0 = <&serial_1_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&tlmm {
-       mdio_pins: mdio_pinmux {
-               mux_1 {
-                       pins = "gpio6";
-                       function = "mdio";
-                       bias-pull-up;
-               };
-               mux_2 {
-                       pins = "gpio7";
-                       function = "mdc";
-                       bias-pull-up;
-               };
-       };
-
-       serial_0_pins: serial0-pinmux {
-               mux {
-                       pins = "gpio16", "gpio17";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
-       };
-       serial_1_pins: serial1_pinmux {
-               mux {
-                       pins = "gpio8", "gpio9";
-                       function = "blsp_uart1";
-                       bias-disable;
-               };
-       };
-
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio13", "gpio14", "gpio15";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-                       output-high;
-               };
-       };
-
-       led_pins: led_pinmux {
-               mux {
-                       function = "gpio";
-                       pins = "gpio68";
-                       bias-disabled;
-                       output-low;
-               };
-       };
-};
-
-&usb3_ss_phy {
-       status = "okay";
-};
-
-&usb3_hs_phy {
-       status = "okay";
-};
-
-&usb2_hs_phy {
-       status = "okay";
-};
-
-&wifi0 {
-       status = "okay";
-};
-
-&wifi1 {
-       status = "okay";
-};
index 1fe563c7a5af0749c6e942d8927f328521e76124..f68a8d528824d6595a38a03bf2ccf9647255fa34 100644 (file)
@@ -9,6 +9,7 @@ define Device/Default
        KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
        KERNEL_PREFIX := $$(IMAGE_PREFIX)
        KERNEL_LOADADDR := 0x80208000
+       DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
        SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
        IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
        IMAGE/sysupgrade.bin/squashfs :=
@@ -65,13 +66,13 @@ define Device/8dev_jalapeno-common
        $(call Device/UbiFit)
        BLOCKSIZE := 128k
        PAGESIZE := 2048
+       SOC := qcom-ipq4018
 endef
 
 define Device/8dev_jalapeno
        $(call Device/8dev_jalapeno-common)
        DEVICE_VENDOR := 8devices
        DEVICE_MODEL := Jalapeno
-       DEVICE_DTS := qcom-ipq4018-jalapeno
 endef
 TARGET_DEVICES += 8dev_jalapeno
 
@@ -80,7 +81,7 @@ define Device/alfa-network_ap120c-ac
        $(call Device/UbiFit)
        DEVICE_VENDOR := ALFA Network
        DEVICE_MODEL := AP120C-AC
-       DEVICE_DTS := qcom-ipq4018-ap120c-ac
+       SOC := qcom-ipq4018
        DEVICE_PACKAGES := kmod-usb-acm \
                kmod-tpm-i2c-atmel uboot-envtools
        BLOCKSIZE := 128k
@@ -95,7 +96,7 @@ define Device/aruba_ap-303
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := Aruba
        DEVICE_MODEL := AP-303
-       DEVICE_DTS := qcom-ipq4029-ap-303
+       SOC := qcom-ipq4029
        DEVICE_PACKAGES := ipq-wifi-aruba_ap-303
        IMAGES := sysupgrade.bin
 endef
@@ -105,7 +106,7 @@ define Device/asus_map-ac2200
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := ASUS
        DEVICE_MODEL := Lyra (MAP-AC2200)
-       DEVICE_DTS := qcom-ipq4019-map-ac2200
+       SOC := qcom-ipq4019
        IMAGES := sysupgrade.bin
        DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k
 endef
@@ -115,7 +116,7 @@ define Device/asus_rt-ac58u
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := ASUS
        DEVICE_MODEL := RT-AC58U
-       DEVICE_DTS := qcom-ipq4018-rt-ac58u
+       SOC := qcom-ipq4018
        BLOCKSIZE := 128k
        PAGESIZE := 2048
        DTB_SIZE := 65536
@@ -137,7 +138,7 @@ define Device/avm_fritzbox-4040
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := AVM
        DEVICE_MODEL := FRITZ!Box 4040
-       DEVICE_DTS := qcom-ipq4018-fritz4040
+       SOC := qcom-ipq4018
        BOARD_NAME := fritz4040
        IMAGE_SIZE := 29056k
        UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin
@@ -153,7 +154,7 @@ define Device/avm_fritzbox-7530
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := AVM
        DEVICE_MODEL := FRITZ!Box 7530
-       DEVICE_DTS := qcom-ipq4019-fritzbox-7530
+       SOC := qcom-ipq4019
        DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand
        IMAGES := sysupgrade.bin
 endef
@@ -163,7 +164,7 @@ define Device/avm_fritzrepeater-1200
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := AVM
        DEVICE_MODEL := FRITZ!Repeater 1200
-       DEVICE_DTS := qcom-ipq4019-fritzrepeater-1200
+       SOC := qcom-ipq4019
        DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand ipq-wifi-avm_fritzrepeater-1200
        IMAGES := sysupgrade.bin
 endef
@@ -173,7 +174,7 @@ define Device/avm_fritzrepeater-3000
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := AVM
        DEVICE_MODEL := FRITZ!Repeater 3000
-       DEVICE_DTS := qcom-ipq4019-fritzrepeater-3000
+       SOC := qcom-ipq4019
        DEVICE_PACKAGES := ath10k-firmware-qca9984-ct fritz-caldata fritz-tffs-nand
        IMAGES := sysupgrade.bin
 endef
@@ -181,7 +182,6 @@ TARGET_DEVICES += avm_fritzrepeater-3000
 
 define Device/cilab_meshpoint-one
        $(call Device/8dev_jalapeno-common)
-       DEVICE_DTS := qcom-ipq4018-meshpoint-one
        DEVICE_VENDOR := Crisis Innovation Lab
        DEVICE_MODEL := MeshPoint.One
        DEVICE_PACKAGES := kmod-i2c-gpio kmod-iio-bmp280-i2c kmod-hwmon-ina2xx kmod-rtc-pcf2127
@@ -193,7 +193,7 @@ define Device/compex_wpj419
        $(call Device/UbiFit)
        DEVICE_VENDOR := Compex
        DEVICE_MODEL := WPJ419
-       DEVICE_DTS := qcom-ipq4019-wpj419
+       SOC := qcom-ipq4019
        DEVICE_DTS_CONFIG := config@12
        KERNEL_INSTALL := 1
        BLOCKSIZE := 128k
@@ -206,7 +206,7 @@ define Device/compex_wpj428
        $(call Device/FitImage)
        DEVICE_VENDOR := Compex
        DEVICE_MODEL := WPJ428
-       DEVICE_DTS := qcom-ipq4028-wpj428
+       SOC := qcom-ipq4028
        DEVICE_DTS_CONFIG := config@4
        BLOCKSIZE := 64k
        IMAGE_SIZE := 31232k
@@ -223,7 +223,7 @@ define Device/engenius_eap1300
        DEVICE_MODEL := EAP1300
        DEVICE_DTS_CONFIG := config@4
        BOARD_NAME := eap1300
-       DEVICE_DTS := qcom-ipq4018-eap1300
+       SOC := qcom-ipq4018
        KERNEL_SIZE := 5120k
        IMAGE_SIZE := 25344k
        IMAGES := sysupgrade.bin
@@ -235,7 +235,7 @@ define Device/engenius_ens620ext
        $(call Device/FitImage)
        DEVICE_VENDOR := EnGenius
        DEVICE_MODEL := ENS620EXT
-       DEVICE_DTS := qcom-ipq4018-ens620ext
+       SOC := qcom-ipq4018
        DEVICE_DTS_CONFIG := config@4
        BLOCKSIZE := 64k
        PAGESIZE := 256
@@ -262,7 +262,7 @@ define Device/glinet_gl-b1300
        DEVICE_VENDOR := GL.iNet
        DEVICE_MODEL := GL-B1300
        BOARD_NAME := gl-b1300
-       DEVICE_DTS := qcom-ipq4029-gl-b1300
+       SOC := qcom-ipq4029
        KERNEL_SIZE := 4096k
        IMAGE_SIZE := 26624k
        IMAGES := sysupgrade.bin
@@ -295,7 +295,7 @@ define Device/linksys_ea6350v3
        DEVICE_VENDOR := Linksys
        DEVICE_MODEL := EA6350
        DEVICE_VARIANT := v3
-       DEVICE_DTS := qcom-ipq4018-ea6350v3
+       SOC := qcom-ipq4018
        BLOCKSIZE := 128k
        PAGESIZE := 2048
        KERNEL_SIZE := 3072k
@@ -311,7 +311,7 @@ define Device/linksys_ea8300
        $(call Device/FitzImage)
        DEVICE_VENDOR := Linksys
        DEVICE_MODEL := EA8300
-       DEVICE_DTS := qcom-ipq4019-linksys_ea8300
+       SOC := qcom-ipq4019
        KERNEL_SIZE := 3072k
        IMAGE_SIZE := 87040k
        BLOCKSIZE := 128k
@@ -327,7 +327,7 @@ define Device/meraki_mr33
        $(call Device/FitImage)
        DEVICE_VENDOR := Cisco Meraki
        DEVICE_MODEL := MR33
-       DEVICE_DTS := qcom-ipq4029-mr33
+       SOC := qcom-ipq4029
        BLOCKSIZE := 128k
        PAGESIZE := 2048
        IMAGES = sysupgrade.bin
@@ -340,6 +340,7 @@ define Device/netgear_ex61x0v2
        DEVICE_DTS_CONFIG := config@4
        NETGEAR_BOARD_ID := EX6150v2series
        NETGEAR_HW_ID := 29765285+16+0+128+2x2
+       SOC := qcom-ipq4018
 endef
 
 define Device/netgear_ex6100v2
@@ -347,7 +348,6 @@ define Device/netgear_ex6100v2
        DEVICE_VENDOR := Netgear
        DEVICE_MODEL := EX6100
        DEVICE_VARIANT := v2
-       DEVICE_DTS := qcom-ipq4018-ex6100v2
 endef
 TARGET_DEVICES += netgear_ex6100v2
 
@@ -356,7 +356,6 @@ define Device/netgear_ex6150v2
        DEVICE_VENDOR := Netgear
        DEVICE_MODEL := EX6150
        DEVICE_VARIANT := v2
-       DEVICE_DTS := qcom-ipq4018-ex6150v2
 endef
 TARGET_DEVICES += netgear_ex6150v2
 
@@ -364,7 +363,7 @@ define Device/openmesh_a42
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := OpenMesh
        DEVICE_MODEL := A42
-       DEVICE_DTS := qcom-ipq4018-a42
+       SOC := qcom-ipq4018
        DEVICE_DTS_CONFIG := config@om.a42
        BLOCKSIZE := 64k
        KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
@@ -380,7 +379,7 @@ define Device/openmesh_a62
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := OpenMesh
        DEVICE_MODEL := A62
-       DEVICE_DTS := qcom-ipq4019-a62
+       SOC := qcom-ipq4019
        DEVICE_DTS_CONFIG := config@om.a62
        BLOCKSIZE := 64k
        KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
@@ -398,6 +397,7 @@ define Device/qcom_ap-dk01.1-c1
        DEVICE_MODEL := AP-DK01.1
        DEVICE_VARIANT := C1
        BOARD_NAME := ap-dk01.1-c1
+       SOC := qcom-ipq4019
        DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1
        KERNEL_INSTALL := 1
        KERNEL_SIZE := 4096k
@@ -414,6 +414,7 @@ define Device/qcom_ap-dk04.1-c1
        DEVICE_VENDOR := Qualcomm Atheros
        DEVICE_MODEL := AP-DK04.1
        DEVICE_VARIANT := C1
+       SOC := qcom-ipq4019
        DEVICE_DTS := qcom-ipq4019-ap.dk04.1-c1
        KERNEL_INSTALL := 1
        KERNEL_SIZE := 4048k
@@ -429,7 +430,7 @@ define Device/qxwlan_e2600ac-c1
        DEVICE_MODEL := E2600AC
        DEVICE_VARIANT := C1
        BOARD_NAME := e2600ac-c1
-       DEVICE_DTS := qcom-ipq4019-qxwlan-e2600ac-c1
+       SOC := qcom-ipq4019
        KERNEL_SIZE := 4096k
        IMAGE_SIZE := 31232k
        IMAGES := sysupgrade.bin
@@ -444,7 +445,7 @@ define Device/qxwlan_e2600ac-c2
        DEVICE_VENDOR := Qxwlan
        DEVICE_MODEL := E2600AC
        DEVICE_VARIANT := C2
-       DEVICE_DTS := qcom-ipq4019-qxwlan-e2600ac-c2
+       SOC := qcom-ipq4019
        KERNEL_INSTALL := 1
        BLOCKSIZE := 128k
        PAGESIZE := 2048
@@ -458,7 +459,7 @@ define Device/unielec_u4019-32m
        DEVICE_MODEL := U4019
        DEVICE_VARIANT := 32M
        BOARD_NAME := u4019-32m
-       DEVICE_DTS := qcom-ipq4019-unielec-u4019-32m
+       SOC := qcom-ipq4019
        KERNEL_SIZE := 4096k
        IMAGE_SIZE := 31232k
        IMAGES := sysupgrade.bin
@@ -470,7 +471,7 @@ define Device/zyxel_nbg6617
        $(call Device/FitImageLzma)
        DEVICE_VENDOR := ZyXEL
        DEVICE_MODEL := NBG6617
-       DEVICE_DTS := qcom-ipq4018-nbg6617
+       SOC := qcom-ipq4018
        ROOTFS_SIZE := 24960k
        RAS_BOARD := NBG6617
        RAS_ROOTFS_SIZE := 19840k
@@ -492,7 +493,7 @@ define Device/zyxel_wre6606
        DEVICE_VENDOR := ZyXEL
        DEVICE_MODEL := WRE6606
        DEVICE_DTS_CONFIG := config@4
-       DEVICE_DTS := qcom-ipq4018-wre6606
+       SOC := qcom-ipq4018
        IMAGES := sysupgrade.bin
        IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
        DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
index f7efd415f1f1c000867793b3b133e44b3e50b0fd..6c1ed49cde5136c5180bdd45ade39a89ae9a9696 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      qcom-ipq4018-ens620ext.dtb \
 +      qcom-ipq4018-ex6100v2.dtb \
 +      qcom-ipq4018-ex6150v2.dtb \
-+      qcom-ipq4018-fritz4040.dtb \
++      qcom-ipq4018-fritzbox-4040.dtb \
 +      qcom-ipq4018-jalapeno.dtb \
 +      qcom-ipq4018-nbg6617.dtb \
 +      qcom-ipq4018-rt-ac58u.dtb \
@@ -32,10 +32,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      qcom-ipq4019-fritzbox-7530.dtb \
 +      qcom-ipq4019-fritzrepeater-1200.dtb \
 +      qcom-ipq4019-fritzrepeater-3000.dtb \
-+      qcom-ipq4019-linksys_ea8300.dtb \
++      qcom-ipq4019-ea8300.dtb \
 +      qcom-ipq4019-map-ac2200.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c1.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c2.dtb \
++      qcom-ipq4019-e2600ac-c1.dtb \
++      qcom-ipq4019-e2600ac-c2.dtb \
 +      qcom-ipq4028-wpj428.dtb \
 +      qcom-ipq4029-gl-b1300.dtb \
 +      qcom-ipq4029-mr33.dtb \
index 52484b3dd398945c898e9942c0b80329730417f7..8e97b3b51b884e33f87e68ac0dfe0b5466ea522d 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      qcom-ipq4018-ens620ext.dtb \
 +      qcom-ipq4018-ex6100v2.dtb \
 +      qcom-ipq4018-ex6150v2.dtb \
-+      qcom-ipq4018-fritz4040.dtb \
++      qcom-ipq4018-fritzbox-4040.dtb \
 +      qcom-ipq4018-jalapeno.dtb \
 +      qcom-ipq4018-meshpoint-one.dtb \
 +      qcom-ipq4018-nbg6617.dtb \
@@ -36,11 +36,11 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      qcom-ipq4019-fritzbox-7530.dtb \
 +      qcom-ipq4019-fritzrepeater-1200.dtb \
 +      qcom-ipq4019-fritzrepeater-3000.dtb \
-+      qcom-ipq4019-linksys_ea8300.dtb \
++      qcom-ipq4019-ea8300.dtb \
 +      qcom-ipq4019-map-ac2200.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c1.dtb \
-+      qcom-ipq4019-qxwlan-e2600ac-c2.dtb \
-+      qcom-ipq4019-unielec-u4019-32m.dtb \
++      qcom-ipq4019-e2600ac-c1.dtb \
++      qcom-ipq4019-e2600ac-c2.dtb \
++      qcom-ipq4019-u4019-32m.dtb \
 +      qcom-ipq4019-wpj419.dtb \
 +      qcom-ipq4028-wpj428.dtb \
 +      qcom-ipq4029-ap-303.dtb \