| Message ID | 20210505135941.59898-1-krzysztof.kozlowski@canonical.com |
|---|---|
| State | Accepted |
| Commit | cc29e39412b9a78b43f7dfa09d739f8ba9fa7984 |
| Headers | show |
| Series | [1/5] ARM: dts: exynos: align Broadcom WiFi with dtschema | expand |
On Wed, 5 May 2021 09:59:37 -0400, Krzysztof Kozlowski wrote: > 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 Applied, thanks! [1/5] ARM: dts: exynos: align Broadcom WiFi with dtschema commit: cc29e39412b9a78b43f7dfa09d739f8ba9fa7984 [2/5] ARM: dts: exynos: replace legacy MMS114 touchscreen x/y properties in GT-N7100 commit: 8bceb2a490bb8e1048e9c73520f49a65823108a4 [3/5] ARM: dts: exynos: fix PWM LED max brightness on Odroid XU/XU3 commit: 75121e1dc9fe4def41e63d57f6a53749b88006ed [4/5] ARM: dts: exynos: fix PWM LED max brightness on Odroid HC1 commit: a7e59c84cf2055a1894f45855c8319191f2fa59e [5/5] ARM: dts: exynos: fix PWM LED max brightness on Odroid XU4 commit: fd2f1717966535b7d0b6fe45cf0d79e94330da5f Best regards,
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>;
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 <krzysztof.kozlowski@canonical.com> --- 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(-)