1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
index e60feffc10a1..eb6a4f9fa107 100644
--- a/drivers/clk/qcom/gcc-msm8960.c
+++ b/drivers/clk/qcom/gcc-msm8960.c
@@ -113,14 +113,16 @@ static struct clk_regmap pll14_vote = {
        },
 };
-#define P_PXO   0
+enum {
-#define P_PLL8  1
+        P_PXO,
-#define P_PLL3  2
+        P_PLL8,
-#define P_CXO   2
+        P_PLL3,
+        P_CXO,
+};
-static const u8 gcc_pxo_pll8_map[] = {
+static const struct parent_map gcc_pxo_pll8_map[] = {
-        [P_PXO]         = 0,
+        { P_PXO, 0 },
-        [P_PLL8]        = 3,
+        { P_PLL8, 3 }
 };
 static const char *gcc_pxo_pll8[] = {
@@ -128,10 +130,10 @@ static const char *gcc_pxo_pll8[] = {
        "pll8_vote",
 };
-static const u8 gcc_pxo_pll8_cxo_map[] = {
+static const struct parent_map gcc_pxo_pll8_cxo_map[] = {
-        [P_PXO]         = 0,
+        { P_PXO, 0 },
-        [P_PLL8]        = 3,
+        { P_PLL8, 3 },
-        [P_CXO]         = 5,
+        { P_CXO, 5 }
 };
 static const char *gcc_pxo_pll8_cxo[] = {
@@ -140,10 +142,10 @@ static const char *gcc_pxo_pll8_cxo[] = {
        "cxo",
 };
-static const u8 gcc_pxo_pll8_pll3_map[] = {
+static const struct parent_map gcc_pxo_pll8_pll3_map[] = {
-        [P_PXO]         = 0,
+        { P_PXO, 0 },
-        [P_PLL8]        = 3,
+        { P_PLL8, 3 },
-        [P_PLL3]        = 6,
+        { P_PLL3, 6 }
 };
 static const char *gcc_pxo_pll8_pll3[] = {

diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c index e60feffc10a1..eb6a4f9fa107 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c
@@ -113,14 +113,16 @@ static struct clk_regmap pll14_vote = {
113	},	113	},
114	};	114	};
115		115
116	#define P_PXO 0	116	enum {
117	#define P_PLL8 1	117	P_PXO,
118	#define P_PLL3 2	118	P_PLL8,
119	#define P_CXO 2	119	P_PLL3,
		120	P_CXO,
		121	};
120		122
121	static const u8 gcc_pxo_pll8_map[] = {	123	static const struct parent_map gcc_pxo_pll8_map[] = {
122	[P_PXO] = 0,	124	{ P_PXO, 0 },
123	[P_PLL8] = 3,	125	{ P_PLL8, 3 }
124	};	126	};
125		127
126	static const char *gcc_pxo_pll8[] = {	128	static const char *gcc_pxo_pll8[] = {
@@ -128,10 +130,10 @@ static const char *gcc_pxo_pll8[] = {
128	"pll8_vote",	130	"pll8_vote",
129	};	131	};
130		132
131	static const u8 gcc_pxo_pll8_cxo_map[] = {	133	static const struct parent_map gcc_pxo_pll8_cxo_map[] = {
132	[P_PXO] = 0,	134	{ P_PXO, 0 },
133	[P_PLL8] = 3,	135	{ P_PLL8, 3 },
134	[P_CXO] = 5,	136	{ P_CXO, 5 }
135	};	137	};
136		138
137	static const char *gcc_pxo_pll8_cxo[] = {	139	static const char *gcc_pxo_pll8_cxo[] = {
@@ -140,10 +142,10 @@ static const char *gcc_pxo_pll8_cxo[] = {
140	"cxo",	142	"cxo",
141	};	143	};
142		144
143	static const u8 gcc_pxo_pll8_pll3_map[] = {	145	static const struct parent_map gcc_pxo_pll8_pll3_map[] = {
144	[P_PXO] = 0,	146	{ P_PXO, 0 },
145	[P_PLL8] = 3,	147	{ P_PLL8, 3 },
146	[P_PLL3] = 6,	148	{ P_PLL3, 6 }
147	};	149	};
148		150
149	static const char *gcc_pxo_pll8_pll3[] = {	151	static const char *gcc_pxo_pll8_pll3[] = {