ipq807x: make cig wf-188n work on v5.4 kernel

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

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -24,8 +24,6 @@ endef
 #
 
 ALLWIFIBOARDS:= \
-	cig-wf188 \
-	cig-wf188n \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
@@ -132,6 +130,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=edgecore oap101 bdf
 endef
 
+define Package/ath11k-wifi-cig-wf188n-ca
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf188n bdf CA
+endef
+
+define Package/ath11k-wifi-cig-wf188n-us
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf188n bdf US
+endef
+
 define ath11k-wifi-install-one-to
   $(INSTALL_DIR)  $(2)/lib/firmware/$(3)/
   $(INSTALL_DATA) $(1) $(2)/lib/firmware/$(3)/board.bin
@@ -260,8 +268,18 @@ define Package/ath11k-wifi-edgecore-oap101/install
 	$(INSTALL_DATA) ./board-2-edgecore-oap101.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))
+define Package/ath11k-wifi-cig-wf188n-ca/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf188n-ca.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
+	echo -n 'CA MY DE' > $(1)/lib/firmware/country
+endef
+
+define Package/ath11k-wifi-cig-wf188n-us/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
+	echo -n 'US MY DE' > $(1)/lib/firmware/country
+endef
+
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
@@ -296,3 +314,5 @@ $(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g-us))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi))
 $(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf188n-ca))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf188n-us))

feeds/ipq807x_v5.4/ipq60xx/config-5.4

@@ -451,6 +451,8 @@ CONFIG_GPIO_DEVRES=y
 # CONFIG_GPIO_SAMA5D2_PIOBU is not set
 CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_USB_DETECT is not set
+CONFIG_GPIO_WATCHDOG=y
+CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
 # CONFIG_GSI is not set
 # CONFIG_HABANA_AI is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y

feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk

@@ -2,14 +2,23 @@ KERNEL_LOADADDR := 0x41080000
 
 DEVICE_VARS += CE_TYPE
 
-define Device/cig_wf188n
+define Device/cig_wf188n-ca
   DEVICE_TITLE := Cigtech WF-188n
   DEVICE_DTS := qcom-ipq6018-cig-wf188n
   DEVICE_DTS_CONFIG := config@cp03-c1
   SUPPORTED_DEVICES := cig,wf188n
-  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-env
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n-ca uboot-env
 endef
-TARGET_DEVICES += cig_wf188n
+TARGET_DEVICES += cig_wf188n-ca
+
+define Device/cig_wf188n-us
+  DEVICE_TITLE := Cigtech WF-188n
+  DEVICE_DTS := qcom-ipq6018-cig-wf188n
+  DEVICE_DTS_CONFIG := config@cp03-c1
+  SUPPORTED_DEVICES := cig,wf188n
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n-us uboot-env
+endef
+TARGET_DEVICES += cig_wf188n-us
 
 define Device/hfcl_ion4xe
   DEVICE_TITLE := HFCL ION4Xe

profiles/cig_wf188n-ca-ath12.yml

@@ -0,0 +1,13 @@
+---
+profile: cig_wf188n-ca
+target: ipq60xx
+subtarget: generic
+description: Build image for the Cigtech WF188n
+image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-cig_wf188n-ca-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x_v5.4
+include:
+  - ucentral-ap
+packages:
+  - ipq60xx