From: Abel Vesa <abel.vesa@nxp.com>

Date: Fri, 14 Dec 2018 15:30:09 +0000

Subject: clk: imx: Make parent_names const pointer in composite-8m

Git-commit: 65a6b7c5f31c39a47da729021cb2a5ec1339affb

Patch-mainline: v5.1-rc1

References: git-fixes

The parent_names needs to be pointer to const pointer to const char.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>

Signed-off-by: Stephen Boyd <sboyd@kernel.org>

Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

---

 drivers/clk/imx/clk-composite-8m.c | 2 +-

 drivers/clk/imx/clk.h              | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c

index 527ade1d6933..574fac1a169f 100644

--- a/drivers/clk/imx/clk-composite-8m.c

+++ b/drivers/clk/imx/clk-composite-8m.c

@@ -123,7 +123,7 @@ static const struct clk_ops imx8m_clk_composite_divider_ops = {

 };

 struct clk *imx8m_clk_composite_flags(const char *name,

-					const char **parent_names,

+					const char * const *parent_names,

 					int num_parents, void __iomem *reg,

 					unsigned long flags)

 {

diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h

index 028312de21b8..1363dbe65020 100644

--- a/drivers/clk/imx/clk.h

+++ b/drivers/clk/imx/clk.h

@@ -354,7 +354,7 @@ struct clk *imx_clk_cpu(const char *name, const char *parent_name,

 		struct clk *step);

 struct clk *imx8m_clk_composite_flags(const char *name,

-					const char **parent_names,

+					const char * const *parent_names,

 					int num_parents, void __iomem *reg,

 					unsigned long flags);