Commit b5eb8cde authored by Ren Zhijie's avatar Ren Zhijie Committed by Bjorn Andersson

clk: qcom: fix build error initializer element is not constant

CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0"
make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-, will be failed, like this:

drivers/clk/qcom/gpucc-sm8350.c:111:2: error: initializer element is not constant
  gpu_cc_parent,
  ^~~~~~~~~~~~~
drivers/clk/qcom/gpucc-sm8350.c:111:2: note: (near initialization for ‘gpu_cc_parent_data_0[0]’)
drivers/clk/qcom/gpucc-sm8350.c:126:2: error: initializer element is not constant
  gpu_cc_parent,
  ^~~~~~~~~~~~~
drivers/clk/qcom/gpucc-sm8350.c:126:2: note: (near initialization for ‘gpu_cc_parent_data_1[0]’)
make[3]: *** [drivers/clk/qcom/gpucc-sm8350.o] Error 1

It seems that nested constant initializer is not supported in GCC 7.4.0. For portability resons, we should fix it.
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Fixes: 160758b0 ("clk: qcom: add support for SM8350 GPUCC")
Signed-off-by: default avatarRen Zhijie <renzhijie2@huawei.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220714121144.71062-1-renzhijie2@huawei.com
parent 2b4e75a7
...@@ -108,7 +108,7 @@ static const struct parent_map gpu_cc_parent_map_0[] = { ...@@ -108,7 +108,7 @@ static const struct parent_map gpu_cc_parent_map_0[] = {
}; };
static const struct clk_parent_data gpu_cc_parent_data_0[] = { static const struct clk_parent_data gpu_cc_parent_data_0[] = {
gpu_cc_parent, { .fw_name = "bi_tcxo" },
{ .hw = &gpu_cc_pll0.clkr.hw }, { .hw = &gpu_cc_pll0.clkr.hw },
{ .hw = &gpu_cc_pll1.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw },
{ .fw_name = "gcc_gpu_gpll0_clk_src" }, { .fw_name = "gcc_gpu_gpll0_clk_src" },
...@@ -123,7 +123,7 @@ static const struct parent_map gpu_cc_parent_map_1[] = { ...@@ -123,7 +123,7 @@ static const struct parent_map gpu_cc_parent_map_1[] = {
}; };
static const struct clk_parent_data gpu_cc_parent_data_1[] = { static const struct clk_parent_data gpu_cc_parent_data_1[] = {
gpu_cc_parent, { .fw_name = "bi_tcxo" },
{ .hw = &gpu_cc_pll1.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw },
{ .fw_name = "gcc_gpu_gpll0_clk_src" }, { .fw_name = "gcc_gpu_gpll0_clk_src" },
{ .fw_name = "gcc_gpu_gpll0_div_clk_src" }, { .fw_name = "gcc_gpu_gpll0_div_clk_src" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment