Drop arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch b/queue-5.10/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
deleted file mode 100644 (file)
index 38b6a01..0000000
--- a/queue-5.10/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From e44c3a63cc016c24e2893b8f5e842f46e0984e47 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 5 May 2021 09:59:37 -0400
-Subject: ARM: dts: exynos: align Broadcom WiFi with dtschema
-
-From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
-
-[ 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 <krzysztof.kozlowski@canonical.com>
-Link: https://lore.kernel.org/r/20210505135941.59898-1-krzysztof.kozlowski@canonical.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 f9e3b13d3aac..8ef20a66e24e 100644
---- a/arch/arm/boot/dts/exynos3250-rinato.dts
-+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
-@@ -653,7 +653,7 @@
-       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 7777bf51a6e6..083408f3f695 100644
---- a/arch/arm/boot/dts/exynos4210-i9100.dts
-+++ b/arch/arm/boot/dts/exynos4210-i9100.dts
-@@ -746,7 +746,7 @@
-       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 a226bec56a45..68635dad541f 100644
---- a/arch/arm/boot/dts/exynos4210-trats.dts
-+++ b/arch/arm/boot/dts/exynos4210-trats.dts
-@@ -501,7 +501,7 @@
-       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 08284e8f3624..28361994ff80 100644
---- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
-+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
-@@ -596,7 +596,7 @@
-       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
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 21ecebe26174ed97c6e1b54f9f8c432ec09b45dd..5912e17075ae13a365bd1bde1731051c88412dc5 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -17,7 +17,6 @@ arm-cygnus-dts-fix-nand-nodes-names.patch
 arm-nsp-dts-fix-nand-nodes-names.patch
 arm-dts-bcm63xx-fix-nand-nodes-names.patch
 arm-dts-hurricane-2-fix-nand-nodes-names.patch
-arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
 arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch
 arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch
 arm64-dts-rockchip-fix-regulator-gpio-states-array.patch

diff --git a/queue-5.13/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch b/queue-5.13/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
deleted file mode 100644 (file)
index 0b08fcf..0000000
--- a/queue-5.13/arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From b4409cafd9f543ccd89f3a459f8d175134c2f638 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 5 May 2021 09:59:37 -0400
-Subject: ARM: dts: exynos: align Broadcom WiFi with dtschema
-
-From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
-
-[ 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 <krzysztof.kozlowski@canonical.com>
-Link: https://lore.kernel.org/r/20210505135941.59898-1-krzysztof.kozlowski@canonical.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 @@
-       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 @@
-       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 @@
-       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 @@
-       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
-

diff --git a/queue-5.13/series b/queue-5.13/series
index 7cc742562251591a0576cdc717d854cb27b91374..0744578045c7402e49ec95174f71cbdabe249600 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -21,7 +21,6 @@ arm-dts-bcm63xx-fix-nand-nodes-names.patch
 arm-dts-hurricane-2-fix-nand-nodes-names.patch
 arm-dts-bcm5301x-fix-pinmux-subnodes-names.patch
 soc-bcm-brcmstb-remove-unused-variable-brcmstb_machi.patch
-arm-dts-exynos-align-broadcom-wifi-with-dtschema.patch
 soc-mediatek-add-missing-module_device_table.patch
 arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch
 arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch