[PATCH] brcm: rename Rock960 NVRAM to AP6356S and link devices to it

[PATCH] brcm: rename Rock960 NVRAM to AP6356S and link devices to it

[Peter Robinson]

The Rock960, VIM2 and Firefly3399 all have a AP6356S WiFi module
and their NVRAM all appear to be the same so call the NVRAM after
the AP module and link the 3 devices to that to make it clear.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 WHENCE                                                      | 6 ++++--
 ...sdio.vamrs,rock960.txt => brcmfmac4356-sdio.AP6356S.txt} | 0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename brcm/{brcmfmac4356-sdio.vamrs,rock960.txt => brcmfmac4356-sdio.AP6356S.txt} (100%)

diff --git a/WHENCE b/WHENCE
index 8f37cc3..b0d423a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3012,8 +3012,10 @@ 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-sdio.vamrs,rock960.txt
-Link: brcm/brcmfmac4356-sdio.khadas,vim2.txt -> brcmfmac4356-sdio.vamrs,rock960.txt
+File: brcm/brcmfmac4356-sdio.AP6356S.txt
+Link: brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt -> brcmfmac4356-sdio.AP6356S.txt
+Link: brcm/brcmfmac4356-sdio.khadas,vim2.txt -> brcmfmac4356-sdio.AP6356S.txt
+Link: brcm/brcmfmac4356-sdio.vamrs,rock960.txt -> brcmfmac4356-sdio.AP6356S.txt
 
 Licence: GPLv2. See GPL-2 for details.
 
diff --git a/brcm/brcmfmac4356-sdio.vamrs,rock960.txt b/brcm/brcmfmac4356-sdio.AP6356S.txt
similarity index 100%
rename from brcm/brcmfmac4356-sdio.vamrs,rock960.txt
rename to brcm/brcmfmac4356-sdio.AP6356S.txt
-- 
2.35.1

Re: [PATCH] brcm: rename Rock960 NVRAM to AP6356S and link devices to it

[Josh Boyer]

On Sun, Apr 3, 2022 at 12:19 PM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> The Rock960, VIM2 and Firefly3399 all have a AP6356S WiFi module
> and their NVRAM all appear to be the same so call the NVRAM after
> the AP module and link the 3 devices to that to make it clear.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

Applied and pushed out.

josh

> ---
>  WHENCE                                                      | 6 ++++--
>  ...sdio.vamrs,rock960.txt => brcmfmac4356-sdio.AP6356S.txt} | 0
>  2 files changed, 4 insertions(+), 2 deletions(-)
>  rename brcm/{brcmfmac4356-sdio.vamrs,rock960.txt => brcmfmac4356-sdio.AP6356S.txt} (100%)
>
> diff --git a/WHENCE b/WHENCE
> index 8f37cc3..b0d423a 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -3012,8 +3012,10 @@ 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-sdio.vamrs,rock960.txt
> -Link: brcm/brcmfmac4356-sdio.khadas,vim2.txt -> brcmfmac4356-sdio.vamrs,rock960.txt
> +File: brcm/brcmfmac4356-sdio.AP6356S.txt
> +Link: brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt -> brcmfmac4356-sdio.AP6356S.txt
> +Link: brcm/brcmfmac4356-sdio.khadas,vim2.txt -> brcmfmac4356-sdio.AP6356S.txt
> +Link: brcm/brcmfmac4356-sdio.vamrs,rock960.txt -> brcmfmac4356-sdio.AP6356S.txt
>
>  Licence: GPLv2. See GPL-2 for details.
>
> diff --git a/brcm/brcmfmac4356-sdio.vamrs,rock960.txt b/brcm/brcmfmac4356-sdio.AP6356S.txt
> similarity index 100%
> rename from brcm/brcmfmac4356-sdio.vamrs,rock960.txt
> rename to brcm/brcmfmac4356-sdio.AP6356S.txt
> --
> 2.35.1
>