From 638a91ab5d066929d92c808e064c295a3ccab41d Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Tue, 15 Jan 2019 13:22:26 +0100
Subject: brcm: Fix filename for BCM43430 NVRAM for the Raspberry Pi 3 Model B

BCM43430 NVRAM config file for the RPi3 Model B was set to the value
found by brcmf_dmi_probe(), but should use the DT compatible.
Rename the file to actually make it work with the kernel driver.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
 brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 47 +++++++++++++++++++++++
 brcm/brcmfmac43430-sdio.raspberrypi-rpi.txt       | 47 -----------------------
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
 delete mode 100644 brcm/brcmfmac43430-sdio.raspberrypi-rpi.txt

(limited to 'brcm')

diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
new file mode 100644
index 0000000..732c19b
--- /dev/null
+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2018 Raspberry Pi (Trading) Ltd.
+# NVRAM config file for the BCM43430 WiFi/BT chip as found on the
+# Raspberry Pi 3 Model B
+aa2g=1
+ag0=255
+AvVmid_c0=0x0,0xc8
+boardflags=0x00404201
+boardflags3=0x08000000
+boardnum=22
+boardrev=0x1202
+boardtype=0x0726
+btc_mode=1
+btc_params1=0x7530
+btc_params8=0x4e20
+cckbw202gpo=0
+cckpwroffset0=5
+ccode=ALL
+# cldo_pwm is not set
+deadman_to=0xffffffff
+devid=0x43e2
+extpagain2g=0
+il0macaddr=00:90:4c:c5:12:38
+legofdmbw202gpo=0x66111111
+macaddr=00:90:4c:c5:12:38
+manfid=0x2d0
+maxp2ga0=84
+mcsbw202gpo=0x77711111
+muxenab=0x1
+nocrc=1
+ofdmdigfilttype=18
+ofdmdigfilttypebe=18
+pa0itssit=0x20
+pa2ga0=-168,7161,-820
+pacalidx2g=32
+papdendidx=61
+papdepsoffset=-36
+papdmode=1
+papdvalidtest=1
+prodid=0x0726
+propbw202gpo=0xdd
+spurconfig=0x3 
+sromrev=11
+txpwrbckof=6
+vendid=0x14e4
+wl0id=0x431b
+xtalfreq=37400
diff --git a/brcm/brcmfmac43430-sdio.raspberrypi-rpi.txt b/brcm/brcmfmac43430-sdio.raspberrypi-rpi.txt
deleted file mode 100644
index 732c19b..0000000
--- a/brcm/brcmfmac43430-sdio.raspberrypi-rpi.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# (C) Copyright 2018 Raspberry Pi (Trading) Ltd.
-# NVRAM config file for the BCM43430 WiFi/BT chip as found on the
-# Raspberry Pi 3 Model B
-aa2g=1
-ag0=255
-AvVmid_c0=0x0,0xc8
-boardflags=0x00404201
-boardflags3=0x08000000
-boardnum=22
-boardrev=0x1202
-boardtype=0x0726
-btc_mode=1
-btc_params1=0x7530
-btc_params8=0x4e20
-cckbw202gpo=0
-cckpwroffset0=5
-ccode=ALL
-# cldo_pwm is not set
-deadman_to=0xffffffff
-devid=0x43e2
-extpagain2g=0
-il0macaddr=00:90:4c:c5:12:38
-legofdmbw202gpo=0x66111111
-macaddr=00:90:4c:c5:12:38
-manfid=0x2d0
-maxp2ga0=84
-mcsbw202gpo=0x77711111
-muxenab=0x1
-nocrc=1
-ofdmdigfilttype=18
-ofdmdigfilttypebe=18
-pa0itssit=0x20
-pa2ga0=-168,7161,-820
-pacalidx2g=32
-papdendidx=61
-papdepsoffset=-36
-papdmode=1
-papdvalidtest=1
-prodid=0x0726
-propbw202gpo=0xdd
-spurconfig=0x3 
-sromrev=11
-txpwrbckof=6
-vendid=0x14e4
-wl0id=0x431b
-xtalfreq=37400
-- 
cgit v1.2.1