[PATCH v1] clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support
From: Stephen Boyd <hidden>
Date: 2014-07-15 23:38:28
Also in:
linux-arm-msm, linux-devicetree, lkml
Subsystem:
arm/qualcomm mailing list, common clk framework, qualcomm clock drivers, the rest · Maintainers:
Michael Turquette, Stephen Boyd, Bjorn Andersson, Linus Torvalds
On 07/11/14 13:53, Stephen Boyd wrote:
On 06/12/14 09:41, Georgi Djakov wrote:quoted
Add support for the multimedia clock controller found on the APQ8084 based platforms. This will allow the multimedia device drivers to control their clocks. Signed-off-by: Georgi Djakov <redacted> ---I started picking up the qcom clock patches from the list. I see that this one has a small problem though: drivers/clk/qcom/mmcc-apq8084.c:169:10: warning: Initializer entry defined twice drivers/clk/qcom/mmcc-apq8084.c:170:10: also defined here drivers/clk/qcom/mmcc-apq8084.c:185:10: warning: Initializer entry defined twice drivers/clk/qcom/mmcc-apq8084.c:187:10: also defined here drivers/clk/qcom/mmcc-apq8084.c:203:10: warning: Initializer entry defined twice drivers/clk/qcom/mmcc-apq8084.c:205:10: also defined here
Ok I've squashed in this fix:
diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c
index 9cc956a5e9c9..751eea376a2b 100644
--- a/drivers/clk/qcom/mmcc-apq8084.c
+++ b/drivers/clk/qcom/mmcc-apq8084.c@@ -34,12 +34,12 @@ #define P_HDMIPLL 2 #define P_GPLL0 3 #define P_EDPVCO 3 -#define P_MMPLL4 3 -#define P_GPLL1 4 +#define P_MMPLL4 4 #define P_DSI0PLL 4 #define P_DSI0PLL_BYTE 4 #define P_MMPLL2 4 #define P_MMPLL3 4 +#define P_GPLL1 5 #define P_DSI1PLL 5 #define P_DSI1PLL_BYTE 5 #define P_MMSLEEP 6
@@ -166,8 +166,8 @@ static const u8 mmcc_xo_mmpll0_1_4_gpll0_map[] = { [P_XO] = 0, [P_MMPLL0] = 1, [P_MMPLL1] = 2, - [P_MMPLL4] = 3, [P_GPLL0] = 5, + [P_MMPLL4] = 3, }; static const char *mmcc_xo_mmpll0_1_4_gpll0[] = {
@@ -183,8 +183,8 @@ static const u8 mmcc_xo_mmpll0_1_4_gpll1_0_map[] = { [P_MMPLL0] = 1, [P_MMPLL1] = 2, [P_MMPLL4] = 3, - [P_GPLL1] = 4, [P_GPLL0] = 5, + [P_GPLL1] = 4, }; static const char *mmcc_xo_mmpll0_1_4_gpll1_0[] = {
@@ -201,8 +201,8 @@ static const u8 mmcc_xo_mmpll0_1_4_gpll1_0_sleep_map[] = { [P_MMPLL0] = 1, [P_MMPLL1] = 2, [P_MMPLL4] = 3, - [P_GPLL1] = 4, [P_GPLL0] = 5, + [P_GPLL1] = 4, [P_MMSLEEP] = 6, };
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation