drop 4.14 patch that never even applied.

diff --git a/queue-4.14/arm-dts-exynos-specify-i2s-assigned-clocks-in-proper-node.patch b/queue-4.14/arm-dts-exynos-specify-i2s-assigned-clocks-in-proper-node.patch
deleted file mode 100644 (file)
index aae99d8..0000000
--- a/queue-4.14/arm-dts-exynos-specify-i2s-assigned-clocks-in-proper-node.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 8ac686d7dfed721102860ff2571e6b9f529ae81a Mon Sep 17 00:00:00 2001
-From: Sylwester Nawrocki <s.nawrocki@samsung.com>
-Date: Wed, 12 Dec 2018 18:57:44 +0100
-Subject: ARM: dts: exynos: Specify I2S assigned clocks in proper node
-
-From: Sylwester Nawrocki <s.nawrocki@samsung.com>
-
-commit 8ac686d7dfed721102860ff2571e6b9f529ae81a upstream.
-
-The assigned parent clocks should be normally specified in the consumer
-device's DT node, this ensures respective driver always sees correct clock
-settings when required.
-
-This patch fixes regression in audio subsystem on Odroid XU3/XU4 boards
-that appeared after commits:
-
-commit 647d04f8e07a ("ASoC: samsung: i2s: Ensure the RCLK rate is properly determined")
-commit 995e73e55f46 ("ASoC: samsung: i2s: Fix rclk_srcrate handling")
-commit 48279c53fd1d ("ASoC: samsung: i2s: Prevent external abort on exynos5433 I2S1 access")
-
-Without this patch the driver gets wrong clock as the I2S function clock
-(op_clk) in probe() and effectively the clock which is finally assigned
-from DT is not being enabled/disabled in the runtime resume/suspend ops.
-
-Without the above listed commits the EXYNOS_I2S_BUS clock was always set
-as parent of CLK_I2S_RCLK_SRC regardless of DT settings so there was no issue
-with not enabled EXYNOS_SCLK_I2S.
-
-Cc: <stable@vger.kernel.org> # 4.17.x
-Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
-index 03611d50c5a9..e84544b220b9 100644
---- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
-+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
-@@ -26,8 +26,7 @@
-                       "Speakers", "SPKL",
-                       "Speakers", "SPKR";
- 
--              assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>,
--                              <&clock CLK_MOUT_EPLL>,
-+              assigned-clocks = <&clock CLK_MOUT_EPLL>,
-                               <&clock CLK_MOUT_MAU_EPLL>,
-                               <&clock CLK_MOUT_USER_MAU_EPLL>,
-                               <&clock_audss EXYNOS_MOUT_AUDSS>,
-@@ -36,8 +35,7 @@
-                               <&clock_audss EXYNOS_DOUT_AUD_BUS>,
-                               <&clock_audss EXYNOS_DOUT_I2S>;
- 
--              assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>,
--                              <&clock CLK_FOUT_EPLL>,
-+              assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
-                               <&clock CLK_MOUT_EPLL>,
-                               <&clock CLK_MOUT_MAU_EPLL>,
-                               <&clock CLK_MAU_EPLL>,
-@@ -48,7 +46,6 @@
-                               <0>,
-                               <0>,
-                               <0>,
--                              <0>,
-                               <196608001>,
-                               <(196608002 / 2)>,
-                               <196608000>;
-@@ -84,4 +81,6 @@
- 
- &i2s0 {
-       status = "okay";
-+      assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
-+      assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
- };
-diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
-index 4a30cc849b00..122174ea9e0a 100644
---- a/arch/arm/boot/dts/exynos5422-odroidxu4.dts
-+++ b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
-@@ -33,8 +33,7 @@
-               compatible = "samsung,odroid-xu3-audio";
-               model = "Odroid-XU4";
- 
--              assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>,
--                              <&clock CLK_MOUT_EPLL>,
-+              assigned-clocks = <&clock CLK_MOUT_EPLL>,
-                               <&clock CLK_MOUT_MAU_EPLL>,
-                               <&clock CLK_MOUT_USER_MAU_EPLL>,
-                               <&clock_audss EXYNOS_MOUT_AUDSS>,
-@@ -43,8 +42,7 @@
-                               <&clock_audss EXYNOS_DOUT_AUD_BUS>,
-                               <&clock_audss EXYNOS_DOUT_I2S>;
- 
--              assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>,
--                              <&clock CLK_FOUT_EPLL>,
-+              assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
-                               <&clock CLK_MOUT_EPLL>,
-                               <&clock CLK_MOUT_MAU_EPLL>,
-                               <&clock CLK_MAU_EPLL>,
-@@ -55,7 +53,6 @@
-                               <0>,
-                               <0>,
-                               <0>,
--                              <0>,
-                               <196608001>,
-                               <(196608002 / 2)>,
-                               <196608000>;
-@@ -79,6 +76,8 @@
- 
- &i2s0 {
-       status = "okay";
-+      assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
-+      assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
- };
- 
- &pwm {

diff --git a/queue-4.14/series b/queue-4.14/series
index 729c18e9537b0a048235115e34338468168c3868..2d4e526003c0d5d02006738c15d6bd2f3309cf47 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -98,4 +98,3 @@ arm-arm64-kvm-vgic-force-vm-halt-when-changing-the-active-state-of-gicv3-ppis-sg
 rtc-m41t80-correct-alarm-month-range-with-rtc-reads.patch
 tpm-tpm_try_transmit-refactor-error-flow.patch
 tpm-tpm_i2c_nuvoton-use-correct-command-duration-for-tpm-2.x.patch
-arm-dts-exynos-specify-i2s-assigned-clocks-in-proper-node.patch