ipq807x: add hfcl-ion4xi_w support

Signed-off-by: John Crispin <john@phrozen.org>

feeds/ipq807x/ipq807x/base-files/etc/board.d/01_leds

@@ -43,6 +43,7 @@ hfcl,ion4xi|\
 hfcl,ion4xi_wp|\
 hfcl,ion4x|\
 hfcl,ion4x_2|\
+hfcl,ion4xi_w|\
 hfcl,ion4xe)
         ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wifi5" "phy0tpt"
         ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wifi2" "phy1tpt"

feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network

@@ -74,6 +74,9 @@ qcom_setup_interfaces()
 		ucidef_set_interface_lan "eth0 eth1 eth2 eth3"
 		ucidef_set_interface_wan "eth4"
 		;;
+	hfcl,ion4xi_w)
+                ucidef_set_interface_wan "eth1"
+                ;;
 	qcom,ipq807x-hk14)
 		ucidef_set_interface_lan "eth0 eth1 eth2 eth3"
 		ucidef_set_interface_wan "eth4"

feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -135,6 +135,7 @@ case "$FIRMWARE" in
 	cig,wf660a|\
 	edgecore,eap101|\
 	hfcl,ion4xi|\
+	hfcl,ion4xi_w|\
 	hfcl,ion4x_2|\
 	hfcl,ion4x|\
 	hfcl,ion4xe|\
@@ -220,6 +221,7 @@ ath11k/QCN9074/hw1.0/caldata_2.bin)
 ath11k-macs)
 	case "$board" in
 	hfcl,ion4xi|\
+	hfcl,ion4xi_w|\
 	hfcl,ion4xi_wp|\
 	hfcl,ion4x|\
 	hfcl,ion4x_2|\

feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount

@@ -7,6 +7,7 @@ boot() {
 	hfcl,ion4xe|\
 	hfcl,ion4x|\
 	hfcl,ion4x_2|\
+	hfcl,ion4xi_w|\
 	hfcl,ion4xi_wp|\
 	hfcl,ion4xi)
 		fw_setenv boot_count 0

feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh

@@ -133,6 +133,7 @@ platform_check_image() {
 	liteon,wpx8324|\
 	edgecore,eap106|\
 	hfcl,ion4xi|\
+	hfcl,ion4xi_w|\
 	hfcl,ion4xi_wp|\
 	hfcl,ion4x|\
 	hfcl,ion4x_2|\
@@ -216,6 +217,7 @@ platform_do_upgrade() {
 		fi
 		nand_upgrade_tar "$1"
 		;;
+	hfcl,ion4xi_w|\
 	hfcl,ion4xi_wp)
 		wp_part=$(fw_printenv primary | cut  -d = -f2)
 		echo "Current Primary is $wp_part"

feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-hfcl-ion4xi_w.dts

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018-2020, 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "../../../arm64/boot/dts/qcom/qcom-ipq5018-hfcl-ion4xi_w.dts"
+
+/ {
+	pmuv8: pmu {
+		compatible = "arm,cortex-a7-pmu";
+	};
+};

feeds/ipq807x/ipq807x/image/ipq50xx.mk

@@ -111,6 +111,16 @@ define Device/qcom_mp03_3
 endef
 TARGET_DEVICES += qcom_mp03_3
 
+define Device/hfcl_ion4xi_w
+  DEVICE_TITLE := HFCL ION4xi_w
+  DEVICE_DTS := qcom-ipq5018-hfcl-ion4xi_w
+  SUPPORTED_DEVICES := hfcl,ion4xi_w
+  DEVICE_PACKAGES := ath11k-wifi-hfcl-ion4xi_w ath11k-firmware-ipq50xx-spruce ath11k-firmware-qcn6122
+  DEVICE_DTS_CONFIG := config@mp03.3
+endef
+TARGET_DEVICES += hfcl_ion4xi_w
+
+
 define Device/yuncore_fap655
   DEVICE_TITLE := Yuncore FAP650
   DEVICE_DTS := qcom-ipq5018-yuncore-fap655

feeds/wifi-ax/ath11k-wifi/Makefile

@@ -131,6 +131,11 @@ $(call Package/ath11k-wifi-default)
     TITLE:=hfcl-ion4xi bdf
 endef
 
+define Package/ath11k-wifi-hfcl-ion4xi_w
+$(call Package/ath11k-wifi-default)
+    TITLE:=hfcl-ion4xi_w bdf
+endef
+
 define Package/ath11k-wifi-hfcl-ion4xi_wp
 $(call Package/ath11k-wifi-default)
     TITLE:=hfcl-ion4xi_wp bdf
@@ -272,6 +277,13 @@ define Package/ath11k-wifi-hfcl-ion4xi_wp/install
 	$(INSTALL_DATA) ./board-hfcl-ion4xi_wp.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
 endef
 
+define Package/ath11k-wifi-hfcl-ion4xi_w/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-hfcl-ion4xi_w.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+	$(INSTALL_DATA) ./board-2-hfcl-ion4xi_w.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board-2.bin
+endef
+
 $(eval $(call generate-ath11k-wifi-package,cig-wf188,Cigtech WF188))
 $(eval $(call generate-ath11k-wifi-package,cig-wf188n,Cigtech WF188n))
 $(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
@@ -313,3 +325,4 @@ $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-xunison-d50))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_wp))
+$(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_w))