| Message ID | E1oVpne-005LCR-RJ@rmk-PC.armlinux.org.uk |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for bcm4378 on Apple platforms | expand |
"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 --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"; }; };