From patchwork Wed Aug 28 03:39:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacobe Zang X-Patchwork-Id: 13780466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6A81C5474A for ; Wed, 28 Aug 2024 03:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=M1/yXINwA81nMjixGhpNBxFuWNS5aMWklBVqYG9nLGE=; b=J53Qcs7NvoBgOPdw0xHqgKQStH GZhCHIiiCoRz3vl2XoOl6+cmV+deBu8nYZfU1Lb7YLFWY6noGw5Y14bqahDyvt5UH11xvkvUN9FlC DrGuUibNv0zPh+q53rBaZFV8gB6KHIcuZIKyudd5+HI7wGbIy+i1sH7DpDFbi1CQn1Pyg+us3CODs ju/biNZn21FF5W7yuVpKVKXZoZNXWBDklFH33GhmgELSyPRb4ThU8ftMhixVrzZr+XHOmFcploWsl 66SauiCsRcoqUbfjdHAMCRQ5452+broO/n9Zh0nLtUk3vywFi06MXzApecF9VEUnT4vHVo/owPzor 6RJSJqOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj9at-0000000DgbY-16dP; Wed, 28 Aug 2024 03:43:39 +0000 Received: from mail-sgaapc01on20707.outbound.protection.outlook.com ([2a01:111:f400:feab::707] helo=APC01-SG2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj9YY-0000000Dg0n-3IC8; Wed, 28 Aug 2024 03:41:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hP4AkVPAcadByocMr7xKpw0i6RtNbfhBu+7qNdfdPOFQ7tHS0+QlR4fTacaDzQDgYDIHjpTRUHGlaE51DVzzT3wcgBLzycHghrHc40n62AfFWbb4HwC81kZ9VP2JplEk5UAsdPvCPDN5vMBH/i8Ehzdhf6Vu2GVe64aSzp5Z2/wQO57NKE2wrNmUeh70NK1hul+u6QDcpDZ0Hqr5W40ZFqlGGzQi9TciMCwJm9gzShYJ+PTPLaQhb86CQWO1SOXWDJfqPxp61qXsrDEZyN2/aG0eoQHtseVMPlTj86wt9i90sFfwT+bBbXQWK/VttILt8DVBbxeSDzzRF4GMkCYFaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M1/yXINwA81nMjixGhpNBxFuWNS5aMWklBVqYG9nLGE=; b=WgVLEmeTTndG3UbvTsTbzI164OlUsFZkqMC8l28ghm8qpP3+nN35Rx3LteZV5ZcJxO5cbOfkLC9HaXZjiQkTpZ8ZP4xpWQWSnf8zPpIo1qZYdf/V1oKvVhY3TV9LIhfS9Q+IsZEmlBwqWBSGKqwqn0oFARrZe2FFb+Z2HMJtFMaOyM84r2+dEOrPrhQqVWG2lwbnn0gCPR4bqPIkAPkwenDLaT/XT2n627aYkFrx8bMktvlnSGAV3S5X0keaUtLFzRQ48ywPI136V5sZOgo4Z9dXeo9hyYwwTnP+XJCQ8M4M1dVV013NAJTg8SoZnL0HfZF2+ahEtf4Ds/zkZU6nFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wesion.com; dmarc=pass action=none header.from=wesion.com; dkim=pass header.d=wesion.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wesion.com; Received: from TYZPR03MB7001.apcprd03.prod.outlook.com (2603:1096:400:26a::14) by TYSPR03MB7977.apcprd03.prod.outlook.com (2603:1096:400:47f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.19; Wed, 28 Aug 2024 03:40:59 +0000 Received: from TYZPR03MB7001.apcprd03.prod.outlook.com ([fe80::78dd:5e68:1a9c:36c0]) by TYZPR03MB7001.apcprd03.prod.outlook.com ([fe80::78dd:5e68:1a9c:36c0%4]) with mapi id 15.20.7875.019; Wed, 28 Aug 2024 03:40:59 +0000 From: Jacobe Zang To: marcan@marcan.st, sven@svenpeter.dev, alyssa@rosenzweig.io, robh@kernel.org, heiko@sntech.de, krzk+dt@kernel.org Cc: linux-rockchip@lists.infradead.org, dsimic@manjaro.org, conor+dt@kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, nick@khadas.com, Jacobe Zang Subject: [PATCH v12 2/2] arm64: dts: apple: add "brcm,bcm4329-fmac" fallback compatible Date: Wed, 28 Aug 2024 11:39:53 +0800 Message-Id: <20240828033953.967649-3-jacobe.zang@wesion.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240828033953.967649-1-jacobe.zang@wesion.com> References: <20240828033953.967649-1-jacobe.zang@wesion.com> X-ClientProxiedBy: TYCP286CA0185.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::20) To TYZPR03MB7001.apcprd03.prod.outlook.com (2603:1096:400:26a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR03MB7001:EE_|TYSPR03MB7977:EE_ X-MS-Office365-Filtering-Correlation-Id: b24ff4ca-9aad-4940-822a-08dcc7133b38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|7416014|38350700014; X-Microsoft-Antispam-Message-Info: Kvckncp4+1dRZQthUbRi+3JVH6TclnCVXBA9qnUSmKeaGN2ZNcFH+Z+vddX2HOZoO1Gx4vVjW+aGnUao1Dk+PLaJy752RSpgK8a/++93xFjUpUui39n+OaMYMtJNDquhm8InYjbGuNAg8JUxqZENulL5jK/HS0UHGicNgCrVwGRl2MJ/1S65+1ffgOQ+xOm0T9OovBSVIlzGoQV5qHO7aIdHdiDHuDS257ORrPKkybAiP7D9giKRzvlQuOp7xhJnr/H4VpmQCOVNu5/RIrk/Etu6XSimixCs6KioS5fZ9EdLedL6W3drWIjzmLiThWCxAIqFbhy/PM/rnQ6VsHetMkz+JrFY6mfiOd3T2Jf/eQ2zbV7Xcsk6mm4EEpz3ToWFco8QlrPGg4E/QDHxXNsZu/nur54eqxfDZH/zZBMbI+f7vcpw9fbLisSc/XjHs/5XI7cOsYe8HugVvfvUY2BD7tDhf1kVo+XsO0KmsevnMQf8iAHzN53jKuXWUw7GvySb7st5j1AbC4bcUGMIxdi8V+LIbPqLylloh7/j7Mr3y4E2szFpsLpbZSRGTTozu8lb3pt1wmnj0yiooXDmugtl7UuwDSG72Xry0nyjZonFosT3627Uw7DPXbnBMSLw3B8OKBkS36D+NsQ58BafVhOYvrXI73k9hn+v1+iFo75Up8yxvQO8JviQ1BrlwOR9q8oN3Y2A5rDaAi5OsYrgJs3QXMR1bSYrjV50y6Cqdl3C5feCFRYvBI7nyPdn0ha/UGjUeqgesPZOnUR13ZcaDHUcIhqwwlCXrLToVolzqEd6ZlTpZd23Vx/rMU+Vi/OD3YGeJebDfg0XDlNX5EuC2jb5iVJ+ek4dRwN+cGZfK0uhSZxXT/v0Icd7oPjXrvHYUBEUeBRmViFZpLHRsDd5qbLGRovsJdJLeU2LyHnouSU4H/1takhAyL9h0HCm/G65q3Th1XAOFxpbfWjSPT2orwMWm5Doxhu1tkW03JjHCdGVzzP3DbIjwnUAUlJbY4oF2hwmYpmdlqU2PUrGZwfDqW5lFLTwjvqZ/KqEuogAIxfc+a7Y3TiYHJyD/WXllDa22i6unCyOkiLTPs9B/J+ij13dpRoTgdnvLZDu8z8u5HJn8X5qj/APe/1Y72E/0weCRZhWVhQ2R+Tel1V8taYH60/vL6li/TqCOUzca91cAFMv6wcFAMEXbP/R3X4kFAia41SlNDISFS2LjhANrXuoZ6uOo06Y5MlUph6m12qRPHkCY+fKf18BwYajIPBBo6zT8LDdOejtxohljXkJAFcHz9ub84Wp6e/SKKKA9wdZkSIg+IZ8XbvlmZewJHq2b5i+aULK5ARDnGLPouoiEqeLgZScw1XusJy0kBJECvdEDC9QEwPyZqEcgBwz789xorgHfv0SrNHm4KiH8kX68PhjNn9f6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR03MB7001.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(7416014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Z44O3YfNl2N7M/RqEN0lzTZe/hwB/VoH661GYBSCHExZDbH7bqVQHhJ+FYtVjjlRHRy67k8MkxPTmMdS4ZfNUt2h0dLzaOsNFaYLZDW5Ykftd/SGLK3ZDjiK0EkYAZgCiC/B2XjhaQ+OOwVC/gmj5Sc7nEQrMvlzK9H7Wqjlaxun7cUmZdlns79FmoFa3NoPC78/nMmzKDBpgkrcUWn3xzpRnY6orq3zsTE1trMGC6SPamgtTzyE6XzZFhiKv5hSNQxvZWlekov9Ro+7KWUL+lw1g5gf/NNyH5Q+gVs2Yze6S5+kKrTNKdBIYAEfShMm543TxHK2fxys1knK2MhJiszKNnrsWmUT1dw1RE9TCshcgGySzZuUReUu9FyYzuZoaoajdLBJNdUU5qAbZBsGZYsVsUqt8TLAAiDixQQXqVAX+zfUO1n8vkliIfuUcLfBV6n3bccbSvviSYDzmGq++PqdgRxAhzfSoAUBVJukhgYcOBVO59VeX+FOwNvzTOg1M4F33Ug0bTIhVj9ro+hK+PQ7ITzhRGv+nzuu7br+G2gLmjuBnifpuHUPG4z10B3OgJmxNUnhfrRlOJIxfLDeOVByuU9xsmrgkk2gTDFy8DIVsSH25uZwAKxvfoOHeNhDL3IIMZ3iFX4LG44iENQ4TkezzZMyMqAyrZC9AI3IHHuE6m3YQd7d72WoUg8CERemAuqof5tUxBJnVZGHJZ25IYO7/eEztWsUk/b1OoXY8HMxLoDrdrMq1lOXP5aTuV5h4AJ+hMVkvjkFCjLjU+38jVHq2ZXSQ/CD06XLtrTfqog5b5GMv/BB8YcsnR4YCbLEfIdwmGFQg78idDcS4TXguHLNE24S0qdaYGcqQQMjjYX1azmTytzBBWt20N5C8yUWJUSgwiHySpYjqpCT+7q9NEnuTGIG8pg/Fmi4iscwuZh4Pt8ZD+ZXZB3l8Zk91gNg7wOGQFgv5iGP8MlZkbABWah0yQoLRNHYR60pOwKmFx929mBV8k4hZhji3JYIkFEvvomYtmUzpIGeKfDdPMGSOKAwptLVtca7GaaoRc3GsaezE6T5H299sK4htJQLMf8m1+mJgwyYV9eZs8+2kKLhDuLuUkIBJYxbMTVrwJh+WYxMsfOPHMMgBYZhWjvPEF16cxgYBmWbp8yj0W55YspgGA+OWWkC+QntaXpenD+7zBpVPqp/pZ7J5NKvnth8XbrUiGjkfKoU9kiNqM91LancxLviJAqSMvyEhxtg28e+5FLhgPKpOTwihYsv57HUhJ5VHnPH3CprhvDmZJSN2EKaB8RNVMiNRMYl1KVLsywFmr2mPTRjsaTCI8nMmG9+323aKxSaVtyBmojJmsIaBdZfdes8iNtyup/HjprCSk90JmobN2r4sneu7PlyGiJAtvqQGoOmxKtML48UczZdoyStUIZdu5fE/Myz8LUwWjK5dZULQqNDIV8M0Uv73DUVpukd1+W52uEBVM3dFnepsgBZjR7TygyMgyhRVhg3w8e8448H59Ly0HXO65HDj2FhB6GNSYfqxrPetvOhmVl9rsRJQ93SRG4BGHvWmDYhwJhj4FowBiMKFctLGQl5j4YBqlB X-OriginatorOrg: wesion.com X-MS-Exchange-CrossTenant-Network-Message-Id: b24ff4ca-9aad-4940-822a-08dcc7133b38 X-MS-Exchange-CrossTenant-AuthSource: TYZPR03MB7001.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2024 03:40:59.3956 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2dc3bd76-7ac2-4780-a5b7-6c6cc6b5af9b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OIXJ2GRK9omC5Q1E/AeAevDhAftoT1tr4mOYKOXRn1GlVttAYaf0dppPWzqtHP7f0AgU76TajVca6peEKpu4XQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR03MB7977 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_204114_846271_192F4A24 X-CRM114-Status: GOOD ( 10.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Broadcom driver need to check "brcm,bcm4329-fmac" compatible. Before PCIe devices used PCI ID as base compabile so add it as fallback compatible to pass the check. Signed-off-by: Jacobe Zang --- 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 5988a4eb6efaa..4b021626d4692 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 6f69658623bf8..df2a63d8dd5e9 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 0ad908349f554..5f3453e109b85 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];