From: Greg Kroah-Hartman Date: Tue, 10 Apr 2018 15:46:37 +0000 (+0200) Subject: drop broken clock patch from 4.14.y and 4.15.y X-Git-Tag: v4.16.2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4c315dd799841b53b685863e5b69f4ca8d43348;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken clock patch from 4.14.y and 4.15.y --- diff --git a/queue-4.14/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch b/queue-4.14/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch deleted file mode 100644 index 05f389948c2..00000000000 --- a/queue-4.14/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Mon Apr 9 13:58:16 CEST 2018 -From: Icenowy Zheng -Date: Fri, 22 Dec 2017 20:22:35 +0800 -Subject: clk: sunxi-ng: fix the A64/H5 clock description of DE2 CCU - -From: Icenowy Zheng - - -[ Upstream commit cf4881c1293516c1975606e8f2af7948789168b8 ] - -The clocks of A64/H5 SoCs in the DE2 CCU is the same as the clocks in H3 -DE2 CCU rather than the A83T DE2 CCU (the parent of them is the DE -module clock). - -Fix this by change the clock descriptions to use the clocks of H3. - -Fixes: 763c5bd045b1 ("clk: sunxi-ng: add support for DE2 CCU") -Signed-off-by: Icenowy Zheng -Signed-off-by: Chen-Yu Tsai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c -+++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c -@@ -129,10 +129,10 @@ static const struct sunxi_ccu_desc sun8i - }; - - static const struct sunxi_ccu_desc sun50i_a64_de2_clk_desc = { -- .ccu_clks = sun8i_a83t_de2_clks, -- .num_ccu_clks = ARRAY_SIZE(sun8i_a83t_de2_clks), -+ .ccu_clks = sun8i_h3_de2_clks, -+ .num_ccu_clks = ARRAY_SIZE(sun8i_h3_de2_clks), - -- .hw_clks = &sun8i_a83t_de2_hw_clks, -+ .hw_clks = &sun8i_h3_de2_hw_clks, - - .resets = sun50i_a64_de2_resets, - .num_resets = ARRAY_SIZE(sun50i_a64_de2_resets), diff --git a/queue-4.14/series b/queue-4.14/series index b04bc52f5ae..599a33e1d21 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,7 +18,6 @@ net-mlx4_en-change-default-qos-settings.patch vfs-close-race-between-getcwd-and-d_move.patch watchdog-dw_wdt-add-stop-watchdog-operation.patch clk-divider-fix-incorrect-usage-of-container_of.patch -clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch pm-devfreq-fix-potential-null-pointer-dereference-in-governor_store.patch selftests-net-fix-bugs-in-address-and-port-initialization.patch rdma-cma-mark-end-of-cma-id-messages.patch diff --git a/queue-4.15/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch b/queue-4.15/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch deleted file mode 100644 index a88e58e339e..00000000000 --- a/queue-4.15/clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Mon Apr 9 10:16:32 CEST 2018 -From: Icenowy Zheng -Date: Fri, 22 Dec 2017 20:22:35 +0800 -Subject: clk: sunxi-ng: fix the A64/H5 clock description of DE2 CCU - -From: Icenowy Zheng - - -[ Upstream commit cf4881c1293516c1975606e8f2af7948789168b8 ] - -The clocks of A64/H5 SoCs in the DE2 CCU is the same as the clocks in H3 -DE2 CCU rather than the A83T DE2 CCU (the parent of them is the DE -module clock). - -Fix this by change the clock descriptions to use the clocks of H3. - -Fixes: 763c5bd045b1 ("clk: sunxi-ng: add support for DE2 CCU") -Signed-off-by: Icenowy Zheng -Signed-off-by: Chen-Yu Tsai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c -+++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c -@@ -134,10 +134,10 @@ static const struct sunxi_ccu_desc sun8i - }; - - static const struct sunxi_ccu_desc sun50i_a64_de2_clk_desc = { -- .ccu_clks = sun8i_a83t_de2_clks, -- .num_ccu_clks = ARRAY_SIZE(sun8i_a83t_de2_clks), -+ .ccu_clks = sun8i_h3_de2_clks, -+ .num_ccu_clks = ARRAY_SIZE(sun8i_h3_de2_clks), - -- .hw_clks = &sun8i_a83t_de2_hw_clks, -+ .hw_clks = &sun8i_h3_de2_hw_clks, - - .resets = sun50i_a64_de2_resets, - .num_resets = ARRAY_SIZE(sun50i_a64_de2_resets), diff --git a/queue-4.15/series b/queue-4.15/series index e74d5885cf0..8ec07ee698f 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -21,7 +21,6 @@ ib-mlx5-report-inner-rss-capability.patch vfs-close-race-between-getcwd-and-d_move.patch watchdog-dw_wdt-add-stop-watchdog-operation.patch clk-divider-fix-incorrect-usage-of-container_of.patch -clk-sunxi-ng-fix-the-a64-h5-clock-description-of-de2-ccu.patch pm-devfreq-fix-potential-null-pointer-dereference-in-governor_store.patch gpiolib-don-t-dereference-a-desc-before-validation.patch net_sch-red-fix-the-new-offload-indication.patch