From patchwork Tue Aug 20 10:12:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 820942 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1475818D647 for ; Tue, 20 Aug 2024 10:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724148754; cv=none; b=IyP/FlDYT/LW0mz5mDJJ1BeavnVPXEMjDwaIrwO8J7vAhykh8MlPpd7Q4TXMR2kniUAqW8A+RYF/Uoebhq9xUxpMvt8MIYFtf1IuRf7lJr/YEX8VHGZi3vNp0q48hAQhjCOOkFO11u7ZhBCCmLLEgmXF459PqD5Gbpq8zUj9x94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724148754; c=relaxed/simple; bh=W644OxWrT67qvyKAGwS0o5Px/YgwCYVCIzFvJEpdSXo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=byeAaHM2B7jLFrG2poYj3yA14QpFUevIsWPyTdeKjn8LhX7YreGwDTrUgQK+u0PiTrphoDQzTBQ17lH9OqTgE1E5axMFzDNFNO6pekukn7IZnd1jmt+FFse3qDNTeA6r45wvOklgfTp5Q345odmPpMJzXLKsP0a7Pdo89kGNtfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=C2dZyN5u; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="C2dZyN5u" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-70ea2f25bfaso3898813b3a.1 for ; Tue, 20 Aug 2024 03:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1724148752; x=1724753552; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=st/i+sGXRsN4w3kxPextDmUHrJmeWMOfYodvp9lM/R0=; b=C2dZyN5uRJ7SPGdaHJJHxQXdeckW0udq3WfAjZPFHWnp6dnfqRD1aUOZpOyPp1DIOp m00m9Sla3wf6V1Vj3UwiJmlcItNSWLI46SHzDi59afl4IJkRVB1MKkbt87bjVoRa1Di1 lc4UzZzPSG9j7QqiSFP6MkRU5EKD/kTcqxkfg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724148752; x=1724753552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=st/i+sGXRsN4w3kxPextDmUHrJmeWMOfYodvp9lM/R0=; b=HhLIgOndbv1PUjcxnOL4r5OfpXlObnsOCqKlcEBuAVuoWy8WITzz4guY1T2bOFIta0 sf5XCCZ1rThCwDx3UPBT9TovJAWimPWlqpdhqZ4/MbztE12h2IggROo3BSDnuwnguuMa 1Asb1OeQCzFfWnY/aBpyIV4GpNr1mhU4AN2G3UVPLofYLlxINh5tqEZ2AVSfAnetCCmc 5ZYUn7dNAo20WHwA3EQJ1ZscjACgcwMxk6vz/2fkWvouhkfQiuLzmoai81rjcBtezGGX xoDDUF1Ui6CoI0rd0vUqI5ytheIPUl2fO6JEDJFzOx98bBpxwf/YB1q0TpZaIQ5wVFPH 97wg== X-Forwarded-Encrypted: i=1; AJvYcCV6uCIIe4a8s1GlZr/LWQf2erGyLQnStSK1RQ0GuO2v9rhtzgQNXXY4LxW5Se4M+FBfXdu6gmI4GKrvjju8zJVezVV9pFqRAxiBEamI544= X-Gm-Message-State: AOJu0YywYAHiK28bvF5UPQZks9RHPmSO0OdHsPSyNkjnohj6RAB+gsbm jedGJn2a8MjWJBU/0snFkM48lKB6WL6F0dUjYiucbKt2hoc0XaQ8XnftIM+sSw== X-Google-Smtp-Source: AGHT+IFRvQW8NsQ+qPYeONdzztKRefuQZmv777XGiLSXepx7b8zuT6dl3melnSswYK9JmHYmoWB2Ew== X-Received: by 2002:a05:6a21:3115:b0:1c0:f1c9:6835 with SMTP id adf61e73a8af0-1c90505887amr13980615637.51.1724148752214; Tue, 20 Aug 2024 03:12:32 -0700 (PDT) Received: from bld-bun-02.bun.broadcom.net ([192.19.176.227]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-713f3c35cf0sm3111052b3a.173.2024.08.20.03.12.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Aug 2024 03:12:31 -0700 (PDT) From: Arend van Spriel To: Kalle Valo , Hector Martin , Krzysztof Kozlowski Cc: devicetree@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, asahi@lists.linux.dev, Arend van Spriel Subject: [PATCH 2/2] arm64: boot: apple: fixup wifi device specification Date: Tue, 20 Aug 2024 12:12:16 +0200 Message-Id: <20240820101216.355012-3-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20240820101216.355012-1-arend.vanspriel@broadcom.com> References: <20240820101216.355012-1-arend.vanspriel@broadcom.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Align with the corrected device tree bindings in brcm,bcm4329-fmac.yaml which imposes a constraint that the compatible should have the string "brcm,bcm4329-fmac". Fixes: e2e37224e8b3 ("dt-bindings: net: bcm4329-fmac: Add Apple properties & chips") Signed-off-by: Arend van Spriel --- arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +- arch/arm64/boot/dts/apple/t8112-j413.dts | 2 +- arch/arm64/boot/dts/apple/t8112-j493.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi index 5988a4eb6efa..4b021626d469 100644 --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi @@ -72,7 +72,7 @@ hpm1: usb-pd@3f { &port00 { bus-range = <1 1>; wifi0: network@0,0 { - compatible = "pci14e4,4425"; + compatible = "pci14e4,4425", "brcm,bcm4329-fmac"; reg = <0x10000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 00 00 00 00 00]; diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts b/arch/arm64/boot/dts/apple/t8112-j413.dts index 6f69658623bf..df2a63d8dd5e 100644 --- a/arch/arm64/boot/dts/apple/t8112-j413.dts +++ b/arch/arm64/boot/dts/apple/t8112-j413.dts @@ -43,7 +43,7 @@ led-0 { &port00 { bus-range = <1 1>; wifi0: wifi@0,0 { - compatible = "pci14e4,4433"; + compatible = "pci14e4,4433", "brcm,bcm4329-fmac"; reg = <0x10000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 10 18 00 00 10]; diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts index 0ad908349f55..5f3453e109b8 100644 --- a/arch/arm64/boot/dts/apple/t8112-j493.dts +++ b/arch/arm64/boot/dts/apple/t8112-j493.dts @@ -43,7 +43,7 @@ led-0 { &port00 { bus-range = <1 1>; wifi0: wifi@0,0 { - compatible = "pci14e4,4425"; + compatible = "pci14e4,4425", "brcm,bcm4329-fmac"; reg = <0x10000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 00 00 00 00 00];