From: Mark Kettenis <mark.kettenis@xs4all.nl>
To: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Cc: aspriel@gmail.com, franky.lin@broadcom.com,
hante.meuleman@broadcom.com, alyssa@rosenzweig.io,
asahi@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com,
davem@davemloft.net, devicetree@vger.kernel.org,
edumazet@google.com, marcan@marcan.st, kuba@kernel.org,
kvalo@kernel.org, krzysztof.kozlowski+dt@linaro.org,
linux-arm-kernel@lists.infradead.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
pabeni@redhat.com, zajec5@gmail.com, robh+dt@kernel.org,
SHA-cyfmac-dev-list@infineon.com, sven@svenpeter.dev
Subject: Re: [PATCH net-next 12/12] arm64: dts: apple: Add WiFi module and antenna properties
Date: Wed, 7 Sep 2022 11:27:25 +0200 (CEST) [thread overview]
Message-ID: <d3ced546b81f9820@bloch.sibelius.xs4all.nl> (raw)
In-Reply-To: <E1oVpne-005LCR-RJ@rmk-PC.armlinux.org.uk> (rmk+kernel@armlinux.org.uk)
> 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
>
>
>
next prev parent reply other threads:[~2022-09-07 9:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 7:46 [PATCH net-next 0/12] Add support for bcm4378 on Apple platforms Russell King (Oracle)
2022-09-07 7:47 ` [PATCH net-next 01/12] dt-bindings: net: bcm4329-fmac: Add Apple properties & chips Russell King
2022-09-07 9:25 ` Mark Kettenis
2022-09-07 15:47 ` Rob Herring
2022-09-07 7:47 ` [PATCH net-next 02/12] brcmfmac: firmware: Handle per-board clm_blob files Russell King
2022-09-07 7:47 ` [PATCH net-next 03/12] brcmfmac: pcie/sdio/usb: Get CLM blob via standard firmware mechanism Russell King
2022-09-07 7:48 ` [PATCH net-next 04/12] brcmfmac: firmware: Support passing in multiple board_types Russell King
2022-09-07 7:48 ` [PATCH net-next 05/12] brcmfmac: pcie: Read Apple OTP information Russell King
2022-09-07 7:48 ` [PATCH net-next 06/12] brcmfmac: of: Fetch Apple properties Russell King
2022-09-07 7:48 ` [PATCH net-next 07/12] brcmfmac: pcie: Perform firmware selection for Apple platforms Russell King
2022-09-07 7:48 ` [PATCH net-next 08/12] brcmfmac: firmware: Allow platform to override macaddr Russell King
2022-09-07 7:48 ` [PATCH net-next 09/12] brcmfmac: msgbuf: Increase RX ring sizes to 1024 Russell King
2022-09-07 7:48 ` [PATCH net-next 10/12] brcmfmac: pcie: Support PCIe core revisions >= 64 Russell King
2022-09-07 7:48 ` [PATCH net-next 11/12] brcmfmac: pcie: Add IDs/properties for BCM4378 Russell King
2022-09-07 7:48 ` [PATCH net-next 12/12] arm64: dts: apple: Add WiFi module and antenna properties Russell King
2022-09-07 8:16 ` Kalle Valo
2022-09-13 16:28 ` Russell King (Oracle)
2022-09-16 7:27 ` Kalle Valo
2022-09-07 9:27 ` Mark Kettenis [this message]
2022-09-07 8:14 ` [PATCH net-next 0/12] Add support for bcm4378 on Apple platforms Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d3ced546b81f9820@bloch.sibelius.xs4all.nl \
--to=mark.kettenis@xs4all.nl \
--cc=SHA-cyfmac-dev-list@infineon.com \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=aspriel@gmail.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=sven@svenpeter.dev \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).