ipq807x: bump glinet ax1800/axt1800 to ath11.5/v5.4

Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>

feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-gl-ax1800.dts

@@ -15,4 +15,4 @@
  */
 
 #include "../../../arm64/boot/dts/qcom/qcom-ipq6018-gl-ax1800.dts"
-#include "qcom-ipq6018.dtsi"
+#include "ipq6018.dtsi"

feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-gl-axt1800.dts

@@ -15,4 +15,4 @@
  */
 
 #include "../../../arm64/boot/dts/qcom/qcom-ipq6018-gl-axt1800.dts"
-#include "qcom-ipq6018.dtsi"
+#include "ipq6018.dtsi"

feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-gl-ax1800.dtsi

@@ -1,5 +1,6 @@
+/dts-v1/;
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "qcom-ipq6018.dtsi"
+#include "ipq6018.dtsi"
 #include <dt-bindings/input/input.h>
 
 / {
@@ -36,8 +37,47 @@
 
 	chosen {
 		bootargs = "console=ttyMSM0,115200,n8 rw init=/init";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+		bootargs-append = " swiotlb=1";
+#else
 		bootargs-append = " swiotlb=1 coherent_pool=2M";
+#endif
 	};
+
+	/*
+	 * +=========+==============+========================+
+	 * |        |              |                         |
+	 * | Region | Start Offset |          Size           |
+	 * |        |              |                         |
+	 * +--------+--------------+-------------------------+
+	 * |        |              |                         |
+	 * |        |              |                         |
+	 * |        |              |                         |
+	 * |        |              |                         |
+	 * | Linux  |  0x41000000  |         139MB           |
+	 * |        |              |                         |
+	 * |        |              |                         |
+	 * |        |              |                         |
+	 * +--------+--------------+-------------------------+
+	 * | TZ App |  0x49B00000  |           6MB           |
+	 * +--------+--------------+-------------------------+
+	 *
+	 * From the available 145 MB for Linux in the first 256 MB,
+	 * we are reserving 6 MB for TZAPP.
+	 *
+	 * Refer arch/arm64/boot/dts/qcom/qcom-ipq6018-memory.dtsi
+	 * for memory layout.
+	 */
+
+/* TZAPP is enabled only in default memory profile */
+#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__)
+	reserved-memory {
+		tzapp:tzapp@49B00000 {	/* TZAPPS */
+			no-map;
+			reg = <0x0 0x49B00000 0x0 0x00600000>;
+		};
+	};
+#endif
 };
 
 &tlmm {
@@ -50,59 +90,10 @@
 		};
 	};
 
-	qpic_pins: qpic_pins {
+	spi_0_pins: spi_0_pins {
-		data_0 {
+		mux {
-			pins = "gpio15";
+			pins = "gpio38", "gpio39", "gpio40", "gpio41";
-			function = "qpic_pad0";
+			function = "blsp0_spi";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_1 {
-			pins = "gpio12";
-			function = "qpic_pad1";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_2 {
-			pins = "gpio13";
-			function = "qpic_pad2";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_3 {
-			pins = "gpio14";
-			function = "qpic_pad3";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_4 {
-			pins = "gpio5";
-			function = "qpic_pad4";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_5 {
-			pins = "gpio6";
-			function = "qpic_pad5";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_6 {
-			pins = "gpio7";
-			function = "qpic_pad6";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		data_7 {
-			pins = "gpio8";
-			function = "qpic_pad7";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		qpic_pad {
-			pins = "gpio1", "gpio3", "gpio4",
-			       "gpio10", "gpio11", "gpio17";
-			function = "qpic_pad";
 			drive-strength = <8>;
 			bias-pull-down;
 		};
@@ -169,7 +160,7 @@
 };
 
 &soc {
-	mdio0: mdio@90000 {
+	mdio@90000 {
 		pinctrl-0 = <&mdio_pins>;
 		pinctrl-names = "default";
 		phy-reset-gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>;
@@ -185,7 +176,7 @@
 		};
 	};
 
-	ess0: ess-switch@3a000000 {
+	ess-switch@3a000000 {
 		switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
 		switch_lan_bmp = <0x0c>; /* lan port bitmap */
 		switch_wan_bmp = <0x02>; /* wan port bitmap */
@@ -295,10 +286,18 @@
 	status = "ok";
 };
 
-&nand {
+&qpic_nand {
-	pinctrl-0 = <&qpic_pins>;
-	pinctrl-names = "default";
 	status = "ok";
+
+	nand@0 {
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+	};
 };
 
 &ssphy_0 {
@@ -319,16 +318,13 @@
 	status = "ok";
 };
 
-&q6_region {
-	reg = <0x0 0x4ab00000 0x0 0x05500000>;
-};
-
 &CPU0 {
 	operating-points = <
 		/* kHz   uV (fixed) */
 		864000   1100000
 		1056000  1100000
 		1200000  1100000
+		1608000  1100000
 	>;
 	clock-latency = <200000>;
 };
@@ -339,6 +335,7 @@
 		864000   1100000
 		1056000  1100000
 		1200000  1100000
+		1608000  1100000
 	>;
 	clock-latency = <200000>;
 };
@@ -349,6 +346,7 @@
 		864000   1100000
 		1056000  1100000
 		1200000  1100000
+		1608000  1100000
 	>;
 	clock-latency = <200000>;
 };
@@ -359,6 +357,7 @@
 		864000   1100000
 		1056000  1100000
 		1200000  1100000
+		1608000  1100000
 	>;
 	clock-latency = <200000>;
 };

feeds/ipq807x/ipq807x/image/ipq60xx.mk

@@ -61,7 +61,7 @@ define Device/glinet_ax1800
   DEVICE_DTS_CONFIG := config@cp03-c1
   DEVICE_PACKAGES := ath11k-wifi-gl-ax1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3
 endef
-#TARGET_DEVICES += glinet_ax1800
+TARGET_DEVICES += glinet_ax1800
 
 define Device/glinet_axt1800
   DEVICE_TITLE := GL-iNet AXT1800
@@ -70,7 +70,7 @@ define Device/glinet_axt1800
   DEVICE_DTS_CONFIG := config@cp03-c1
   DEVICE_PACKAGES := ath11k-wifi-gl-ax1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3
 endef
-#TARGET_DEVICES += glinet_axt1800
+TARGET_DEVICES += glinet_axt1800
 
 define Device/yuncore_ax840
   DEVICE_TITLE := YunCore AX840