summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorgi Djakov <gdjakov@mm-sol.com>2014-10-10 16:57:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:57:34 -0800
commitf886cdf1f8cb08cd793abb88ac646c3664b83db6 (patch)
tree8e6467ed1bb673ace807cc7fcd19c59f18fc300f /include
parent9a3c5ffb94f165d9a076207ac11dc2c531beb3a8 (diff)
clk: qcom: Fix duplicate rbcpr clock name
commit 9a6cb70f40b0268297024949eb0a2689e3b7769b upstream. 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 <gdjakov@mm-sol.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/clock/qcom,mmcc-apq8084.h2
1 files changed, 1 insertions, 1 deletions
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