> From: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
> Date: Wed, 07 Sep 2022 08:48:42 +0100
>
> From: Hector Martin <marcan@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
Reviewed-by: Mark Kettenis <kettenis@xxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/apple/t8103-j274.dts | 4 ++++
> arch/arm64/boot/dts/apple/t8103-j293.dts | 4 ++++
> arch/arm64/boot/dts/apple/t8103-j313.dts | 4 ++++
> arch/arm64/boot/dts/apple/t8103-j456.dts | 4 ++++
> arch/arm64/boot/dts/apple/t8103-j457.dts | 4 ++++
> arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 ++
> 6 files changed, 22 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts
> index 2cd429efba5b..c1f3ba9c39f6 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j274.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts
> @@ -21,6 +21,10 @@ aliases {
> };
> };
>
> +&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 49cdf4b560a3..ecb10d237a05 100644
> --- 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 b0ebb45bdb6f..df741737b8e6 100644
> --- 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 884fddf7d363..8c6bf9592510 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j456.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j456.dts
> @@ -21,6 +21,10 @@ aliases {
> };
> };
>
> +&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 d7c622931627..fe7c0aaf7d62 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j457.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j457.dts
> @@ -21,6 +21,10 @@ aliases {
> };
> };
>
> +&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 fe2ae40fa9dd..3d15b8e2a6c1 100644
> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> @@ -71,8 +71,10 @@ hpm1: usb-pd@3f {
> &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";
> };
> };
> --
> 2.30.2
>
>
>
