2014-10-10 13:57:56

by Georgi Djakov

Subject: [PATCH] clk: qcom: Fix duplicate rbcpr clock name

There is a duplication in a clock name for apq8084 platform that causes
the following warning: "RBCPR_CLK_SRC" redefined

Resolve this by adding a MMSS_ prefix to this clock and making its name
coherent with msm8974 platform.

Fixes: 2b46cd23a5a2 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
Signed-off-by: Georgi Djakov <[email protected]>
---
drivers/clk/qcom/mmcc-apq8084.c | 2 +-
include/dt-bindings/clock/qcom,mmcc-apq8084.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c
index dab988ab8cf1..157139a5c1ca 100644
--- a/drivers/clk/qcom/mmcc-apq8084.c
+++ b/drivers/clk/qcom/mmcc-apq8084.c
@@ -3122,7 +3122,7 @@ static struct clk_regmap *mmcc_apq8084_clocks[] = {
[ESC1_CLK_SRC] = &esc1_clk_src.clkr,
[HDMI_CLK_SRC] = &hdmi_clk_src.clkr,
[VSYNC_CLK_SRC] = &vsync_clk_src.clkr,
- [RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
+ [MMSS_RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
[RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr,
[MAPLE_CLK_SRC] = &maple_clk_src.clkr,
[VDP_CLK_SRC] = &vdp_clk_src.clkr,
diff --git a/include/dt-bindings/clock/qcom,mmcc-apq8084.h b/include/dt-bindings/clock/qcom,mmcc-apq8084.h
index a929f86d0ddd..d72b5b35f15e 100644
--- a/include/dt-bindings/clock/qcom,mmcc-apq8084.h
+++ b/include/dt-bindings/clock/qcom,mmcc-apq8084.h
@@ -60,7 +60,7 @@
#define ESC1_CLK_SRC 43
#define HDMI_CLK_SRC 44
#define VSYNC_CLK_SRC 45
-#define RBCPR_CLK_SRC 46
+#define MMSS_RBCPR_CLK_SRC 46
#define RBBMTIMER_CLK_SRC 47
#define MAPLE_CLK_SRC 48
#define VDP_CLK_SRC 49
--
1.7.9.5

2014-10-11 00:16:36

by Stephen Boyd

Subject: Re: [PATCH] clk: qcom: Fix duplicate rbcpr clock name

On 10/10, Georgi Djakov wrote:
> There is a duplication in a clock name for apq8084 platform that causes
> the following warning: "RBCPR_CLK_SRC" redefined
>
> Resolve this by adding a MMSS_ prefix to this clock and making its name
> coherent with msm8974 platform.
>
> Fixes: 2b46cd23a5a2 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
> Signed-off-by: Georgi Djakov <[email protected]>

Reviewed-by: Stephen Boyd <[email protected]>

It would be nice if we could somehow detect this sort of problem
automatically.

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

2014-11-17 10:26:04

by Georgi Djakov

Subject: Re: [PATCH] clk: qcom: Fix duplicate rbcpr clock name

On 10/11/2014 03:16 AM, Stephen Boyd wrote:
> On 10/10, Georgi Djakov wrote:
>> There is a duplication in a clock name for apq8084 platform that causes
>> the following warning: "RBCPR_CLK_SRC" redefined
>>
>> Resolve this by adding a MMSS_ prefix to this clock and making its name
>> coherent with msm8974 platform.
>>
>> Fixes: 2b46cd23a5a2 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
>> Signed-off-by: Georgi Djakov <[email protected]>
>
> Reviewed-by: Stephen Boyd <[email protected]>
>
<..>

Hi Mike,
Would you please queue this fix?

Thanks,
Georgi