sony-yuga: add wifi support (MR 2617)

Add sony-fusion3 firmware subpackage to enable wifi.
Enable Qoalcomm Prima WLAN driver and fix wrong path in kernel.

[ci:skip-build] Already built on CI in MR

device/testing/device-sony-yuga/APKBUILD

@@ -1,13 +1,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-yuga
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Sony Xperia Z"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-sony-yuga mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="deviceinfo 90-android-touch-dev.rules"
 options="!check !archcheck"
 
@@ -25,6 +28,12 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-sony-fusion3"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 69caa7481a2055ac1184b5dc0b9578a933751f802af61196cb99ab62d6a60a6e4943b28f37f9a42f71f1a6dcb0f60c189155b3fb7ecab57ecc3c41072aa5f636  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules

device/testing/linux-sony-yuga/APKBUILD

@@ -6,7 +6,7 @@
 
 pkgname=linux-sony-yuga
 pkgver=3.4.0
-pkgrel=14
+pkgrel=15
 pkgdesc="Sony Xperia Z kernel fork"
 arch="armv7"
 _carch="arm"
@@ -41,6 +41,7 @@ source="
 	02_reduce_lzo_compression.patch
 	proc_fdinfo.patch
 	fix-video-argb-setting.patch
+	fix_wlan_prima_bin_dir.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -63,7 +64,7 @@ package() {
 
 sha512sums="
 a20ab3f27b43999287ebef5ee150b1652ebc4996a2670079ff86a9ca07bd69555dbd1efb564ff767fb2bf22673dd609817aaded4731b09383d74c68887f545f4  linux-sony-yuga-f164c6d1016cb34ac90c053acbebe6e47fdd400f.tar.gz
-ed3ab86ed512cd5f9cbca9281377cab85176bc250f751735a11e55a18eda329ef2c73d18998a9ccb928d125e6b5ca780b7e98b7f43308dfc71feabe2a5c09a64  config-sony-yuga.armv7
+fe95616bd546c072d9d03f8c24da4e533bec1408bb1bf17f779faa3ad2d8cdbf8b4dcb7302dae37d8f695ee0c112ce43e7a7b6add5550b8896fd1e59dcc79441  config-sony-yuga.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
@@ -74,4 +75,5 @@ f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc21387
 ef5b912c26fea4ab882592bdf7487942c64b123de8d25d08d976f29743f311742ee2f773bf2d110ddb5095f254dbb0bd4487c5cfce77311929082599199e7ebd  02_reduce_lzo_compression.patch
 93f7870b2063d4ddb1f35dc4de4b213d83e0f54f59511b3050e880763f2374b3816ac0c879de76fe8a0b61d62c1753c5dda7326961164a8fcbfc8a9232309569  proc_fdinfo.patch
 375434953b582eb2911a976abe03f86822f469f4fa2463d880b83a35f2209e3dfb0b6bb931f2330df831ee2122da4e73e927499e94ed61fa1bd188778a8c17b7  fix-video-argb-setting.patch
+452805663c8159b0794758443526066da06adc8f8cc528a96abc4389b572fd524cdb1c8bc5d73f87b70f06d4eaecf5f366c6587fc8fe8908b4fb422f439c0321  fix_wlan_prima_bin_dir.patch
 "

device/testing/linux-sony-yuga/config-sony-yuga.armv7

@@ -3730,7 +3730,13 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 #
 # Qualcomm Atheros Prima WLAN module
 #
-# CONFIG_PRIMA_WLAN is not set
+CONFIG_PRIMA_WLAN=y
+# CONFIG_PRIMA_WLAN_BTAMP is not set
+CONFIG_PRIMA_WLAN_LFR=y
+CONFIG_PRIMA_WLAN_OKC=y
+# CONFIG_PRIMA_WLAN_11AC_HIGH_TP is not set
+# CONFIG_QCOM_VOWIFI_11R is not set
+CONFIG_QCOM_TDLS=y
 
 #
 # Qualcomm MSM specific device drivers

device/testing/linux-sony-yuga/fix_wlan_prima_bin_dir.patch

@@ -0,0 +1,25 @@
+From b1e8176d056d0e85f78e37d6ee31b9751efd3f8b Mon Sep 17 00:00:00 2001
+From: Georg Veichtlbauer <georg.veichtlbauer@gmail.com>
+Date: Mon, 2 May 2016 11:54:02 +0200
+Subject: [PATCH] Revert "driver: prima: load patched firmware"
+
+This reverts commit 31b78d424c38d9e832ded513b30bd2afd33e16d8.
+
+Change-Id: I056a402192b216176b374fceeedd9219bc20b0d8
+---
+ drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h b/drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h
+index 48924d69f5b..570a96f65ad 100644
+--- a/drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h
++++ b/drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h
+@@ -47,7 +47,7 @@
+ #define WLAN_INI_FILE              "wlan/prima/WCNSS_qcom_cfg.ini"
+ #define WLAN_CFG_FILE              "wlan/prima/WCNSS_cfg.dat"
+ #define WLAN_FW_FILE               ""
+-#define WLAN_NV_FILE               "../../../data/misc/wifi/prima/WCNSS_qcom_wlan_nv.bin"
++#define WLAN_NV_FILE               "wlan/prima/WCNSS_qcom_wlan_nv.bin"
+ #define WLAN_COUNTRY_INFO_FILE     "wlan/prima/WCNSS_wlan_country_info.dat"
+ #define WLAN_HO_CFG_FILE           "wlan/prima/WCNSS_wlan_ho_config"
+ #else