5.4-stable patches

added patches:
	clk-rockchip-add-sclk_mac_lbtest-to-rk3188_critical_clocks.patch

diff --git a/queue-5.4/clk-rockchip-add-sclk_mac_lbtest-to-rk3188_critical_clocks.patch b/queue-5.4/clk-rockchip-add-sclk_mac_lbtest-to-rk3188_critical_clocks.patch
new file mode 100644 (file)
index 0000000..9769aeb
--- /dev/null
+++ b/queue-5.4/clk-rockchip-add-sclk_mac_lbtest-to-rk3188_critical_clocks.patch
@@ -0,0 +1,32 @@
+From ef990bcad58cf1d13c5a49191a2c2342eb8d6709 Mon Sep 17 00:00:00 2001
+From: Alex Bee <knaerzche@gmail.com>
+Date: Wed, 22 Jul 2020 18:18:20 +0200
+Subject: clk: rockchip: add sclk_mac_lbtest to rk3188_critical_clocks
+
+From: Alex Bee <knaerzche@gmail.com>
+
+commit ef990bcad58cf1d13c5a49191a2c2342eb8d6709 upstream.
+
+Since the loopbacktest clock is not exported and is not touched in the
+driver, it has to be added to rk3188_critical_clocks to be protected from
+being disabled and in order to get the emac working.
+
+Signed-off-by: Alex Bee <knaerzche@gmail.com>
+Link: https://lore.kernel.org/r/20200722161820.5316-1-knaerzche@gmail.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Cc: Alexander Kochetkov <al.kochet@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/rockchip/clk-rk3188.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/clk/rockchip/clk-rk3188.c
++++ b/drivers/clk/rockchip/clk-rk3188.c
+@@ -751,6 +751,7 @@ static const char *const rk3188_critical
+       "pclk_peri",
+       "hclk_cpubus",
+       "hclk_vio_bus",
++      "sclk_mac_lbtest",
+ };
+ 
+ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device_node *np)

diff --git a/queue-5.4/series b/queue-5.4/series
index 5d94e1ab5e98cbf3622d5e7dad20372dc187ea2a..61b3604fc4c3cdb27903e5cfb481a142a3157100 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -333,3 +333,4 @@ nios2-fix-syscall-restart-checks.patch
 nios2-restarts-apply-only-to-the-first-sigframe-we-build.patch
 nios2-add-force_successful_syscall_return.patch
 iavf-fix-adminq-error-handling.patch
+clk-rockchip-add-sclk_mac_lbtest-to-rk3188_critical_clocks.patch