From: Greg Kroah-Hartman Date: Mon, 19 Mar 2018 07:25:11 +0000 (+0100) Subject: drop clk-ti-clkctrl-add-support-for-retrying-failed-init.patch X-Git-Tag: v4.14.28~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1c295f7f57c30d096caefd95877ef9e6e017b83;p=thirdparty%2Fkernel%2Fstable-queue.git drop clk-ti-clkctrl-add-support-for-retrying-failed-init.patch --- diff --git a/queue-4.14/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch b/queue-4.14/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch deleted file mode 100644 index 94e4381d019..00000000000 --- a/queue-4.14/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch +++ /dev/null @@ -1,57 +0,0 @@ -From foo@baz Fri Mar 16 15:43:17 CET 2018 -From: Tero Kristo -Date: Thu, 12 Oct 2017 10:55:29 +0300 -Subject: clk: ti: clkctrl: add support for retrying failed init - -From: Tero Kristo - - -[ Upstream commit 729e13bf58e643b9accd2a14c55b555958702fb0 ] - -In case the clkctrl node contains assigned-clock-* entries, registering -the provider can fail with -EPROBE_DEFER. In this case, add the -provider to the retry_init clock list so it will be cleaned up later. - -Signed-off-by: Tero Kristo -Acked-by: Stephen Boyd -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/ti/clkctrl.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/drivers/clk/ti/clkctrl.c -+++ b/drivers/clk/ti/clkctrl.c -@@ -400,6 +400,12 @@ _ti_clkctrl_setup_subclks(struct omap_cl - } - } - -+static void __init _clkctrl_add_provider(void *data, -+ struct device_node *np) -+{ -+ of_clk_add_hw_provider(np, _ti_omap4_clkctrl_xlate, data); -+} -+ - static void __init _ti_omap4_clkctrl_setup(struct device_node *node) - { - struct omap_clkctrl_provider *provider; -@@ -411,6 +417,7 @@ static void __init _ti_omap4_clkctrl_set - struct omap_clkctrl_clk *clkctrl_clk; - const __be32 *addrp; - u32 addr; -+ int ret; - - addrp = of_get_address(node, 0, NULL, NULL); - addr = (u32)of_translate_address(node, addrp); -@@ -485,7 +492,10 @@ static void __init _ti_omap4_clkctrl_set - reg_data++; - } - -- of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); -+ ret = of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); -+ if (ret == -EPROBE_DEFER) -+ ti_clk_retry_init(node, provider, _clkctrl_add_provider); -+ - return; - - cleanup: diff --git a/queue-4.14/series b/queue-4.14/series index ab9be7f0b31..1d1170ebf79 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -53,7 +53,6 @@ mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch userns-don-t-fail-follow_automount-based-on-s_user_ns.patch xfrm-fix-xfrm_replay_overflow_offload_esn.patch leds-pm8058-silence-pointer-to-integer-size-warning.patch -clk-ti-clkctrl-add-support-for-retrying-failed-init.patch power-supply-ab8500_charger-fix-an-error-handling-path.patch power-supply-ab8500_charger-bail-out-in-case-of-error-in-ab8500_charger_init_hw_registers.patch drm-etnaviv-make-thermal-selectable.patch diff --git a/queue-4.15/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch b/queue-4.15/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch deleted file mode 100644 index 77baefd35ef..00000000000 --- a/queue-4.15/clk-ti-clkctrl-add-support-for-retrying-failed-init.patch +++ /dev/null @@ -1,57 +0,0 @@ -From foo@baz Fri Mar 16 15:11:07 CET 2018 -From: Tero Kristo -Date: Thu, 12 Oct 2017 10:55:29 +0300 -Subject: clk: ti: clkctrl: add support for retrying failed init - -From: Tero Kristo - - -[ Upstream commit 729e13bf58e643b9accd2a14c55b555958702fb0 ] - -In case the clkctrl node contains assigned-clock-* entries, registering -the provider can fail with -EPROBE_DEFER. In this case, add the -provider to the retry_init clock list so it will be cleaned up later. - -Signed-off-by: Tero Kristo -Acked-by: Stephen Boyd -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/ti/clkctrl.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/drivers/clk/ti/clkctrl.c -+++ b/drivers/clk/ti/clkctrl.c -@@ -400,6 +400,12 @@ _ti_clkctrl_setup_subclks(struct omap_cl - } - } - -+static void __init _clkctrl_add_provider(void *data, -+ struct device_node *np) -+{ -+ of_clk_add_hw_provider(np, _ti_omap4_clkctrl_xlate, data); -+} -+ - static void __init _ti_omap4_clkctrl_setup(struct device_node *node) - { - struct omap_clkctrl_provider *provider; -@@ -411,6 +417,7 @@ static void __init _ti_omap4_clkctrl_set - struct omap_clkctrl_clk *clkctrl_clk; - const __be32 *addrp; - u32 addr; -+ int ret; - - addrp = of_get_address(node, 0, NULL, NULL); - addr = (u32)of_translate_address(node, addrp); -@@ -485,7 +492,10 @@ static void __init _ti_omap4_clkctrl_set - reg_data++; - } - -- of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); -+ ret = of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); -+ if (ret == -EPROBE_DEFER) -+ ti_clk_retry_init(node, provider, _clkctrl_add_provider); -+ - return; - - cleanup: diff --git a/queue-4.15/series b/queue-4.15/series index 01db5f69c21..4450efed8f9 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -65,7 +65,6 @@ userns-don-t-fail-follow_automount-based-on-s_user_ns.patch xfrm-fix-xfrm_replay_overflow_offload_esn.patch leds-pm8058-silence-pointer-to-integer-size-warning.patch bpf-fix-stack-state-printing-in-verifier-log.patch -clk-ti-clkctrl-add-support-for-retrying-failed-init.patch power-supply-sbs-message-double-left-shift-bug-in-sbsm_select.patch power-supply-ab8500_charger-fix-an-error-handling-path.patch power-supply-ab8500_charger-bail-out-in-case-of-error-in-ab8500_charger_init_hw_registers.patch