From 48d65c0cea0925fe7f757a17ae389ba9dac9bcc4 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 7 Feb 2020 20:57:52 -0800
Subject: [PATCH] device/purism-librem5-*: Enable OOT redpine wifi driver
 (!936)

This enables the out of tree redpine wifi driver currently included in
the Purism kernel that these devices boot.
There's at least one MR @ purism needed before the mainline wifi driver
can be used:
        https://source.puri.sm/Librem5/linux-next/merge_requests/66

This is based on input from Sebastian Krzyszkowi.
---
 device/device-purism-librem5/APKBUILD               | 6 +++---
 device/device-purism-librem5/modprobe.d_rsi.conf    | 7 +++++--
 device/device-purism-librem5dev/APKBUILD            | 6 +++---
 device/device-purism-librem5dev/modprobe.d_rsi.conf | 7 +++++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/device/device-purism-librem5/APKBUILD b/device/device-purism-librem5/APKBUILD
index 13b85e530..bc8046fa4 100644
--- a/device/device-purism-librem5/APKBUILD
+++ b/device/device-purism-librem5/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-purism-librem5"
 pkgdesc="Purism Librem 5 Phone"
-pkgver=0.9
-pkgrel=2
+pkgver=1.0
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -48,7 +48,7 @@ package() {
 
 sha512sums="79121c475a5a957625bfa72e1d1f0e262e0abece703e9efa8c26522725d025625d49c003375ae6af3422eb25540de46196c8f5aab130e76014b630560f4c080b  deviceinfo
 3bc45540000e438e525501b2e816282d778fca10d426e42c9a80c0e752618ce50deb12c3edd9f3edc52edd8eb229d16afae7d407fe2c4ba0dbfefbcb4214780c  uboot-script.cmd
-d10531ad6646ad6cfaf8ee1b0cc38f4e5e2eb39599251b75f25e954f1105761d5480d92cbe06ad52560207b883439071db89b19babf046a810360bd07c52c655  modprobe.d_rsi.conf
+9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
 d033df2b9125622c946af67dad83070473c86937b5825f57ad272c9145b594071dd6913949127803c45af4ea3226526551718d40739f9f1ee4bfe6446e62c856  flash_script.lst"
diff --git a/device/device-purism-librem5/modprobe.d_rsi.conf b/device/device-purism-librem5/modprobe.d_rsi.conf
index 4f4bca98d..5d10e8b61 100644
--- a/device/device-purism-librem5/modprobe.d_rsi.conf
+++ b/device/device-purism-librem5/modprobe.d_rsi.conf
@@ -1,2 +1,5 @@
-#  This disables bluetooth, but enables wifi.
-options rsi_91x dev_oper_mode=13 rsi_zone_enabled=1
+# blacklist the mainline redpine driver for now
+blacklist rsi_91x
+blacklist rsi_sdio
+# Redpine WIFI module
+options redpine_91x dev_oper_mode=13 rsi_zone_enabled=1 antenna_diversity=1
diff --git a/device/device-purism-librem5dev/APKBUILD b/device/device-purism-librem5dev/APKBUILD
index 5fcf4c2fd..93d8658c7 100644
--- a/device/device-purism-librem5dev/APKBUILD
+++ b/device/device-purism-librem5dev/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname="device-purism-librem5dev"
 pkgdesc="Purism Librem 5 Devkit"
-pkgver=0.9
-pkgrel=2
+pkgver=1.0
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -49,7 +49,7 @@ package() {
 
 sha512sums="d073e520a6732b9784d4a79e75dccdf4101f60708c429ca3ff1c12b4b2aaaf27aa2f5f1836c48be98fbc10a1a5fbfd888ba45f4651cca4774187a85f2a8b5a47  deviceinfo
 e4bb06e337d3f23abb0328a8e564e905ef571cdbeeefe442cbbd7e715f5a5b656d00679c48161736b3254bcba1ab39a6c99402f67bbde9838c881b1adeb360ed  uboot-script.cmd
-d10531ad6646ad6cfaf8ee1b0cc38f4e5e2eb39599251b75f25e954f1105761d5480d92cbe06ad52560207b883439071db89b19babf046a810360bd07c52c655  modprobe.d_rsi.conf
+9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
 e1acf19ac91f012f000ab19165327043ffc4e80575dcc05d6aeb457f6343db7ba962fe658839faeb63b453340ddf6a314ccfab57e55d5b9d763bdb621cf5fd63  flash_script.lst"
diff --git a/device/device-purism-librem5dev/modprobe.d_rsi.conf b/device/device-purism-librem5dev/modprobe.d_rsi.conf
index 4f4bca98d..5d10e8b61 100644
--- a/device/device-purism-librem5dev/modprobe.d_rsi.conf
+++ b/device/device-purism-librem5dev/modprobe.d_rsi.conf
@@ -1,2 +1,5 @@
-#  This disables bluetooth, but enables wifi.
-options rsi_91x dev_oper_mode=13 rsi_zone_enabled=1
+# blacklist the mainline redpine driver for now
+blacklist rsi_91x
+blacklist rsi_sdio
+# Redpine WIFI module
+options redpine_91x dev_oper_mode=13 rsi_zone_enabled=1 antenna_diversity=1