diff mbox series

[net-next,12/12] arm64: dts: apple: Add WiFi module and antenna properties

Message ID E1oVpne-005LCR-RJ@rmk-PC.armlinux.org.uk (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series Add support for bcm4378 on Apple platforms | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: DT compatible string vendor "pci14e4" appears un-documented -- check ./Documentation/devicetree/bindings/vendor-prefixes.yaml
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Russell King (Oracle) Sept. 7, 2022, 7:48 a.m. UTC 
From: Hector Martin <marcan@marcan.st>

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>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 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(+)

Comments

Kalle Valo Sept. 7, 2022, 8:16 a.m. UTC | #1 
Russell King (Oracle) <rmk+kernel@armlinux.org.uk> writes:

> From: Hector Martin <marcan@marcan.st>
>
> 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>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
>  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(+)

Is it ok to take this via wireless-next? Can I get an ack from the
maintainers of these files?
Mark Kettenis Sept. 7, 2022, 9:27 a.m. UTC | #2 
> From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Date: Wed, 07 Sep 2022 08:48:42 +0100
> 
> From: Hector Martin <marcan@marcan.st>
> 
> 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>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

Reviewed-by: Mark Kettenis <kettenis@openbsd.org>

> ---
>  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
> 
> 
>
Russell King (Oracle) Sept. 13, 2022, 4:28 p.m. UTC | #3 
On Wed, Sep 07, 2022 at 11:16:22AM +0300, Kalle Valo wrote:
> Russell King (Oracle) <rmk+kernel@armlinux.org.uk> writes:
> 
> > From: Hector Martin <marcan@marcan.st>
> >
> > 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>
> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > ---
> >  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(+)
> 
> Is it ok to take this via wireless-next? Can I get an ack from the
> maintainers of these files?

I'm not sure who you're expecting to get an ack from. If it's the
maintainers of these files, that'll be Hector himself, and as he
authored the change, there seems to be little point in also having
an Acked-by from him too.

I just asked Hector on #asahi-dev:
17:21 < rmk> also, I think Kalle Valo is waiting on an answer on the arm64 DTS
             changes for brcmfmac:
17:21 < rmk> Is it ok to take this via wireless-next? Can I get an ack from the
17:21 < rmk> maintainers of these files?
17:21 <@marcan> ah yeah, merging via wireless-next is fine, let me give you an
                ack

If on the other hand, you're wanting Arnd, then I think he would
need to be asked directly.

Thanks.
Kalle Valo Sept. 16, 2022, 7:27 a.m. UTC | #4 
"Russell King (Oracle)" <linux@armlinux.org.uk> writes:

> On Wed, Sep 07, 2022 at 11:16:22AM +0300, Kalle Valo wrote:
>> Russell King (Oracle) <rmk+kernel@armlinux.org.uk> writes:
>> 
>> > From: Hector Martin <marcan@marcan.st>
>> >
>> > 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>
>> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
>> > ---
>> >  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(+)
>> 
>> Is it ok to take this via wireless-next? Can I get an ack from the
>> maintainers of these files?
>
> I'm not sure who you're expecting to get an ack from.

The problem is that I don't know how .dts files are merged, that's why
I'm extra careful that I'm not breaking the normal flow for them.

> If it's the maintainers of these files, that'll be Hector himself, and
> as he authored the change, there seems to be little point in also
> having an Acked-by from him too.
>
> I just asked Hector on #asahi-dev:
> 17:21 < rmk> also, I think Kalle Valo is waiting on an answer on the arm64 DTS
>              changes for brcmfmac:
> 17:21 < rmk> Is it ok to take this via wireless-next? Can I get an ack from the
> 17:21 < rmk> maintainers of these files?
> 17:21 <@marcan> ah yeah, merging via wireless-next is fine, let me give you an
>                 ack

That sounds good to me, thanks!
diff mbox series

Patch

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";
 	};
 };