drop arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch from 4.14, 4.19, 4.9...

diff --git a/queue-4.14/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch b/queue-4.14/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
deleted file mode 100644 (file)
index 5c9fda2..0000000
--- a/queue-4.14/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 62e2af8a87cb3941ee72e39e9413ffea65aa5f22 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Apr 2022 11:28:05 +0100
-Subject: ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit 0e486fe341fabd8e583f3d601a874cd394979c45 ]
-
-The MCLK of the WM8731 on the AT91SAM9G20-EK board is connected to the
-PCK0 output of the SoC and is expected to be set to 12MHz. Previously
-this was mapped using pre-common clock API calls in the audio machine
-driver but the conversion to the common clock framework broke that so
-describe things in the DT instead.
-
-Fixes: ff78a189b0ae55f ("ARM: at91: remove old at91-specific clock driver")
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
-Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-Link: https://lore.kernel.org/r/20220404102806.581374-2-broonie@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-index ac9a1511e239..580747cb0879 100644
---- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-@@ -206,6 +206,12 @@ i2c-gpio-0 {
-               wm8731: wm8731@1b {
-                       compatible = "wm8731";
-                       reg = <0x1b>;
-+
-+                      /* PCK0 at 12MHz */
-+                      clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      clock-names = "mclk";
-+                      assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      assigned-clock-rates = <12000000>;
-               };
-       };
- 
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 664ae4d9e6c9317999d5be600f9b652f1d0c016f..d7e87820fa1b83860e24387f3f641a81f65870f5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -27,7 +27,6 @@ arm-dts-imx6qdl-apalis-fix-sgtl5000-detection-issue.patch
 phy-samsung-fix-missing-of_node_put-in-exynos_sata_p.patch
 phy-samsung-exynos5250-sata-fix-missing-device-put-i.patch
 arm-omap2-fix-refcount-leak-in-omap_gic_of_init.patch
-arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
 arm-dts-fix-mmc-order-for-omap3-gta04.patch
 ipvs-correctly-print-the-memory-size-of-ip_vs_conn_t.patch
 mtd-rawnand-fix-return-value-check-of-wait_for_compl.patch

diff --git a/queue-4.19/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch b/queue-4.19/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
deleted file mode 100644 (file)
index 14ac4ba..0000000
--- a/queue-4.19/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ad600b40ee0b44f26a5bbbe203e53667d90d98b2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Apr 2022 11:28:05 +0100
-Subject: ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit 0e486fe341fabd8e583f3d601a874cd394979c45 ]
-
-The MCLK of the WM8731 on the AT91SAM9G20-EK board is connected to the
-PCK0 output of the SoC and is expected to be set to 12MHz. Previously
-this was mapped using pre-common clock API calls in the audio machine
-driver but the conversion to the common clock framework broke that so
-describe things in the DT instead.
-
-Fixes: ff78a189b0ae55f ("ARM: at91: remove old at91-specific clock driver")
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
-Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-Link: https://lore.kernel.org/r/20220404102806.581374-2-broonie@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-index ec1f17ab6753..ae64d54cc96c 100644
---- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-@@ -218,6 +218,12 @@ i2c-gpio-0 {
-               wm8731: wm8731@1b {
-                       compatible = "wm8731";
-                       reg = <0x1b>;
-+
-+                      /* PCK0 at 12MHz */
-+                      clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      clock-names = "mclk";
-+                      assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      assigned-clock-rates = <12000000>;
-               };
-       };
- 
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 5163414d609280b622fb2684275883f8a7054692..da2788f2e92acfa2ef53b6c92a4778de489a1c01 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -25,7 +25,6 @@ arm-dts-imx6qdl-apalis-fix-sgtl5000-detection-issue.patch
 phy-samsung-fix-missing-of_node_put-in-exynos_sata_p.patch
 phy-samsung-exynos5250-sata-fix-missing-device-put-i.patch
 arm-omap2-fix-refcount-leak-in-omap_gic_of_init.patch
-arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
 arm-dts-fix-mmc-order-for-omap3-gta04.patch
 arm-dts-logicpd-som-lv-fix-wrong-pinmuxing-on-omap35.patch
 ipvs-correctly-print-the-memory-size-of-ip_vs_conn_t.patch

diff --git a/queue-4.9/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch b/queue-4.9/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
deleted file mode 100644 (file)
index a0423b9..0000000
--- a/queue-4.9/arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f304aae0f95a1ae9f4cdc0ab9c99084b998231a5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Apr 2022 11:28:05 +0100
-Subject: ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit 0e486fe341fabd8e583f3d601a874cd394979c45 ]
-
-The MCLK of the WM8731 on the AT91SAM9G20-EK board is connected to the
-PCK0 output of the SoC and is expected to be set to 12MHz. Previously
-this was mapped using pre-common clock API calls in the audio machine
-driver but the conversion to the common clock framework broke that so
-describe things in the DT instead.
-
-Fixes: ff78a189b0ae55f ("ARM: at91: remove old at91-specific clock driver")
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
-Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-Link: https://lore.kernel.org/r/20220404102806.581374-2-broonie@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-index 27847a47c108..a597b9b0cfb3 100644
---- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
-@@ -187,6 +187,12 @@ i2c-gpio-0 {
-               wm8731: wm8731@1b {
-                       compatible = "wm8731";
-                       reg = <0x1b>;
-+
-+                      /* PCK0 at 12MHz */
-+                      clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      clock-names = "mclk";
-+                      assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-+                      assigned-clock-rates = <12000000>;
-               };
-       };
- 
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index a88c89eaf290ff1546ae5cae2d95f6a29029e872..f28d3ab6d822e6adfc9b498de89577711464267b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,7 +22,6 @@ arm-dts-imx6qdl-apalis-fix-sgtl5000-detection-issue.patch
 phy-samsung-fix-missing-of_node_put-in-exynos_sata_p.patch
 phy-samsung-exynos5250-sata-fix-missing-device-put-i.patch
 arm-omap2-fix-refcount-leak-in-omap_gic_of_init.patch
-arm-dts-at91-map-mclk-for-wm8731-on-at91sam9g20ek.patch
 arm-dts-fix-mmc-order-for-omap3-gta04.patch
 mtd-rawnand-fix-return-value-check-of-wait_for_compl.patch
 pinctrl-pistachio-fix-use-of-irq_of_parse_and_map.patch