From e066bf1bf3858cebb20f9e4564b6de8e15b58c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?=
 <igorpecovnik@users.noreply.github.com>
Date: Wed, 7 Sep 2022 20:53:59 +0200
Subject: [PATCH] Re-enable xradio on sunxi64-current (#4160)

* Re-enable xradio on sunxi64-current

* Fix path
---
 config/kernel/linux-sunxi64-current.config |  6 +++++-
 lib/compilation-prepare.sh                 | 15 +++++++++-----
 patch/misc/wireless-xradio-aarch64.patch   | 24 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 patch/misc/wireless-xradio-aarch64.patch

diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config
index 73a5570ce3..5630764a12 100644
--- a/config/kernel/linux-sunxi64-current.config
+++ b/config/kernel/linux-sunxi64-current.config
@@ -2737,7 +2737,11 @@ CONFIG_RTL8723DS=m
 CONFIG_RTL8822CS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8821CU=m
-# CONFIG_WLAN_VENDOR_XRADIO is not set
+CONFIG_WLAN_VENDOR_XRADIO=m
+CONFIG_XRADIO_NON_POWER_OF_TWO_BLOCKSIZES=y
+# CONFIG_XRADIO_5GHZ_SUPPORT is not set
+# CONFIG_XRADIO_WAPI_SUPPORT is not set
+CONFIG_XRADIO_USE_EXTENSIONS=y
 CONFIG_88XXAU=m
 CONFIG_RTL8192EU=m
 CONFIG_RTL8189FS=m
diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh
index 55b1e17cd2..213f01b295 100644
--- a/lib/compilation-prepare.sh
+++ b/lib/compilation-prepare.sh
@@ -420,20 +420,20 @@ compilation_prepare()
 
 		display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"
 
-		fetch_from_repo "$GITHUB_SOURCE/karabek/xradio" "xradio" "branch:master" "yes"
+		fetch_from_repo "$GITHUB_SOURCE/dbeinder/xradio" "xradio" "branch:karabek_rebase" "yes"
 		cd "$kerneldir" || exit
 		rm -rf "$kerneldir/drivers/net/wireless/xradio"
 		mkdir -p "$kerneldir/drivers/net/wireless/xradio/"
-		cp "${SRC}"/cache/sources/xradio/master/*.{h,c} \
+		cp "${SRC}"/cache/sources/xradio/karabek_rebase/*.{h,c} \
 		"$kerneldir/drivers/net/wireless/xradio/"
 
 		# Makefile
-		cp "${SRC}/cache/sources/xradio/master/Makefile" \
+		cp "${SRC}/cache/sources/xradio/karabek_rebase/Makefile" \
 		"$kerneldir/drivers/net/wireless/xradio/Makefile"
 
 		# Kconfig
-		sed -i 's/---help---/help/g' "${SRC}/cache/sources/xradio/master/Kconfig"
-		cp "${SRC}/cache/sources/xradio/master/Kconfig" \
+		sed -i 's/---help---/help/g' "${SRC}/cache/sources/xradio/karabek_rebase/Kconfig"
+		cp "${SRC}/cache/sources/xradio/karabek_rebase/Kconfig" \
 		"$kerneldir/drivers/net/wireless/xradio/Kconfig"
 
 		# Add to section Makefile
@@ -445,6 +445,11 @@ compilation_prepare()
 		# add support for K5.13+
                 process_patch_file "${SRC}/patch/misc/wireless-xradio-5.13.patch" "applying"
 
+		# add support for aarch64
+		if [[ $ARCH == arm64 ]]; then
+		process_patch_file "${SRC}/patch/misc/wireless-xradio-aarch64.patch" "applying"
+		fi
+
 	fi
 
 
diff --git a/patch/misc/wireless-xradio-aarch64.patch b/patch/misc/wireless-xradio-aarch64.patch
new file mode 100644
index 0000000000..1b9acd48df
--- /dev/null
+++ b/patch/misc/wireless-xradio-aarch64.patch
@@ -0,0 +1,24 @@
+From 1ec43d0e6e6b52ff448eed53ce6397f5c6e6df88 Mon Sep 17 00:00:00 2001
+From: Igor Pecovnik <igor.pecovnik@gmail.com>
+Date: Tue, 6 Sep 2022 18:51:28 +0200
+Subject: [PATCH] Linux 5.15.65
+
+Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
+---
+
+diff --git a/drivers/net/wireless/xradio/sdio.c b/drivers/net/wireless/xradio/sdio.c
+index cfff47120337..97ade4c0902c 100644
+--- a/drivers/net/wireless/xradio/sdio.c
++++ b/drivers/net/wireless/xradio/sdio.c
+@@ -14,7 +14,7 @@
+ #include <linux/mmc/sdio_func.h>
+ #include <linux/mmc/card.h>
+ #include <linux/mmc/sdio.h>
+-#include <asm/mach-types.h>
++#include <asm/types.h>
+ #include <linux/of.h>
+ #include <linux/of_irq.h>
+ #include <linux/interrupt.h>
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+