From: Greg Kroah-Hartman Date: Sat, 7 Dec 2019 11:38:08 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.4.3~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=729f34f06e40019aa4381514c5e607e21ae1c3b5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: clk-mediatek-drop-__init-from-mtk_clk_register_cpumuxes.patch --- diff --git a/queue-4.19/clk-mediatek-drop-__init-from-mtk_clk_register_cpumuxes.patch b/queue-4.19/clk-mediatek-drop-__init-from-mtk_clk_register_cpumuxes.patch new file mode 100644 index 00000000000..e0ba1e68fde --- /dev/null +++ b/queue-4.19/clk-mediatek-drop-__init-from-mtk_clk_register_cpumuxes.patch @@ -0,0 +1,48 @@ +From 28f1186a26f7e4e5df7be454710da26c810effb6 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Fri, 30 Nov 2018 00:34:33 -0800 +Subject: clk: mediatek: Drop __init from mtk_clk_register_cpumuxes() + +From: Stephen Boyd + +commit 28f1186a26f7e4e5df7be454710da26c810effb6 upstream. + +This function is used from more places than just __init code. Removing +__init silences a section mismatch warning here. + +Cc: Sean Wang +Cc: Ryder Lee +Cc: Rob Herring +Cc: Wenzhen Yu +Cc: Weiyi Lu +Signed-off-by: Stephen Boyd +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clk/mediatek/clk-cpumux.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/clk/mediatek/clk-cpumux.c ++++ b/drivers/clk/mediatek/clk-cpumux.c +@@ -53,7 +53,7 @@ static const struct clk_ops clk_cpumux_o + .set_parent = clk_cpumux_set_parent, + }; + +-static struct clk __init * ++static struct clk * + mtk_clk_register_cpumux(const struct mtk_composite *mux, + struct regmap *regmap) + { +@@ -84,9 +84,9 @@ mtk_clk_register_cpumux(const struct mtk + return clk; + } + +-int __init mtk_clk_register_cpumuxes(struct device_node *node, +- const struct mtk_composite *clks, int num, +- struct clk_onecell_data *clk_data) ++int mtk_clk_register_cpumuxes(struct device_node *node, ++ const struct mtk_composite *clks, int num, ++ struct clk_onecell_data *clk_data) + { + int i; + struct clk *clk; diff --git a/queue-4.19/clk-mediatek-drop-more-__init-markings-for-driver-pr.patch b/queue-4.19/clk-mediatek-drop-more-__init-markings-for-driver-pr.patch index 461e7648c1c..e4141b305c7 100644 --- a/queue-4.19/clk-mediatek-drop-more-__init-markings-for-driver-pr.patch +++ b/queue-4.19/clk-mediatek-drop-more-__init-markings-for-driver-pr.patch @@ -19,15 +19,14 @@ Cc: Weiyi Lu Fixes: 2fc0a509e4ee ("clk: mediatek: add clock support for MT7622 SoC") Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/clk/mediatek/clk-mt7622.c | 4 ++-- + drivers/clk/mediatek/clk-mt7622.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c -index 92f7e32770c6a..a8aecef1ba89a 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c -@@ -513,7 +513,7 @@ static const struct mtk_gate peri_clks[] = { +@@ -513,7 +513,7 @@ static const struct mtk_gate peri_clks[] GATE_PERI1(CLK_PERI_IRTX_PD, "peri_irtx_pd", "irtx_sel", 2), }; @@ -36,7 +35,7 @@ index 92f7e32770c6a..a8aecef1ba89a 100644 MUX(CLK_INFRA_MUX1_SEL, "infra_mux1_sel", infra_mux1_parents, 0x000, 2, 2), }; -@@ -652,7 +652,7 @@ static int mtk_topckgen_init(struct platform_device *pdev) +@@ -652,7 +652,7 @@ static int mtk_topckgen_init(struct plat return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); } @@ -45,6 +44,3 @@ index 92f7e32770c6a..a8aecef1ba89a 100644 { struct device_node *node = pdev->dev.of_node; struct clk_onecell_data *clk_data; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 19728d27fcb..041740027df 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -150,6 +150,7 @@ arm64-dts-meson-gxl-khadas-vim-fix-gpio-lines-names.patch net-x25-fix-called-calling-length-calculation-in-x25.patch net-x25-fix-null_x25_address-handling.patch tools-bpf-make-libbpf-_gnu_source-friendly.patch +clk-mediatek-drop-__init-from-mtk_clk_register_cpumuxes.patch clk-mediatek-drop-more-__init-markings-for-driver-pr.patch soc-renesas-r8a77970-sysc-correct-names-of-a2dp-a2cn.patch soc-renesas-r8a77980-sysc-correct-names-of-a2dp-01-p.patch