arm64: dts: apple: Add WiFi module and antenna properties

Add the new module-instance/antenna-sku properties required to select
WiFi firmwares properly to all board device trees.

Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Acked-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/E1oZDoI-0077b3-Dd@rmk-PC.armlinux.org.uk

diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts
index 2cd429efba5b956c0705d07b0f2cfc7325ea72ba..c1f3ba9c39f6a82a107ae0f40d5361a49bdc10d4 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j274.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j274.dts
@@ -21,6 +21,10 @@
        };
 };
 
+&wifi0 {
+       brcm,board-type = "apple,atlantisb";
+};
+
 /*
  * Force the bus number assignments so that we can declare some of the
  * on-board devices and properties that are populated by the bootloader

diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts
index 49cdf4b560a30550480cdb8edce4732f5817133f..ecb10d237a053bc377c45ef89c98d4570c779af2 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j293.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
@@ -17,6 +17,10 @@
        model = "Apple MacBook Pro (13-inch, M1, 2020)";
 };
 
+&wifi0 {
+       brcm,board-type = "apple,honshu";
+};
+
 /*
  * Remove unused PCIe ports and disable the associated DARTs.
  */

diff --git a/arch/arm64/boot/dts/apple/t8103-j313.dts b/arch/arm64/boot/dts/apple/t8103-j313.dts
index b0ebb45bdb6fb031c42551775817d3785753c388..df741737b8e6f502366d26bde1e057d807da54b1 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j313.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j313.dts
@@ -17,6 +17,10 @@
        model = "Apple MacBook Air (M1, 2020)";
 };
 
+&wifi0 {
+       brcm,board-type = "apple,shikoku";
+};
+
 /*
  * Remove unused PCIe ports and disable the associated DARTs.
  */

diff --git a/arch/arm64/boot/dts/apple/t8103-j456.dts b/arch/arm64/boot/dts/apple/t8103-j456.dts
index 884fddf7d36373fd5a97b9577f9ceeaf4c633700..8c6bf959251075cd61fd9b30fb537c01bfc27c13 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j456.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j456.dts
@@ -21,6 +21,10 @@
        };
 };
 
+&wifi0 {
+       brcm,board-type = "apple,capri";
+};
+
 &i2c0 {
        hpm2: usb-pd@3b {
                compatible = "apple,cd321x";

diff --git a/arch/arm64/boot/dts/apple/t8103-j457.dts b/arch/arm64/boot/dts/apple/t8103-j457.dts
index d7c622931627c5201d4d8571e39a7a4dd5355a06..fe7c0aaf7d62a7ff81ad312bff9617268315d9ab 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j457.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j457.dts
@@ -21,6 +21,10 @@
        };
 };
 
+&wifi0 {
+       brcm,board-type = "apple,santorini";
+};
+
 /*
  * Force the bus number assignments so that we can declare some of the
  * on-board devices and properties that are populated by the bootloader

diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
index fe2ae40fa9ddf9de58245ea526eda35b2a513b6d..3d15b8e2a6c1e62bb13199ed267fa41815312ca9 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
@@ -71,8 +71,10 @@
 &port00 {
        bus-range = <1 1>;
        wifi0: network@0,0 {
+               compatible = "pci14e4,4425";
                reg = <0x10000 0x0 0x0 0x0 0x0>;
                /* To be filled by the loader */
                local-mac-address = [00 00 00 00 00 00];
+               apple,antenna-sku = "XX";
        };
 };