Skip to contentSkip to conversation

clk: qcom: Fix duplicate rbcpr clock name

PATCH In review Georgi Djakov 2 participants 3 messages Oct 10, 2014 – Nov 17, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/clk/qcom/mmcc-apq8084.c               |    2 +-
 include/dt-bindings/clock/qcom,mmcc-apq8084.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/mmcc-apq8084.c +1 -1
index dab988ab8cf1..157139a5c1ca 100644
@@ -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,
include/dt-bindings/clock/qcom,mmcc-apq8084.h +1 -1
index a929f86d0ddd..d72b5b35f15e 100644
@@ -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
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Georgi Djakov

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")

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

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#2 lore raw
Quoted 4 lines · Stephen Boyd
Quoted 3 lines · Georgi Djakov

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

Quoted 8 lines
Quoted 5 lines

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")

<..>

Hi Mike,
Would you please queue this fix?

Thanks,
Georgi