From 9856e2dc095107a9d81eb2fdcd65bb58a77f6e62 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 18 Feb 2021 01:02:42 +0000
Subject: [PATCH] alarm/firmware-raspberrypi to 20210217-1

---
 alarm/firmware-raspberrypi/PKGBUILD           | 26 +++---
 ...cmfmac43455-sdio.raspberrypi,4-model-b.txt | 83 +++++++++++++++++++
 2 files changed, 97 insertions(+), 12 deletions(-)
 create mode 100644 alarm/firmware-raspberrypi/brcmfmac43455-sdio.raspberrypi,4-model-b.txt

diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 28c6deeec..2f1a0087b 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -4,9 +4,9 @@
 buildarch=28
 
 pkgname=firmware-raspberrypi
-_firmcommit=b66ab26cebff689d0d3257f56912b9bb03c20567
-pkgver=20201225
-pkgrel=2
+_firmcommit=f713a6054746bc61ece1c8696dce91a7b7e22dd9
+pkgver=20210217
+pkgrel=1
 pkgdesc="Additional firmware for Raspberry Pi"
 arch=('any')
 url="https://github.com/RPi-Distro/firmware-nonfree/commits/master/brcm"
@@ -15,25 +15,27 @@ options=('!strip')
 source=('https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.bin'
         'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
         'https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd'
-        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.bin'
-        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.clm_blob'
-        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.txt'
         'https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd'
-        "brcmfmac43456-sdio.bin::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.bin"
-        "brcmfmac43456-sdio.clm_blob::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.clm_blob"
-        "brcmfmac43456-sdio.txt::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.txt"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.bin"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.clm_blob"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.txt"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.bin"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.clm_blob"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.txt"
+        'brcmfmac43455-sdio.raspberrypi,4-model-b.txt'
         'RPi-WM8804.conf')
 
 sha256sums=('996b7ef7cbdb8ea3855fa516acb57630ff03a449fd3bb23e84789f2f04b4faf5'
             'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
             '8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
-            '0f1817f50649df707f521dec9f2d5905e4c01939c8aabfa9a06b2ce0a36952ee'
-            '8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e'
-            '27c6b39f113f94a8c15eae63f8605e043332775c469ea072bf325773bb9ae553'
             '1788c58ecedd61b380e0dd120844ed61e5fbbea0a58e84e6293685eb3384fddc'
+            'cf79e8e8727d103a94cd243f1d98770fa29f5da25df251d0d31b3696f3b4ac6a'
+            '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
+            'ca709be81a78bdb6932936374f39943acbd7af07fae6151011127599a3ce9e3d'
             'ddf83f2100885b166be52d21c8966db164fdd4e1d816aca2acc67ee9cc28d726'
             '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
             '44e0bb322dc1f39a4b0a89f30ffdd28bc93f7d7aaf534d06d229fe56f6198194'
+            'edb6f4e4fb19e18940004124feb4ffe160d72fc607243a07a4480338a28b2748'
             'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {
diff --git a/alarm/firmware-raspberrypi/brcmfmac43455-sdio.raspberrypi,4-model-b.txt b/alarm/firmware-raspberrypi/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
new file mode 100644
index 000000000..8dda1683e
--- /dev/null
+++ b/alarm/firmware-raspberrypi/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
@@ -0,0 +1,83 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2018 Raspberry Pi (Trading) Ltd.
+# NVRAM config file for the BCM43455 WiFi/BT chip as found on the
+# Raspberry Pi 4 Model B
+aa2g=1
+aa5g=1
+AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+boardflags=0x00480201
+boardflags2=0x40800000
+boardflags3=0x44200100
+boardrev=0x1304
+boardtype=0x6e4
+btc_mode=1
+btc_params1=0x7530
+btc_params8=0x4e20
+btc_params50=0x972c
+cbfilttype=1
+cckPwrIdxCorr=3
+cckTssiDelay=150
+deadman_to=481500000
+devid=0x43ab
+dot11agofdmhrbw202gpo=0x4442
+dot11b_opts=0x3aa85
+ed_thresh2g=-54
+ed_thresh5g=-54
+eu_edthresh2g=-54
+eu_edthresh5g=-54
+extpagain2g=2
+extpagain5g=2
+fdsslevel_ch11=6
+femctrl=0
+itrsw=1
+ldo1=4
+ltecxfnsel=0x22
+ltecxgcigpio=0x32
+ltecxmux=0
+ltecxpadnum=0x0504
+macaddr=b8:27:eb:74:f2:6c
+manfid=0x2d0
+maxp2ga0=80
+maxp5ga0=82,82,82,82
+mcsbw202gpo=0x98444422
+mcsbw205ghpo=0xb9555000
+mcsbw205glpo=0xb9555000
+mcsbw205gmpo=0xb9555000
+mcsbw402gpo=0x98444422
+mcsbw405ghpo=0xb9555000
+mcsbw405glpo=0xb9555000
+mcsbw405gmpo=0xb9555000
+mcsbw805ghpo=0xb9555000
+mcsbw805glpo=0xb9555000
+mcsbw805gmpo=0xb9555000
+nocrc=1
+ofdmlrbw202gpo=0x0022
+ofdmTssiDelay=150
+pa2ga0=-129,6525,-718
+pa2ga1=-149,4408,-601
+pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818
+pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575
+pdoffset2g40ma0=16
+pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0
+pdoffset40ma0=0x8888
+pdoffset80ma0=0x8888
+pdoffsetcckma0=2
+phycal_tempdelta=15
+prodid=0x06e4
+rawtempsense=0x1ff
+rxchain=1
+sromrev=11
+swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff
+swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+tssipos2g=1
+tssipos5g=1
+tworangetssi2g=1
+tworangetssi5g=1
+txchain=1
+txpwr2gAdcScale=1
+txpwr5gAdcScale=1
+vcodivmode=1
+vendid=0x14e4
+xtalfreq=37400