Merge branch 'brcmfmac-nvram-updates-3-3-2023' of git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>

4 files changed, 289 insertions, 1 deletions

diff --git a/WHENCE b/WHENCE
index ee4c36d7..a28f519c 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2690,6 +2690,7 @@ Link: brcm/brcmfmac54591-pcie.clm_blob -> ../cypress/cyfmac54591-pcie.clm_blob
 
 Licence: Redistributable. See LICENCE.cypress for details.
 
+File: "brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt"
 File: "brcm/brcmfmac43241b4-sdio.Intel Corp.-VALLEYVIEW C0 PLATFORM.txt"
 File: "brcm/brcmfmac4330-sdio.Prowise-PT301.txt"
 File: "brcm/brcmfmac43340-sdio.ASUSTeK COMPUTER INC.-TF103CE.txt"
@@ -2726,6 +2727,7 @@ Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\
 Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
 File: "brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt"
 File: "brcm/brcmfmac4356-pcie.gpd-win-pocket.txt"
+File: "brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt"
 File: "brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt"
 File: brcm/brcmfmac4356-sdio.AP6356S.txt
 Link: brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt -> brcmfmac4356-sdio.AP6356S.txt
diff --git a/brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt b/brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt
new file mode 100644
index 00000000..6520ad9a
--- /dev/null
+++ b/brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt
@@ -0,0 +1,147 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2018 Linaro Ltd
+# NVRAM file for the brcmfmac43241b4 wifi on the Advantech MICA-071
+aa2g=3
+aa5g=3
+ag0=0x2
+ag1=0x2
+ag2=0xff
+ag3=0xff
+antswctl2g=0x9
+antswctl5g=0xa
+antswitch=0x0
+boardflags2=0x00800000
+boardflags=0x201
+boardrev=0x1304
+boardtype=0x5f0
+cckbw202gpo=0x1111
+cckbw20ul2gpo=0x1111
+ccode=X2
+devid=0x4374
+extpagain2g=2
+extpagain5g=2
+itt2ga0=0x20
+itt2ga1=0x20
+itt5ga0=0x3e
+itt5ga1=0x3e
+ledbh0=0xff
+ledbh1=0xff
+ledbh2=0xff
+ledbh3=0xff
+leddc=0xffff
+leg40dup2gpo=0x2
+legofdmbw202gpo=0x77777777
+legofdmbw205ghpo=0x11111111
+legofdmbw205glpo=0x44444444
+legofdmbw205gmpo=0x11111111
+legofdmbw20ul2gpo=0x77777777
+legofdmbw20ul5ghpo=0x11111111
+legofdmbw20ul5glpo=0x11111111
+legofdmbw20ul5gmpo=0x11111111
+macaddr=00:90:4c:c5:12:38
+maxp2ga0=60
+maxp2ga1=60
+maxp5ga0=52
+maxp5ga1=52
+maxp5gha0=52
+maxp5gha1=52
+maxp5gla0=52
+maxp5gla1=52
+mcs32po=0x5555
+mcsbw202gpo=0x77777777
+mcsbw205ghpo=0x11111111
+mcsbw205glpo=0x88888888
+mcsbw205gmpo=0x11111111
+mcsbw20ul2gpo=0x77777777
+mcsbw20ul5ghpo=0x11111111
+mcsbw20ul5glpo=0x88888888
+mcsbw20ul5gmpo=0x11111111
+mcsbw402gpo=0x88888888
+mcsbw405ghpo=0x11111111
+mcsbw405glpo=0x44444444
+mcsbw405gmpo=0x00000000
+muxenab=0x0
+nocrc=1
+noisecaloffset5g=14
+noisecaloffset=14
+otpimagesize=232
+pa0itssit=62
+pa1itssit=62
+pa2gw0a0=0xFFCA
+pa2gw0a0_lo=0xFFFA
+pa2gw0a1=0xFFBA
+pa2gw0a1_lo=0xFFEE
+pa2gw1a0=0x14AA
+pa2gw1a0_lo=0x0766
+pa2gw1a1=0x139C
+pa2gw1a1_lo=0x07AD
+pa2gw2a0=0xFEE0
+pa2gw2a0_lo=0xFF7B
+pa2gw2a1=0xFED7
+pa2gw2a1_lo=0xFF6E
+pa5ghw0a0=0xFFC4
+pa5ghw0a0_lo=0xFFDD
+pa5ghw0a1=0xFFCB
+pa5ghw0a1_lo=0xFFDE
+pa5ghw1a0=0x1124
+pa5ghw1a0_lo=0x08DD
+pa5ghw1a1=0x10B6
+pa5ghw1a1_lo=0x09D1
+pa5ghw2a0=0xFF02
+pa5ghw2a0_lo=0xFF4D
+pa5ghw2a1=0xFF0E
+pa5ghw2a1_lo=0xFF46
+pa5glw0a0=0xFFDC
+pa5glw0a0_lo=0xFFE1
+pa5glw0a1=0xFFEA
+pa5glw0a1_lo=0xFFEA
+pa5glw1a0=0x0EDB
+pa5glw1a0_lo=0x0934
+pa5glw1a1=0x0D2D
+pa5glw1a1_lo=0x0CAD
+pa5glw2a0=0xFF02
+pa5glw2a0_lo=0xFF4A
+pa5glw2a1=0xFF44
+pa5glw2a1_lo=0xFF46
+pa5gw0a0=0xFFCD
+pa5gw0a0_lo=0xFFF0
+pa5gw0a1=0xFFC3
+pa5gw0a1_lo=0xFFD4
+pa5gw1a0=0x1126
+pa5gw1a0_lo=0x08D0
+pa5gw1a1=0x10FF
+pa5gw1a1_lo=0x09B0
+pa5gw2a0=0xFF17
+pa5gw2a0_lo=0xFF5C
+pa5gw2a1=0xFEFF
+pa5gw2a1_lo=0xFF3F
+pdetrange2g=2
+pdetrange5g=2
+rssicorrnorm_core0=0x2004
+rssicorrnorm_core0_5g1=0x2203
+rssicorrnorm_core0_5g2=0x1f03
+rssicorrnorm_core0_5g3=0x1903
+rssicorrnorm_core1=0x2004
+rssicorrnorm_core1_5g1=0x2a03
+rssicorrnorm_core1_5g2=0x2303
+rssicorrnorm_core1_5g3=0x1d03
+rxchain=0x3
+sd_gpdc=0
+sd_gpout=0
+sd_gpval=1
+sromrev=9
+subband5gver=0
+tempthresh=120
+triso2g=4
+triso5g=5
+triso5g_h_c0=5
+triso5g_h_c1=5
+triso5g_l_c0=5
+triso5g_l_c1=5
+triso5g_m_c0=5
+triso5g_m_c1=5
+tssipos2g=1
+tssipos5g=1
+txchain=0x3
+usbepnum=0x2
+xtalfreq=37400
diff --git a/brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt b/brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt
new file mode 100644
index 00000000..39b0083a
--- /dev/null
+++ b/brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt
@@ -0,0 +1,139 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2018 Linaro Ltd
+# NVRAM config file for the brcmfmac4356 PCI wifi chip found on
+# the Lenovo Yoga Book X90F / X90L convertible's mainboard
+aa2g=3
+aa5g=3
+aga0=2
+aga1=2
+agbg0=2
+agbg1=2
+antswitch=0
+AvVmid_c0=2,140,2,145,2,145,2,145,2,145
+AvVmid_c1=2,140,2,145,2,145,2,145,2,145
+AvVmid_c2=0,0,0,0,0,0,0,0,0,0
+boardflags=0x02401201
+boardflags2=0x00802000
+boardflags3=0x4808018a
+boardrev=0x1101
+boardtype=0x0732
+btc_mode=1
+cckbw202gpo=0x0000
+cckbw20ul2gpo=0x0000
+cckdigfilttype=1
+ccode=X2
+devid=0x43ec
+dot11agduphrpo=0x0
+dot11agduplrpo=0x0
+dot11agofdmhrbw202gpo=0x3332
+dynamicsarctrl_2g=0xb8b8
+dynamicsarctrl_5g=0xa4a4
+epsdelta2g0=0
+epsdelta2g1=0
+extpagain2g=2
+extpagain5g=2
+femctrl=10
+ltecxmux=0x534201
+macaddr=00:90:4c:c5:12:38
+manfid=0x2d0
+maxp2ga0=78
+maxp2ga1=78
+maxp5ga0=80,80,80,80
+maxp5ga1=80,80,80,80
+mcsbw202gpo=0xa9755422
+mcsbw205ghpo=0xa9844443
+mcsbw205glpo=0xa9844443
+mcsbw205gmpo=0xa9844443
+mcsbw402gpo=0xa9855422
+mcsbw405ghpo=0xa9955553
+mcsbw405glpo=0xa9955553
+mcsbw405gmpo=0xa9955553
+mcsbw805ghpo=0xba955555
+mcsbw805glpo=0xba955555
+mcsbw805gmpo=0xba955555
+mcslr5ghpo=0x0000
+mcslr5glpo=0x0000
+mcslr5gmpo=0x0000
+nocrc=1
+ofdmfilttype=1
+ofdmlrbw202gpo=0x0022
+otpimagesize=484
+pa2ga0=-159,5988,-685
+pa2ga1=-158,6026,-687
+pa2gccka0=-128,6716,-762
+pa2gccka1=-124,6801,-767
+pa5ga0=-168,6003,-705,-175,6041,-714,-181,6102,-720,-182,6062,-717
+pa5ga1=-182,6164,-738,-185,6181,-741,-185,6217,-742,-187,6090,-730
+paprdis=0
+pdgain2g=4
+pdgain5g=4
+pdoffset40ma0=0x0000
+pdoffset40ma1=0x0000
+pdoffset80ma0=0x0000
+pdoffset80ma1=0x0000
+pdoffsetcckma0=0x0
+pdoffsetcckma1=0x0
+phy4350_ss_opt=1
+phycal_tempdelta=25
+rawtempsense=0x1ff
+regrev=1
+rssicorrnorm5g_c0=3,3,3,5,5,5,9,9,9,9,9,9
+rssicorrnorm5g_c1=2,2,2,4,4,4,8,8,8,8,8,8
+rssicorrnorm_c0=3,3
+rssicorrnorm_c1=3,3
+rxchain=3
+rxgains2gelnagaina0=3
+rxgains2gelnagaina1=3
+rxgains2gtrelnabypa0=1
+rxgains2gtrelnabypa1=1
+rxgains2gtrisoa0=6
+rxgains2gtrisoa1=6
+rxgains5gelnagaina0=3
+rxgains5gelnagaina1=3
+rxgains5ghelnagaina0=3
+rxgains5ghelnagaina1=3
+rxgains5ghtrelnabypa0=1
+rxgains5ghtrelnabypa1=1
+rxgains5ghtrisoa0=6
+rxgains5ghtrisoa1=6
+rxgains5gmelnagaina0=3
+rxgains5gmelnagaina1=3
+rxgains5gmtrelnabypa0=1
+rxgains5gmtrelnabypa1=1
+rxgains5gmtrisoa0=6
+rxgains5gmtrisoa1=6
+rxgains5gtrelnabypa0=1
+rxgains5gtrelnabypa1=1
+rxgains5gtrisoa0=5
+rxgains5gtrisoa1=5
+sb20in40hrpo=0x0
+sb20in40lrpo=0x0
+sb20in80and160hr5ghpo=0x0
+sb20in80and160hr5glpo=0x0
+sb20in80and160hr5gmpo=0x0
+sb20in80and160lr5ghpo=0x0
+sb20in80and160lr5glpo=0x0
+sb20in80and160lr5gmpo=0x0
+sb40and80hr5ghpo=0x0
+sb40and80hr5glpo=0x0
+sb40and80hr5gmpo=0x0
+sb40and80lr5ghpo=0x0
+sb40and80lr5glpo=0x0
+sb40and80lr5gmpo=0x0
+sromrev=11
+subband5gver=0x4
+swctrlmap_2g=0x00001040,0xC0300000,0x40200000,0x803020,0x0ff
+swctrlmap_5g=0x00000202,0x00000101,0x00000202,0x000000,0x047
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+tempoffset=255
+temps_hysteresis=15
+temps_period=15
+tempthresh=120
+tssipos2g=1
+tssipos5g=1
+tworangetssi2g=0
+tworangetssi5g=0
+txchain=3
+vendid=0x14e4
+xtalfreq=37400
diff --git a/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt b/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
index 073724a0..d22b6031 100644
--- a/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
+++ b/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
@@ -32,7 +32,7 @@ extpagain2g=2
 extpagain5g=2
 femctrl=10
 ltecxmux=0x534201
-macaddr=00:90:4c:19:80:01
+macaddr=00:90:4c:c5:12:38
 manfid=0x2d0
 maxp2ga0=78
 maxp2ga1=78