From 51aafb566d64906eb1c655f9932b3c006e62f088 Mon Sep 17 00:00:00 2001 From: Ryan Murray Date: Mon, 26 Oct 2026 10:36:46 +1100 Subject: [PATCH 1/2] arm64: dts: apple: repair the J616s PCI Wi-Fi schema description Name the BCM4388 PCI function while retaining the family fallback used by the driver for country and MAC properties. Allow that pair in the binding and omit the redundant root-port compatible. This is independent of GPU enablement, split from the J616s bring-up to keep that review focused. Assisted-by: LLM Signed-off-by: Ryan Murray --- .../devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + arch/arm64/boot/dts/apple/t6040-j616s.dts | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml index 81fd3e37452a6..8f935a2d2b320 100644 --- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml +++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml @@ -46,6 +46,7 @@ properties: - cypress,cyw4373-fmac - cypress,cyw43012-fmac - infineon,cyw43439-fmac + - pci14e4,4434 # BCM4388 - const: brcm,bcm4329-fmac - enum: - brcm,bcm4329-fmac diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index a40a3fa1e1dc0..c62fee61be44a 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -569,8 +569,7 @@ device_type = "pci"; port00: pci@0,0 { - compatible = "pciclass,0604"; - reg = <0 0 0 0 0>; + reg = <0 0 0 0 0>; ranges; interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>; @@ -592,7 +591,7 @@ }; wifi@0,0 { - compatible = "brcm,bcm4329-fmac"; + compatible = "pci14e4,4434", "brcm,bcm4329-fmac"; reg = <0 0 0 0 0>; brcm,ccode-map-trivial; brcm,board-type = "apple,hostomel"; From bbcf21a8b416f71a6eedfbb383b38b12b89b617a Mon Sep 17 00:00:00 2001 From: Ryan Murray Date: Mon, 26 Oct 2026 10:40:12 +1100 Subject: [PATCH 2/2] arm64: dts: apple: keep the root-port property indentation Preserve the existing indent after removing the redundant compatible. Assisted-by: LLM Signed-off-by: Ryan Murray --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index c62fee61be44a..65ee34b8b362f 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -569,7 +569,7 @@ device_type = "pci"; port00: pci@0,0 { - reg = <0 0 0 0 0>; + reg = <0 0 0 0 0>; ranges; interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>;