ipq807x: add yuncore fap655 support

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

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['actiontec_web7200', 'cig_wf186w', 'cig_wf188n', 'cig_wf194c4', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf610d', 'cig_wf660a', 'cig_wf660a', 'cig_wf808', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap104-ath12', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_oap101_6e', 'edgecore_oap101e', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650' ]
+        target: ['actiontec_web7200', 'cig_wf186w', 'cig_wf188n', 'cig_wf194c4', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf610d', 'cig_wf660a', 'cig_wf660a', 'cig_wf808', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap104-ath12', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_oap101_6e', 'edgecore_oap101e', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
 
     steps:
     - uses: actions/checkout@v3

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

@@ -52,6 +52,7 @@ glinet,axt1800)
 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" "tx rx link"
 	;;
 yuncore,fap650|\
+yuncore,fap655|\
 muxi,ap3220l)
         ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy0tpt"
         ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy1tpt"

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

@@ -112,6 +112,10 @@ qcom_setup_interfaces()
 		ucidef_add_switch_attr "switch1" "enable" "false"
 		ucidef_add_switch_attr "switch1" "reset" "true"
 		;;
+	yuncore,fap655)
+		ucidef_add_switch "switch1" \
+			"6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+		;;
 	esac
 }
 
@@ -198,6 +202,10 @@ qcom_setup_macs()
 		wan_mac=$(cat /sys/class/net/eth4/address)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
+	yuncore,fap655)
+		wan_mac=$(cat /sys/class/net/eth0/address)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
+		;;
 	muxi,ap3220l)
 		wan_mac=$(mtd_get_mac_binary 0:Product_Info 0x5b)
 		lan_mac=$(macaddr_add "$wan_mac" 1)

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

@@ -162,6 +162,7 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
 	cybertan,eww631-a1|\
 	cybertan,eww631-b1|\
 	edgecore,eap104|\
+	yuncore,fap655|\
 	liteon,wpx8324|\
 	motorola,q14|\
 	muxi,ap3220l|\
@@ -175,6 +176,7 @@ ath11k/qcn6122/hw1.0/caldata_1.bin)
 	cig,wf186w|\
 	cybertan,eww631-a1|\
 	cybertan,eww631-b1|\
+	yuncore,fap655|\
 	motorola,q14)
 		caldata_extract "0:ART" 0x26800 0x20000
 		;;
@@ -226,6 +228,7 @@ ath11k-macs)
 		ath11k_generate_macs_eap101
 		;;
 	yuncore,ax840|\
+	yuncore,fap655|\
 	edgecore,eap102|\
 	edgecore,eap104|\
 	edgecore,eap106|\

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

@@ -144,6 +144,7 @@ platform_check_image() {
 	tplink,ex447|\
 	yuncore,ax840|\
 	yuncore,fap650|\
+	yuncore,fap655|\
 	motorola,q14|\
 	muxi,ap3220l|\
 	qcom,ipq6018-cp01|\
@@ -256,7 +257,8 @@ platform_do_upgrade() {
 		PART_NAME="inactive"
 		platform_do_upgrade_dualboot_datachk "$1"
 		;;
-	yuncore,ax840)
+	yuncore,ax840|\
+	yuncore,fap655)
 		[ -f /proc/boot_info/rootfs/upgradepartition ] && {
 			CI_UBIPART="$(cat /proc/boot_info/rootfs/upgradepartition)"
 			CI_BOOTCFG=1

feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-yuncore-fap655.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-yuncore-fap655.dts"
+
+/ {
+	pmuv8: pmu {
+		compatible = "arm,cortex-a7-pmu";
+	};
+};

feeds/ipq807x/ipq807x/image/ipq50xx.mk

@@ -91,3 +91,12 @@ define Device/qcom_mp03_3
   DEVICE_DTS_CONFIG := config@mp03.3
 endef
 TARGET_DEVICES += qcom_mp03_3
+
+define Device/yuncore_fap655
+  DEVICE_TITLE := Yuncore FAP650
+  DEVICE_DTS := qcom-ipq5018-yuncore-fap655
+  SUPPORTED_DEVICES := yuncore,fap655
+  DEVICE_PACKAGES := ath11k-wifi-yuncore-fap655 ath11k-firmware-ipq50xx-map-spruce -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3
+  DEVICE_DTS_CONFIG := config@mp03.3
+endef
+TARGET_DEVICES += yuncore_fap655

feeds/ipq807x/ipq807x/patches/120-dwc3-gpio-opps.patch

@@ -0,0 +1,13 @@
+Index: linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016/drivers/usb/dwc3/dwc3-qcom.c
+===================================================================
+--- linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016.orig/drivers/usb/dwc3/dwc3-qcom.c
++++ linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016/drivers/usb/dwc3/dwc3-qcom.c
+@@ -669,7 +669,7 @@ static int dwc3_qcom_probe(struct platfo
+ 	/* enable vbus override for device mode */
+ 	if (qcom->mode == USB_DR_MODE_PERIPHERAL)
+ 		dwc3_qcom_vbus_overrride_enable(qcom, true);
+-	else if (qcom->device_power_gpio)
++	else if (!IS_ERR(qcom->device_power_gpio))
+ 		gpiod_set_value(qcom->device_power_gpio, 0);
+ 
+ #if defined(CONFIG_IPQ_DWC3_QTI_EXTCON)

feeds/wifi-ax/ath11k-wifi/Makefile

@@ -53,6 +53,7 @@ ALLWIFIBOARDS:= \
 	tplink-ex447 \
 	yuncore-ax840 \
 	yuncore-fap650 \
+	yuncore-fap655 \
 	meshpp-s618
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
@@ -289,6 +290,7 @@ $(eval $(call generate-ath11k-wifi-package,yuncore-ax840,YunCore AX840))
 $(eval $(call generate-ath11k-wifi-package,meshpp-s618,Mesh++ S618))
 $(eval $(call generate-ath11k-wifi-package,muxi-ap3220l,MUXI AP3220L))
 $(eval $(call generate-ath11k-wifi-package,yuncore-fap650,YunCore FAP650))
+$(eval $(call generate-ath11k-wifi-package,yuncore-fap655,YunCore FAP655))
 
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq5018))

profiles/yuncore_fap655.yml

@@ -0,0 +1,14 @@
+---
+profile: yuncore_fap655
+target: ipq807x
+subtarget: ipq50xx
+description: Build image for Yuncore FAP655
+image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-yuncore-fap655-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x
+include:
+  - wifi-ax
+  - ucentral-ap
+packages:
+  - ipq807x