qualcommax: ipq60xx: fixes boot issues

package/boot/uboot-envtools/files/qualcommax

@@ -21,9 +21,7 @@ glinet,gl-axt1800|\
 netgear,rax120v2|\
 netgear,wax218|\
 netgear,wax620|\
-netgear,wax630|\
+netgear,wax630)
-xiaomi,rm1800|\
-zn,m2)
 	idx="$(find_mtd_index 0:appsblenv)"
 	[ -n "$idx" ] && \
 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax5-jdcloud.dts

@@ -9,14 +9,20 @@
 	compatible = "redmi,ax5-jdcloud", "qcom,ipq6018";
 
 	chosen {
-		bootargs-append = " rootfstype=squashfs,ext4 swiotlb=1 coherent_pool=2M";
+		stdout-path = "serial0:115200n8";
 	};
 };
 
 &sdhc {
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	non-removable;
+	vqmmc-supply = <&ipq6018_l2>;
 	status = "okay";
 };
 
 &wifi {
+	qcom,ath11k-fw-memory-mode = <1>;
 	qcom,ath11k-calibration-variant = "Redmi-AX5-JDCloud";
 };

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-cmiot.dtsi

@@ -1,201 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+)
-
-/dts-v1/;
-
-#include "ipq6018-256m.dtsi"
-#include "ipq6018-ess.dtsi"
-#include "ipq6018-opp.dtsi"
-
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	aliases {
-		serial0 = &blsp1_uart3;
-
-		/* Aliases as required by u-boot to patch MAC addresses */
-		ethernet0 = &dp1;
-		ethernet1 = &dp2;
-		ethernet2 = &dp3;
-		ethernet3 = &dp4;
-	};
-
-    /delete-node/ rpm-glink;
-
-	chosen {
-		bootargs-append = " root=/dev/ubiblock0_1 swiotlb=1";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			gpios = <&tlmm 60 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-	};
-};
-
-&blsp1_uart3 {
-	pinctrl-0 = <&serial_3_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&tlmm {
-	mdio_pins: mdio-pins {
-		mdc {
-			pins = "gpio64";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		mdio {
-			pins = "gpio65";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-    button_pins: button_pins {
-		wps_button {
-			pins = "gpio9";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		reset_button {
-			pins = "gpio60";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-};
-
-&switch {
-	status = "okay";
-
-	switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-	switch_lan_bmp = <0xe>;  /* lan port bitmap */
-	switch_wan_bmp = <0x10>; /* wan port bitmap */
-	switch_inner_bmp = <0xc0>; /*inner port bitmap*/
-	switch_mac_mode = <0x0>; /* mac mode for uniphy 0*/
-	switch_mac_mode1 = <0xff>; /* mac mode for uniphy 1*/
-	switch_mac_mode2 = <0xff>; /* mac mode for uniphy 2*/
-
-	qcom,port_phyinfo {
-		port@0 {
-			port_id = <1>;
-			phy_address = <0>;
-		};
-		port@1 {
-			port_id = <2>;
-			phy_address = <1>;
-		};
-		port@2 {
-			port_id = <3>;
-			phy_address = <2>;
-		};
-		port@3 {
-			port_id = <4>;
-			phy_address = <3>;
-		};
-	};
-};
-
-&edma {
-	status = "okay";
-};
-
-&qpic_nand {
-	status = "okay";
-
-	nand@0 {
-		reg = <0>;
-
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-	};
-};
-
-&qusb_phy_0 {
-	status = "okay";
-};
-
-&ssphy_0 {
-	status = "okay";
-};
-
-&usb3 {
-	status = "okay";
-};
-
-&mdio {
-	status = "okay";
-
-	pinctrl-0 = <&mdio_pins>;
-	pinctrl-names = "default";
-	reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
-
-	qca8075_0: ethernet-phy@0 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <0>;
-	};
-
-	qca8075_1: ethernet-phy@1 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <1>;
-	};
-
-	qca8075_2: ethernet-phy@2 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <2>;
-	};
-
-	qca8075_3: ethernet-phy@3 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <3>;
-	};
-};
-
-&dp1 {
-	status = "okay";
-	phy-handle = <&qca8075_0>;
-	label = "wan";
-};
-
-&dp2 {
-	status = "okay";
-	phy-handle = <&qca8075_1>;
-	label = "lan1";
-};
-
-&dp3 {
-	status = "okay";
-	phy-handle = <&qca8075_2>;
-	label = "lan2";
-};
-
-&dp4 {
-	status = "okay";
-	phy-handle = <&qca8075_3>;
-	label = "lan3";
-};
-
-&wifi {
-	status = "okay";
-	qcom,ath11k-fw-memory-mode = <2>;
- };

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-m2.dts

@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+)
-
-/dts-v1/;
-
-#include "ipq6000-cmiot.dtsi"
-
-/ {
-	model = "ZN M2";
-	compatible = "zn,m2", "qcom,ipq6018";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led_power: power {
-			label = "m2:blue:power";
-			gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-		};
-
-		mesh {
-			label = "m2:blue:mesh";
-			gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
-		};
-
-		lan {
-			label = "m2:blue:lan";
-			gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "m2:blue:wan";
-			gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g {
-			label = "m2:blue:wlan5g";
-			gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g {
-			label = "m2:blue:wlan2g";
-			gpio = <&tlmm 70 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	leds_pins: leds_pins {
-		mux {
-			pins = "gpio35", "gpio37",
-				"gpio58", "gpio70",
-				"gpio73", "gpio74";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-};
-
-&wifi {
-	qcom,ath11k-calibration-variant = "ZN-M2";
-};

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-rm1800.dts

@@ -7,9 +7,32 @@
 / {
 	model = "Xiaomi RM1800";
 	compatible = "xiaomi,rm1800", "qcom,ipq6018";
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+		bootargs-append = " root=/dev/ubiblock0_1";
+	};
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&qpic_nand {
+	status = "okay";
+
+	nand@0 {
+		reg = <0>;
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+
+		partitions {
+			compatible = "qcom,smem-part";
+		};
+	};
 };
 
 &wifi {
-	status = "okay";
+	qcom,ath11k-fw-memory-mode = <2>;
-	qcom,ath11k-fw-memory-mode = <1>;
+};
-};

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi

@@ -10,7 +10,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-
 	aliases {
 		serial0 = &blsp1_uart3;
 		led-boot = &led_yellow;
@@ -27,7 +26,6 @@
 
 	chosen {
 		stdout-path = "serial0:115200n8";
-		bootargs-append = " root=/dev/ubiblock0_1";
 	};
 
 	keys {
@@ -89,25 +87,6 @@
 	status = "okay";
 };
 
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	status = "okay";
-
-	nand@0 {
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-
-		partitions {
-			compatible = "qcom,smem-part";
-		};
-	};
-};
-
 &mdio {
 	status = "okay";
 
@@ -201,6 +180,4 @@
 
 &wifi {
 	status = "okay";
-
-	qcom,ath11k-fw-memory-mode = <1>;
 };

target/linux/qualcommax/image/ipq60xx.mk

@@ -49,17 +49,6 @@ define Device/glinet_gl-axt1800
 endef
 TARGET_DEVICES += glinet_gl-axt1800
 
-define Device/redmi_ax5-jdcloud
-	$(call Device/FitImage)
-	$(call Device/EmmcImage)
-	DEVICE_VENDOR := Redmi
-	DEVICE_MODEL := AX5 JDCloud
-	DEVICE_DTS_CONFIG := config@cp03-c1
-	SOC := ipq6000
-	DEVICE_PACKAGES := ipq-wifi-redmi_ax5-jdcloud
-endef
-TARGET_DEVICES += redmi_ax5-jdcloud
-
 define Device/linksys_mr7350
 	$(call Device/FitImage)
 	DEVICE_VENDOR := Linksys
@@ -90,6 +79,17 @@ define Device/qihoo_360v6
 endef
 TARGET_DEVICES += qihoo_360v6
 
+define Device/redmi_ax5-jdcloud
+	$(call Device/FitImage)
+	$(call Device/EmmcImage)
+	DEVICE_VENDOR := Redmi
+	DEVICE_MODEL := AX5 JDCloud
+	DEVICE_DTS_CONFIG := config@cp03-c1
+	SOC := ipq6000
+	DEVICE_PACKAGES := ipq-wifi-redmi_ax5-jdcloud
+endef
+TARGET_DEVICES += redmi_ax5-jdcloud
+
 define Device/xiaomi_rm1800
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
@@ -102,16 +102,3 @@ define Device/xiaomi_rm1800
 	DEVICE_PACKAGES := ipq-wifi-xiaomi_rm1800
 endef
 TARGET_DEVICES += xiaomi_rm1800
-
-define Device/zn_m2
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := ZN
-	DEVICE_MODEL := M2
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@cp03-c1
-	SOC := ipq6000
-	DEVICE_PACKAGES := ipq-wifi-zn_m2
-endef
-TARGET_DEVICES += zn_m2

target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds

@@ -6,15 +6,15 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
-    redmi,ax5-jdcloud|\
+cmiot,ax18)
-    xiaomi,rm1800)
+	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "wan"
-        ucidef_set_led_netdev "internet" "Internet" "blue:network" "wan"
+	ucidef_set_led_netdev "wlan2g" "WLAN2G" "blue:wlan2g" "wlan1"
-	    ;;
+	ucidef_set_led_netdev "wlan5g" "WLAN5G" "blue:wlan5g" "wlan0"
-    zn,m2)
+	;;
-        ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
+redmi,ax5-*|\
-        ucidef_set_led_netdev "wlan2g" "WLAN2G" "blue:wlan2g" "wlan1"
+xiaomi,rm1800)
-        ucidef_set_led_netdev "wlan5g" "WLAN5G" "blue:wlan5g" "wlan0"
+	ucidef_set_led_netdev "internet" "Internet" "blue:network" "wan"
-        ;;
+	;;
 esac
 
 board_config_flush

target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network

@@ -18,10 +18,9 @@ ipq60xx_setup_interfaces()
 	glinet,gl-axt1800)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
-	redmi,ax5-jdcloud|\
 	qihoo,360v6|\
-	xiaomi,rm1800|\
+	redmi,ax5-*|\
-	zn,m2)
+	xiaomi,rm1800)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		;;
 	*)

target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata

@@ -12,12 +12,11 @@ case "$FIRMWARE" in
 	glinet,gl-ax1800|\
 	glinet,gl-axt1800|\
 	linksys,mr7350|\
-	qihoo,360v6|\
+	qihoo,360v6)
-	zn,m2)
+		caldata_extract "0:art" 0x1000 0x10000
-		caldata_extract "0:art" 0x1000 0x20000
 		;;
 	redmi,ax5-jdcloud)
-		caldata_extract_mmc "0:ART" 0x1000 0x20000
+		caldata_extract_mmc "0:ART" 0x1000 0x10000
 		;;
 	esac
 	;;