From 5e76a7af978d4ebe80dcbf9202a40cf63805ffb4 Mon Sep 17 00:00:00 2001
From: Redecorating <69827514+Redecorating@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:53:32 +1100
Subject: [PATCH] fix OTP data offset and size for BCM4355

---
 8017-brcmfmac-pcie-Add-IDs-properties-for-BCM4355.patch | 5 +++--
 PKGBUILD                                                | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/8017-brcmfmac-pcie-Add-IDs-properties-for-BCM4355.patch b/8017-brcmfmac-pcie-Add-IDs-properties-for-BCM4355.patch
index 1a38e16..435b98c 100644
--- a/8017-brcmfmac-pcie-Add-IDs-properties-for-BCM4355.patch
+++ b/8017-brcmfmac-pcie-Add-IDs-properties-for-BCM4355.patch
@@ -9,6 +9,7 @@ This chip is present on at least these Apple T2 Macs:
 * hawaii: MacBook Air 13" (True Tone, 2019)
 
 Signed-off-by: Hector Martin <marcan@marcan.st>
+[fixed otp base and words values]
 ---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c   | 1 +
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c   | 8 ++++++++
@@ -53,8 +54,8 @@ index bd55f5a30..035656433 100644
  	switch (devinfo->ci->chip) {
 +	case BRCM_CC_4355_CHIP_ID:
 +		coreid = BCMA_CORE_CHIPCOMMON;
-+		base = 0x800;
-+		words = 0x112;
++		base = 0x8c0;
++		words = 0xb2;
 +		break;
  	case BRCM_CC_4378_CHIP_ID:
  		coreid = BCMA_CORE_GCI;
diff --git a/PKGBUILD b/PKGBUILD
index f9a0279..2bea0a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=linux-t2
 pkgver=5.15.11
 _srcname=linux-${pkgver}
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux kernel for T2 Macs'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://git.archlinux.org/linux.git/log/?h=v$_srctag"
@@ -325,7 +325,7 @@ sha256sums=('c1178b7e7e12d91292e670191268e3fe9a3563faf899eef43e468577e973a1ce'
             'c25d935ed2e21308389aac775d029c32eecc6a8fdef1dc3df4c745c0d46981ea'
             '96b954987bcbe7ea0ba24943c00570570adfb74e2ba7e1f0df3c4074d0f4d112'
             '5c89f30332ce30e010c1e6dcfcef41bb7ce3411acc147b6b00925c24cc0f9086'
-            '08d4b7b71264b1d62c58eb5535c76b44d087654e0895b0c543972c2c264e9cc7'
+            'd314b41614c6e730cd43467eedd22c15197b437e82088242fa9dc453316f2398'
             '54fa470bc8b1b3a449e19860a11cd9ee5dfdf297a05f90dc0029a4e30ee0de43'
             'e5e2cdd0140e93e1f599f37ba0380ce1f51646b35cfccdb7a5a0e02a7eb7afdb'
             '4b1d72c3d402e9135810dde26bcfd41cee3c988c4f5644eedf8d5254376dc329'