From b08ff33a33bf215ee0fa4a3db1e5c4b84b66b361 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sun, 5 Nov 2023 10:46:55 -0800
Subject: [PATCH] linux-postmarketos-allwinner: enable rtw88 wifi drivers on
 armv7 (MR 4536)

Used on some USB WiFi adapters. This also enabled RFKILL (used by iwd)

[ci:skip-build]: Already built successfully in CI
---
 .../linux-postmarketos-allwinner/APKBUILD     |  4 +--
 .../config-postmarketos-allwinner.armv7       | 25 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD
index d7610d116..059b1e050 100644
--- a/device/main/linux-postmarketos-allwinner/APKBUILD
+++ b/device/main/linux-postmarketos-allwinner/APKBUILD
@@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=6.6.0_git20231103
-pkgrel=0
+pkgrel=1
 _tag="orange-pi-6.6-20231103-1422"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
@@ -85,7 +85,7 @@ package() {
 sha512sums="
 aaf230fa8c747399ae6f2956ee4451673b21a7737256ae8a7f6555b288a9a45b8ac4a622346b4d8a7be05aab46e62e8b38d2e69814aadf16dc65706e54912219  linux-postmarketos-allwinner-orange-pi-6.6-20231103-1422.tar.gz
 312f7db93c410b68f58801e282c284a8656bd9380899dee53f9268cb4d8b3df0098722fb99a247f8cff59481096ab06b5d0fa8ea4198042ee9366ab83128dca9  config-postmarketos-allwinner.aarch64
-c752e3333a4f49719a76dc7401291517ea37a3c5b1768b3c83b31ca3a711d8946c5da611613ef7fd0f8dbb1c6bd5f3a4d0d9a18672da40ed97f798411ac821b0  config-postmarketos-allwinner.armv7
+c96896033462884dbeb7ff1384aad4c20ee81f4d2b3e0bf7516915a53594b669d3197b0a6b5a1fac9aaad52a52a7b330455cc2b1db95a567007b0009488ff8ce  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
index f253e8480..27a641a06 100644
--- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
+++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
@@ -1328,7 +1328,10 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
@@ -1932,6 +1935,7 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_NET_CX82310_ETH is not set
 # CONFIG_USB_NET_KALMIA is not set
 # CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_HSO is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_USB_SIERRA_NET is not set
@@ -1953,6 +1957,7 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_DYNACK=y
 CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
@@ -2074,14 +2079,22 @@ CONFIG_RTL_CARDS=m
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_USB=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 # CONFIG_RTW88_8822CS is not set
-# CONFIG_RTW88_8822CU is not set
+CONFIG_RTW88_8822CU=m
 # CONFIG_RTW88_8723DS is not set
-# CONFIG_RTW88_8723DU is not set
+CONFIG_RTW88_8723DU=m
 # CONFIG_RTW88_8821CS is not set
-# CONFIG_RTW88_8821CU is not set
+CONFIG_RTW88_8821CU=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_RTW89 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
@@ -4127,7 +4140,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set