drop clk-jz4740-add-tcu-clock.patch

diff --git a/queue-4.14/clk-jz4740-add-tcu-clock.patch b/queue-4.14/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index d28635b..0000000
--- a/queue-4.14/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4f350cf75e255308e2328596db1b41e0414ccce0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 32fcc75f6f77e..216ba051e743c 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -211,6 +211,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 6ed83f926ae71..e82d77028581a 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -34,5 +34,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index c936ca1c3e144112ed36fe28c883f287c25cc92e..31ede541f4fc9094ab35a77bc4ba3daa4e6afb2d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -26,7 +26,6 @@ arm64-fix-unreachable-code-issue-with-cmpxchg.patch
 clk-at91-select-parent-if-main-oscillator-or-bypass-.patch
 scsi-core-reduce-memory-required-for-scsi-logging.patch
 dma-buf-sw_sync-synchronize-signal-vs-syncpt-free.patch
-clk-jz4740-add-tcu-clock.patch
 mips-tlbex-explicitly-cast-_page_no_exec-to-a-boolea.patch
 i2c-cht-wc-fix-lockdep-warning.patch
 mfd-intel-lpss-remove-d3cold-delay.patch

diff --git a/queue-4.19/clk-jz4740-add-tcu-clock.patch b/queue-4.19/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index 30b6edc..0000000
--- a/queue-4.19/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 90f67a87d577a6407a5460d455b4efebc9ddf878 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 4479c102e8994..d8ac7f2e183a1 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -211,6 +211,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 6ed83f926ae71..e82d77028581a 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -34,5 +34,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index b8d19ec59d7450824343460e2fb83cec209ec116..2f353d0025ecbfce3e41b416e18a43b790761c4c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -46,7 +46,6 @@ scsi-core-reduce-memory-required-for-scsi-logging.patch
 dma-buf-sw_sync-synchronize-signal-vs-syncpt-free.patch
 ext4-fix-potential-use-after-free-after-remounting-w.patch
 mips-ingenic-disable-broken-btb-lookup-optimization.patch
-clk-jz4740-add-tcu-clock.patch
 mips-tlbex-explicitly-cast-_page_no_exec-to-a-boolea.patch
 i2c-cht-wc-fix-lockdep-warning.patch
 mfd-intel-lpss-remove-d3cold-delay.patch

diff --git a/queue-4.4/clk-jz4740-add-tcu-clock.patch b/queue-4.4/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index d48847b..0000000
--- a/queue-4.4/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c72b7e327a8b4d3b870f76011f674134f9ac38f6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 305a26c2a800e..01b5b8b103888 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -211,6 +211,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 43153d3e9bd26..ff7c27bc98e37 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -33,5 +33,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 1d1d8d74fe600a3f30e1016b4cf8d40c3744a743..1c82a34919197f1f14ce220dbf520fe18e6cf930 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -12,7 +12,6 @@ vfio_pci-restore-original-state-on-release.patch
 powerpc-64s-exception-machine-check-use-correct-cfar.patch
 powerpc-pseries-correctly-track-irq-state-in-default.patch
 scsi-core-reduce-memory-required-for-scsi-logging.patch
-clk-jz4740-add-tcu-clock.patch
 mfd-intel-lpss-remove-d3cold-delay.patch
 arm-8898-1-mm-don-t-treat-faults-reported-from-cache.patch
 hid-apple-fix-stuck-function-keys-when-using-fn.patch

diff --git a/queue-4.9/clk-jz4740-add-tcu-clock.patch b/queue-4.9/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index 303604b..0000000
--- a/queue-4.9/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 98202f2cb6a7be60a067362352a52f74933cc818 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 510fe7e0c8f1c..79f0d48ec875b 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -211,6 +211,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 43153d3e9bd26..ff7c27bc98e37 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -33,5 +33,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index b77db18025966908cf53d95510a9a0b61f75d39a..ddbaf44dc751b6317c7ec89b576f25f40677aa9a 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -16,7 +16,6 @@ powerpc-pseries-correctly-track-irq-state-in-default.patch
 arm64-fix-unreachable-code-issue-with-cmpxchg.patch
 clk-at91-select-parent-if-main-oscillator-or-bypass-.patch
 scsi-core-reduce-memory-required-for-scsi-logging.patch
-clk-jz4740-add-tcu-clock.patch
 mips-tlbex-explicitly-cast-_page_no_exec-to-a-boolea.patch
 mfd-intel-lpss-remove-d3cold-delay.patch
 pci-tegra-fix-of-node-reference-leak.patch

diff --git a/queue-5.2/clk-jz4740-add-tcu-clock.patch b/queue-5.2/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index 00c4e8d..0000000
--- a/queue-5.2/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c4f1b3151af7913f89538d977949ddfc762f708d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index c77f4e1506dc0..176d911b58397 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -203,6 +203,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 6ed83f926ae71..e82d77028581a 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -34,5 +34,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-5.2/series b/queue-5.2/series
index e0516326a316a2e3928d10c7ea496f76b63de19c..3da6bdfb2f0d94a66f452007f40527c12700d839 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -63,7 +63,6 @@ dma-buf-sw_sync-synchronize-signal-vs-syncpt-free.patch
 f2fs-fix-to-drop-meta-node-pages-during-umount.patch
 ext4-fix-potential-use-after-free-after-remounting-w.patch
 mips-ingenic-disable-broken-btb-lookup-optimization.patch
-clk-jz4740-add-tcu-clock.patch
 mips-don-t-use-bc_false-uninitialized-in-__mm_isbran.patch
 mips-tlbex-explicitly-cast-_page_no_exec-to-a-boolea.patch
 i2c-cht-wc-fix-lockdep-warning.patch

diff --git a/queue-5.3/clk-jz4740-add-tcu-clock.patch b/queue-5.3/clk-jz4740-add-tcu-clock.patch
deleted file mode 100644 (file)
index 69a21f0..0000000
--- a/queue-5.3/clk-jz4740-add-tcu-clock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ce7e8c53e773ba5be7752e908ad8bb39d8433d5d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jul 2019 13:16:10 -0400
-Subject: clk: jz4740: Add TCU clock
-
-From: Paul Cercueil <paul@crapouillou.net>
-
-[ Upstream commit 73dd11dc1a883d4c994d729dc9984f4890001157 ]
-
-Add the missing TCU clock to the list of clocks supplied by the CGU for
-the JZ4740 SoC.
-
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
-Tested-by: Mathieu Malaterre <malat@debian.org>
-Tested-by: Artur Rojek <contact@artur-rojek.eu>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Lee Jones <lee.jones@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: linux-doc@vger.kernel.org
-Cc: linux-mips@vger.kernel.org
-Cc: linux-clk@vger.kernel.org
-Cc: od@zcrc.me
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/clk/ingenic/jz4740-cgu.c       | 6 ++++++
- include/dt-bindings/clock/jz4740-cgu.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
-index 9b27d75d9485c..c020ffc0c5a9c 100644
---- a/drivers/clk/ingenic/jz4740-cgu.c
-+++ b/drivers/clk/ingenic/jz4740-cgu.c
-@@ -229,6 +229,12 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
-               .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-               .gate = { CGU_REG_CLKGR, 5 },
-       },
-+
-+      [JZ4740_CLK_TCU] = {
-+              "tcu", CGU_CLK_GATE,
-+              .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
-+              .gate = { CGU_REG_CLKGR, 1 },
-+      },
- };
- 
- static void __init jz4740_cgu_init(struct device_node *np)
-diff --git a/include/dt-bindings/clock/jz4740-cgu.h b/include/dt-bindings/clock/jz4740-cgu.h
-index 6ed83f926ae71..e82d77028581a 100644
---- a/include/dt-bindings/clock/jz4740-cgu.h
-+++ b/include/dt-bindings/clock/jz4740-cgu.h
-@@ -34,5 +34,6 @@
- #define JZ4740_CLK_ADC                19
- #define JZ4740_CLK_I2C                20
- #define JZ4740_CLK_AIC                21
-+#define JZ4740_CLK_TCU                22
- 
- #endif /* __DT_BINDINGS_CLOCK_JZ4740_CGU_H__ */
--- 
-2.20.1
-

diff --git a/queue-5.3/series b/queue-5.3/series
index b795ab4b3a0286338715f27310bcbbffd16d2c11..053c37e6a01303b58af3a559b1adf901b7d2023a 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -80,7 +80,6 @@ dma-buf-sw_sync-synchronize-signal-vs-syncpt-free.patch
 f2fs-fix-to-drop-meta-node-pages-during-umount.patch
 ext4-fix-potential-use-after-free-after-remounting-w.patch
 mips-ingenic-disable-broken-btb-lookup-optimization.patch
-clk-jz4740-add-tcu-clock.patch
 mips-don-t-use-bc_false-uninitialized-in-__mm_isbran.patch
 mips-tlbex-explicitly-cast-_page_no_exec-to-a-boolea.patch
 i2c-cht-wc-fix-lockdep-warning.patch