Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp672074pxv; Wed, 14 Jul 2021 12:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Hy9DeHE4lzPFe4y7qK5vGK77ayGozqxQW5qJB0TqiKT8fthospl2QmB0WIQHoNC9DI/B X-Received: by 2002:a17:907:3d88:: with SMTP id he8mr14053279ejc.296.1626291643548; Wed, 14 Jul 2021 12:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291643; cv=none; d=google.com; s=arc-20160816; b=kgTX9ojipqsjPZYQu3NAZrYd69Gr3G3inR8dPec6awb0YSsgw5DHphoel2U2bUhlI3 rLQ2/ofjqRsInrHlTQZoUnSFmCF4RK6d98TF8YS+yoA9YlV5BatC5vVYx1BMH2mDoqqn 6bzmS+fUdB3R6iJiPmO3mfAB/aqliYehRwe9QhZ2P2szw/RZ5xj5dd36XlQ/sDDeR7Nc v/4uJ/SZSk+HPryCj7n9hBGiloC9+PdCl029lLucfLW35X6Gj+4f57ddPVE34HG0K7l6 nQiedBOkO9YSLA/oih64FVJxtqCeXS00tWO5cwTlGngF0OQJVASaMJ9krnfuSPZ3AdDv x2rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=//CPLYnsm5sr5dRVCpSYt1X+uCCXMRIeR4t7ZWjD/Es=; b=oZpFDjQ3pz+2CvqigN8sFmWE+qbDsscHp1buh7CUXECC6WyrnORhJHJwdJSTbTsGwk EimxwgY5X1TFrjtoBd0VAoAB8bhcGWOu9D1rI/c3qxHxHM9O8A4AQDZsvdl/E++m1yz5 Yin4YWqOfGYnWQyykopFirPbn+QmeI3N/22MYHFYA4aSr8/ryBukG4BcQebiVAcxzCt5 yfj1wwzxn7P06FpK65ooCniLzDX+p2lN5Tp78V2p6VkQVW8r4renT/xUCEAz7blfxhyF 1r+k3GL0asln6aqRXoPKaKfhsEEWhR/mOsgjrjLMyKyWN++llw/+xS/H16ePmaiG6d3c upWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vJ5ySzOX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m18si3389372edq.10.2021.07.14.12.40.20; Wed, 14 Jul 2021 12:40:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vJ5ySzOX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233469AbhGNTlp (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:35768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233427AbhGNTla (ORCPT ); Wed, 14 Jul 2021 15:41:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9E9EB613E5; Wed, 14 Jul 2021 19:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291518; bh=YqPZ4A7rwODNHcwjLupbqwVXr++J4UcLSbXKtNNQLfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vJ5ySzOXEkGGTvpv0g0yIt0HmH3v601oJ8dK7zJOjqfcMDXSL2/B1YEDqEiwDuXWV sOngoq7iT372+DSUVuDWpD4+rslrhKlVPazMPFPY1RVty2NovgXq9i40AMOo9pQtxY qjmUJhSyPH0/RJT0JUB2pwP+NOBTicMYkhLnOz8DvqXe69uBndqNy4175nFXTNZ0s/ qQulOrrEtcGVgXDfPCYeBNdzS9MkhrDlxu/zlLKhJdGphduNbWhoFUivRe/6p/kuDM 5r6J4e5a4J6ckzRLvODfCNDxjUYqKNSaG3A6p1PLQm/E7H7Uxd+d8yxNbx8fzGyf+V OZvD8kNE/LVEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Krzysztof Kozlowski , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 025/108] ARM: dts: exynos: align Broadcom WiFi with dtschema Date: Wed, 14 Jul 2021 15:36:37 -0400 Message-Id: <20210714193800.52097-25-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714193800.52097-1-sashal@kernel.org> References: <20210714193800.52097-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Krzysztof Kozlowski [ Upstream commit cc29e39412b9a78b43f7dfa09d739f8ba9fa7984 ] The Broadcom BCM4329 family dtschema expects devices to be compatible also with brcm,bcm4329-fmac: arch/arm/boot/dts/exynos3250-rinato.dt.yaml: wifi@1: compatible: 'oneOf' conditional failed, one must be fixed: ['brcm,bcm4334-fmac'] is too short 'brcm,bcm4329-fmac' was expected Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20210505135941.59898-1-krzysztof.kozlowski@canonical.com Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index c52b9cf4f74c..f6ba5e426040 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -653,7 +653,7 @@ &mshc_1 { mmc-pwrseq = <&wlan_pwrseq>; brcmf: wifi@1 { - compatible = "brcm,bcm4334-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx1>; diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index 525ff3d2fac3..db70f62cc08f 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -806,7 +806,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>; diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index d2406c9146b8..3eb8df319246 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts @@ -521,7 +521,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>; diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index dd44ad2c6ad6..f052853244a4 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -614,7 +614,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; -- 2.30.2