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 (file)
index 0000000..e0ba1e6
--- /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 <sboyd@kernel.org>
+Date: Fri, 30 Nov 2018 00:34:33 -0800
+Subject: clk: mediatek: Drop __init from mtk_clk_register_cpumuxes()
+
+From: Stephen Boyd <sboyd@kernel.org>
+
+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 <sean.wang@mediatek.com>
+Cc: Ryder Lee <ryder.lee@mediatek.com>
+Cc: Rob Herring <robh@kernel.org>
+Cc: Wenzhen Yu <wenzhen.yu@mediatek.com>
+Cc: Weiyi Lu <weiyi.lu@mediatek.com>
+Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 461e7648c1cee5c8d589f886829a9a6a080a6363..e4141b305c7c13ca36601b6eb73397d9284d66d0 100644 (file)
--- 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 <weiyi.lu@mediatek.com>
 Fixes: 2fc0a509e4ee ("clk: mediatek: add clock support for MT7622 SoC")
 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 19728d27fcb165d42381503b5ecb32b615b00997..041740027df16b0de21e2524cfc7dc38b88b013a 100644 (file)
--- 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