diff options
author | Georgi Djakov <georgi.djakov@linaro.org> | 2015-07-06 09:51:30 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-06 20:20:59 -0400 |
commit | adb11a40a3ac5225ce3746a62c2a7ebde42ec04e (patch) | |
tree | 750853f6d61489e21a1c198b407232a7bbd62fd9 | |
parent | 78e50c6def9cca448dbb028b57ec92a1589edc07 (diff) |
clk: qcom: Constify the parent names arrays
Make const both the array and the strings, so they can be
moved to .rodata section.
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/qcom/gcc-apq8084.c | 12 | ||||
-rw-r--r-- | drivers/clk/qcom/gcc-ipq806x.c | 10 | ||||
-rw-r--r-- | drivers/clk/qcom/gcc-msm8660.c | 8 | ||||
-rw-r--r-- | drivers/clk/qcom/gcc-msm8916.c | 24 | ||||
-rw-r--r-- | drivers/clk/qcom/gcc-msm8960.c | 12 | ||||
-rw-r--r-- | drivers/clk/qcom/gcc-msm8974.c | 4 | ||||
-rw-r--r-- | drivers/clk/qcom/lcc-ipq806x.c | 6 | ||||
-rw-r--r-- | drivers/clk/qcom/lcc-msm8960.c | 8 | ||||
-rw-r--r-- | drivers/clk/qcom/mmcc-apq8084.c | 20 | ||||
-rw-r--r-- | drivers/clk/qcom/mmcc-msm8960.c | 14 | ||||
-rw-r--r-- | drivers/clk/qcom/mmcc-msm8974.c | 16 |
11 files changed, 67 insertions, 67 deletions
diff --git a/drivers/clk/qcom/gcc-apq8084.c b/drivers/clk/qcom/gcc-apq8084.c index 54a756b90a37..05b7a25b80e8 100644 --- a/drivers/clk/qcom/gcc-apq8084.c +++ b/drivers/clk/qcom/gcc-apq8084.c | |||
@@ -48,7 +48,7 @@ static const struct parent_map gcc_xo_gpll0_map[] = { | |||
48 | { P_GPLL0, 1 } | 48 | { P_GPLL0, 1 } |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static const char *gcc_xo_gpll0[] = { | 51 | static const char * const gcc_xo_gpll0[] = { |
52 | "xo", | 52 | "xo", |
53 | "gpll0_vote", | 53 | "gpll0_vote", |
54 | }; | 54 | }; |
@@ -59,7 +59,7 @@ static const struct parent_map gcc_xo_gpll0_gpll4_map[] = { | |||
59 | { P_GPLL4, 5 } | 59 | { P_GPLL4, 5 } |
60 | }; | 60 | }; |
61 | 61 | ||
62 | static const char *gcc_xo_gpll0_gpll4[] = { | 62 | static const char * const gcc_xo_gpll0_gpll4[] = { |
63 | "xo", | 63 | "xo", |
64 | "gpll0_vote", | 64 | "gpll0_vote", |
65 | "gpll4_vote", | 65 | "gpll4_vote", |
@@ -70,7 +70,7 @@ static const struct parent_map gcc_xo_sata_asic0_map[] = { | |||
70 | { P_SATA_ASIC0_CLK, 2 } | 70 | { P_SATA_ASIC0_CLK, 2 } |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static const char *gcc_xo_sata_asic0[] = { | 73 | static const char * const gcc_xo_sata_asic0[] = { |
74 | "xo", | 74 | "xo", |
75 | "sata_asic0_clk", | 75 | "sata_asic0_clk", |
76 | }; | 76 | }; |
@@ -80,7 +80,7 @@ static const struct parent_map gcc_xo_sata_rx_map[] = { | |||
80 | { P_SATA_RX_CLK, 2} | 80 | { P_SATA_RX_CLK, 2} |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static const char *gcc_xo_sata_rx[] = { | 83 | static const char * const gcc_xo_sata_rx[] = { |
84 | "xo", | 84 | "xo", |
85 | "sata_rx_clk", | 85 | "sata_rx_clk", |
86 | }; | 86 | }; |
@@ -90,7 +90,7 @@ static const struct parent_map gcc_xo_pcie_map[] = { | |||
90 | { P_PCIE_0_1_PIPE_CLK, 2 } | 90 | { P_PCIE_0_1_PIPE_CLK, 2 } |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static const char *gcc_xo_pcie[] = { | 93 | static const char * const gcc_xo_pcie[] = { |
94 | "xo", | 94 | "xo", |
95 | "pcie_pipe", | 95 | "pcie_pipe", |
96 | }; | 96 | }; |
@@ -100,7 +100,7 @@ static const struct parent_map gcc_xo_pcie_sleep_map[] = { | |||
100 | { P_SLEEP_CLK, 6 } | 100 | { P_SLEEP_CLK, 6 } |
101 | }; | 101 | }; |
102 | 102 | ||
103 | static const char *gcc_xo_pcie_sleep[] = { | 103 | static const char * const gcc_xo_pcie_sleep[] = { |
104 | "xo", | 104 | "xo", |
105 | "sleep_clk_src", | 105 | "sleep_clk_src", |
106 | }; | 106 | }; |
diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c index 563969942a1d..40e480220cd3 100644 --- a/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c | |||
@@ -188,7 +188,7 @@ static const struct parent_map gcc_pxo_pll8_map[] = { | |||
188 | { P_PLL8, 3 } | 188 | { P_PLL8, 3 } |
189 | }; | 189 | }; |
190 | 190 | ||
191 | static const char *gcc_pxo_pll8[] = { | 191 | static const char * const gcc_pxo_pll8[] = { |
192 | "pxo", | 192 | "pxo", |
193 | "pll8_vote", | 193 | "pll8_vote", |
194 | }; | 194 | }; |
@@ -199,7 +199,7 @@ static const struct parent_map gcc_pxo_pll8_cxo_map[] = { | |||
199 | { P_CXO, 5 } | 199 | { P_CXO, 5 } |
200 | }; | 200 | }; |
201 | 201 | ||
202 | static const char *gcc_pxo_pll8_cxo[] = { | 202 | static const char * const gcc_pxo_pll8_cxo[] = { |
203 | "pxo", | 203 | "pxo", |
204 | "pll8_vote", | 204 | "pll8_vote", |
205 | "cxo", | 205 | "cxo", |
@@ -215,7 +215,7 @@ static const struct parent_map gcc_pxo_pll3_sata_map[] = { | |||
215 | { P_PLL3, 6 } | 215 | { P_PLL3, 6 } |
216 | }; | 216 | }; |
217 | 217 | ||
218 | static const char *gcc_pxo_pll3[] = { | 218 | static const char * const gcc_pxo_pll3[] = { |
219 | "pxo", | 219 | "pxo", |
220 | "pll3", | 220 | "pll3", |
221 | }; | 221 | }; |
@@ -226,7 +226,7 @@ static const struct parent_map gcc_pxo_pll8_pll0[] = { | |||
226 | { P_PLL0, 2 } | 226 | { P_PLL0, 2 } |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static const char *gcc_pxo_pll8_pll0_map[] = { | 229 | static const char * const gcc_pxo_pll8_pll0_map[] = { |
230 | "pxo", | 230 | "pxo", |
231 | "pll8_vote", | 231 | "pll8_vote", |
232 | "pll0_vote", | 232 | "pll0_vote", |
@@ -240,7 +240,7 @@ static const struct parent_map gcc_pxo_pll8_pll14_pll18_pll0_map[] = { | |||
240 | { P_PLL18, 1 } | 240 | { P_PLL18, 1 } |
241 | }; | 241 | }; |
242 | 242 | ||
243 | static const char *gcc_pxo_pll8_pll14_pll18_pll0[] = { | 243 | static const char * const gcc_pxo_pll8_pll14_pll18_pll0[] = { |
244 | "pxo", | 244 | "pxo", |
245 | "pll8_vote", | 245 | "pll8_vote", |
246 | "pll0_vote", | 246 | "pll0_vote", |
diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c index fc6b12da5b30..b02826ed770a 100644 --- a/drivers/clk/qcom/gcc-msm8660.c +++ b/drivers/clk/qcom/gcc-msm8660.c | |||
@@ -70,7 +70,7 @@ static const struct parent_map gcc_pxo_pll8_map[] = { | |||
70 | { P_PLL8, 3 } | 70 | { P_PLL8, 3 } |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static const char *gcc_pxo_pll8[] = { | 73 | static const char * const gcc_pxo_pll8[] = { |
74 | "pxo", | 74 | "pxo", |
75 | "pll8_vote", | 75 | "pll8_vote", |
76 | }; | 76 | }; |
@@ -81,7 +81,7 @@ static const struct parent_map gcc_pxo_pll8_cxo_map[] = { | |||
81 | { P_CXO, 5 } | 81 | { P_CXO, 5 } |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static const char *gcc_pxo_pll8_cxo[] = { | 84 | static const char * const gcc_pxo_pll8_cxo[] = { |
85 | "pxo", | 85 | "pxo", |
86 | "pll8_vote", | 86 | "pll8_vote", |
87 | "cxo", | 87 | "cxo", |
@@ -1917,7 +1917,7 @@ static struct clk_rcg usb_fs1_xcvr_fs_src = { | |||
1917 | } | 1917 | } |
1918 | }; | 1918 | }; |
1919 | 1919 | ||
1920 | static const char *usb_fs1_xcvr_fs_src_p[] = { "usb_fs1_xcvr_fs_src" }; | 1920 | static const char * const usb_fs1_xcvr_fs_src_p[] = { "usb_fs1_xcvr_fs_src" }; |
1921 | 1921 | ||
1922 | static struct clk_branch usb_fs1_xcvr_fs_clk = { | 1922 | static struct clk_branch usb_fs1_xcvr_fs_clk = { |
1923 | .halt_reg = 0x2fcc, | 1923 | .halt_reg = 0x2fcc, |
@@ -1984,7 +1984,7 @@ static struct clk_rcg usb_fs2_xcvr_fs_src = { | |||
1984 | } | 1984 | } |
1985 | }; | 1985 | }; |
1986 | 1986 | ||
1987 | static const char *usb_fs2_xcvr_fs_src_p[] = { "usb_fs2_xcvr_fs_src" }; | 1987 | static const char * const usb_fs2_xcvr_fs_src_p[] = { "usb_fs2_xcvr_fs_src" }; |
1988 | 1988 | ||
1989 | static struct clk_branch usb_fs2_xcvr_fs_clk = { | 1989 | static struct clk_branch usb_fs2_xcvr_fs_clk = { |
1990 | .halt_reg = 0x2fcc, | 1990 | .halt_reg = 0x2fcc, |
diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c index c66f7bc2ae87..3bf4fb3deef6 100644 --- a/drivers/clk/qcom/gcc-msm8916.c +++ b/drivers/clk/qcom/gcc-msm8916.c | |||
@@ -51,7 +51,7 @@ static const struct parent_map gcc_xo_gpll0_map[] = { | |||
51 | { P_GPLL0, 1 }, | 51 | { P_GPLL0, 1 }, |
52 | }; | 52 | }; |
53 | 53 | ||
54 | static const char *gcc_xo_gpll0[] = { | 54 | static const char * const gcc_xo_gpll0[] = { |
55 | "xo", | 55 | "xo", |
56 | "gpll0_vote", | 56 | "gpll0_vote", |
57 | }; | 57 | }; |
@@ -62,7 +62,7 @@ static const struct parent_map gcc_xo_gpll0_bimc_map[] = { | |||
62 | { P_BIMC, 2 }, | 62 | { P_BIMC, 2 }, |
63 | }; | 63 | }; |
64 | 64 | ||
65 | static const char *gcc_xo_gpll0_bimc[] = { | 65 | static const char * const gcc_xo_gpll0_bimc[] = { |
66 | "xo", | 66 | "xo", |
67 | "gpll0_vote", | 67 | "gpll0_vote", |
68 | "bimc_pll_vote", | 68 | "bimc_pll_vote", |
@@ -75,7 +75,7 @@ static const struct parent_map gcc_xo_gpll0a_gpll1_gpll2a_map[] = { | |||
75 | { P_GPLL2_AUX, 2 }, | 75 | { P_GPLL2_AUX, 2 }, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static const char *gcc_xo_gpll0a_gpll1_gpll2a[] = { | 78 | static const char * const gcc_xo_gpll0a_gpll1_gpll2a[] = { |
79 | "xo", | 79 | "xo", |
80 | "gpll0_vote", | 80 | "gpll0_vote", |
81 | "gpll1_vote", | 81 | "gpll1_vote", |
@@ -88,7 +88,7 @@ static const struct parent_map gcc_xo_gpll0_gpll2_map[] = { | |||
88 | { P_GPLL2, 2 }, | 88 | { P_GPLL2, 2 }, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static const char *gcc_xo_gpll0_gpll2[] = { | 91 | static const char * const gcc_xo_gpll0_gpll2[] = { |
92 | "xo", | 92 | "xo", |
93 | "gpll0_vote", | 93 | "gpll0_vote", |
94 | "gpll2_vote", | 94 | "gpll2_vote", |
@@ -99,7 +99,7 @@ static const struct parent_map gcc_xo_gpll0a_map[] = { | |||
99 | { P_GPLL0_AUX, 2 }, | 99 | { P_GPLL0_AUX, 2 }, |
100 | }; | 100 | }; |
101 | 101 | ||
102 | static const char *gcc_xo_gpll0a[] = { | 102 | static const char * const gcc_xo_gpll0a[] = { |
103 | "xo", | 103 | "xo", |
104 | "gpll0_vote", | 104 | "gpll0_vote", |
105 | }; | 105 | }; |
@@ -111,7 +111,7 @@ static const struct parent_map gcc_xo_gpll0_gpll1a_sleep_map[] = { | |||
111 | { P_SLEEP_CLK, 6 }, | 111 | { P_SLEEP_CLK, 6 }, |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static const char *gcc_xo_gpll0_gpll1a_sleep[] = { | 114 | static const char * const gcc_xo_gpll0_gpll1a_sleep[] = { |
115 | "xo", | 115 | "xo", |
116 | "gpll0_vote", | 116 | "gpll0_vote", |
117 | "gpll1_vote", | 117 | "gpll1_vote", |
@@ -124,7 +124,7 @@ static const struct parent_map gcc_xo_gpll0_gpll1a_map[] = { | |||
124 | { P_GPLL1_AUX, 2 }, | 124 | { P_GPLL1_AUX, 2 }, |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static const char *gcc_xo_gpll0_gpll1a[] = { | 127 | static const char * const gcc_xo_gpll0_gpll1a[] = { |
128 | "xo", | 128 | "xo", |
129 | "gpll0_vote", | 129 | "gpll0_vote", |
130 | "gpll1_vote", | 130 | "gpll1_vote", |
@@ -135,7 +135,7 @@ static const struct parent_map gcc_xo_dsibyte_map[] = { | |||
135 | { P_DSI0_PHYPLL_BYTE, 2 }, | 135 | { P_DSI0_PHYPLL_BYTE, 2 }, |
136 | }; | 136 | }; |
137 | 137 | ||
138 | static const char *gcc_xo_dsibyte[] = { | 138 | static const char * const gcc_xo_dsibyte[] = { |
139 | "xo", | 139 | "xo", |
140 | "dsi0pllbyte", | 140 | "dsi0pllbyte", |
141 | }; | 141 | }; |
@@ -146,7 +146,7 @@ static const struct parent_map gcc_xo_gpll0a_dsibyte_map[] = { | |||
146 | { P_DSI0_PHYPLL_BYTE, 1 }, | 146 | { P_DSI0_PHYPLL_BYTE, 1 }, |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static const char *gcc_xo_gpll0a_dsibyte[] = { | 149 | static const char * const gcc_xo_gpll0a_dsibyte[] = { |
150 | "xo", | 150 | "xo", |
151 | "gpll0_vote", | 151 | "gpll0_vote", |
152 | "dsi0pllbyte", | 152 | "dsi0pllbyte", |
@@ -158,7 +158,7 @@ static const struct parent_map gcc_xo_gpll0_dsiphy_map[] = { | |||
158 | { P_DSI0_PHYPLL_DSI, 2 }, | 158 | { P_DSI0_PHYPLL_DSI, 2 }, |
159 | }; | 159 | }; |
160 | 160 | ||
161 | static const char *gcc_xo_gpll0_dsiphy[] = { | 161 | static const char * const gcc_xo_gpll0_dsiphy[] = { |
162 | "xo", | 162 | "xo", |
163 | "gpll0_vote", | 163 | "gpll0_vote", |
164 | "dsi0pll", | 164 | "dsi0pll", |
@@ -170,7 +170,7 @@ static const struct parent_map gcc_xo_gpll0a_dsiphy_map[] = { | |||
170 | { P_DSI0_PHYPLL_DSI, 1 }, | 170 | { P_DSI0_PHYPLL_DSI, 1 }, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static const char *gcc_xo_gpll0a_dsiphy[] = { | 173 | static const char * const gcc_xo_gpll0a_dsiphy[] = { |
174 | "xo", | 174 | "xo", |
175 | "gpll0_vote", | 175 | "gpll0_vote", |
176 | "dsi0pll", | 176 | "dsi0pll", |
@@ -183,7 +183,7 @@ static const struct parent_map gcc_xo_gpll0a_gpll1_gpll2_map[] = { | |||
183 | { P_GPLL2, 2 }, | 183 | { P_GPLL2, 2 }, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | static const char *gcc_xo_gpll0a_gpll1_gpll2[] = { | 186 | static const char * const gcc_xo_gpll0a_gpll1_gpll2[] = { |
187 | "xo", | 187 | "xo", |
188 | "gpll0_vote", | 188 | "gpll0_vote", |
189 | "gpll1_vote", | 189 | "gpll1_vote", |
diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c index eb6a4f9fa107..aa294b1bad34 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c | |||
@@ -125,7 +125,7 @@ static const struct parent_map gcc_pxo_pll8_map[] = { | |||
125 | { P_PLL8, 3 } | 125 | { P_PLL8, 3 } |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static const char *gcc_pxo_pll8[] = { | 128 | static const char * const gcc_pxo_pll8[] = { |
129 | "pxo", | 129 | "pxo", |
130 | "pll8_vote", | 130 | "pll8_vote", |
131 | }; | 131 | }; |
@@ -136,7 +136,7 @@ static const struct parent_map gcc_pxo_pll8_cxo_map[] = { | |||
136 | { P_CXO, 5 } | 136 | { P_CXO, 5 } |
137 | }; | 137 | }; |
138 | 138 | ||
139 | static const char *gcc_pxo_pll8_cxo[] = { | 139 | static const char * const gcc_pxo_pll8_cxo[] = { |
140 | "pxo", | 140 | "pxo", |
141 | "pll8_vote", | 141 | "pll8_vote", |
142 | "cxo", | 142 | "cxo", |
@@ -148,7 +148,7 @@ static const struct parent_map gcc_pxo_pll8_pll3_map[] = { | |||
148 | { P_PLL3, 6 } | 148 | { P_PLL3, 6 } |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static const char *gcc_pxo_pll8_pll3[] = { | 151 | static const char * const gcc_pxo_pll8_pll3[] = { |
152 | "pxo", | 152 | "pxo", |
153 | "pll8_vote", | 153 | "pll8_vote", |
154 | "pll3", | 154 | "pll3", |
@@ -2085,7 +2085,7 @@ static struct clk_rcg usb_hsic_xcvr_fs_src = { | |||
2085 | } | 2085 | } |
2086 | }; | 2086 | }; |
2087 | 2087 | ||
2088 | static const char *usb_hsic_xcvr_fs_src_p[] = { "usb_hsic_xcvr_fs_src" }; | 2088 | static const char * const usb_hsic_xcvr_fs_src_p[] = { "usb_hsic_xcvr_fs_src" }; |
2089 | 2089 | ||
2090 | static struct clk_branch usb_hsic_xcvr_fs_clk = { | 2090 | static struct clk_branch usb_hsic_xcvr_fs_clk = { |
2091 | .halt_reg = 0x2fc8, | 2091 | .halt_reg = 0x2fc8, |
@@ -2181,7 +2181,7 @@ static struct clk_rcg usb_fs1_xcvr_fs_src = { | |||
2181 | } | 2181 | } |
2182 | }; | 2182 | }; |
2183 | 2183 | ||
2184 | static const char *usb_fs1_xcvr_fs_src_p[] = { "usb_fs1_xcvr_fs_src" }; | 2184 | static const char * const usb_fs1_xcvr_fs_src_p[] = { "usb_fs1_xcvr_fs_src" }; |
2185 | 2185 | ||
2186 | static struct clk_branch usb_fs1_xcvr_fs_clk = { | 2186 | static struct clk_branch usb_fs1_xcvr_fs_clk = { |
2187 | .halt_reg = 0x2fcc, | 2187 | .halt_reg = 0x2fcc, |
@@ -2248,7 +2248,7 @@ static struct clk_rcg usb_fs2_xcvr_fs_src = { | |||
2248 | } | 2248 | } |
2249 | }; | 2249 | }; |
2250 | 2250 | ||
2251 | static const char *usb_fs2_xcvr_fs_src_p[] = { "usb_fs2_xcvr_fs_src" }; | 2251 | static const char * const usb_fs2_xcvr_fs_src_p[] = { "usb_fs2_xcvr_fs_src" }; |
2252 | 2252 | ||
2253 | static struct clk_branch usb_fs2_xcvr_fs_clk = { | 2253 | static struct clk_branch usb_fs2_xcvr_fs_clk = { |
2254 | .halt_reg = 0x2fcc, | 2254 | .halt_reg = 0x2fcc, |
diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c index c39d09874e74..2c289702119f 100644 --- a/drivers/clk/qcom/gcc-msm8974.c +++ b/drivers/clk/qcom/gcc-msm8974.c | |||
@@ -44,7 +44,7 @@ static const struct parent_map gcc_xo_gpll0_map[] = { | |||
44 | { P_GPLL0, 1 } | 44 | { P_GPLL0, 1 } |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static const char *gcc_xo_gpll0[] = { | 47 | static const char * const gcc_xo_gpll0[] = { |
48 | "xo", | 48 | "xo", |
49 | "gpll0_vote", | 49 | "gpll0_vote", |
50 | }; | 50 | }; |
@@ -55,7 +55,7 @@ static const struct parent_map gcc_xo_gpll0_gpll4_map[] = { | |||
55 | { P_GPLL4, 5 } | 55 | { P_GPLL4, 5 } |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static const char *gcc_xo_gpll0_gpll4[] = { | 58 | static const char * const gcc_xo_gpll0_gpll4[] = { |
59 | "xo", | 59 | "xo", |
60 | "gpll0_vote", | 60 | "gpll0_vote", |
61 | "gpll4_vote", | 61 | "gpll4_vote", |
diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c index 47f0ac16d149..93ad42b14366 100644 --- a/drivers/clk/qcom/lcc-ipq806x.c +++ b/drivers/clk/qcom/lcc-ipq806x.c | |||
@@ -71,7 +71,7 @@ static const struct parent_map lcc_pxo_pll4_map[] = { | |||
71 | { P_PLL4, 2 } | 71 | { P_PLL4, 2 } |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static const char *lcc_pxo_pll4[] = { | 74 | static const char * const lcc_pxo_pll4[] = { |
75 | "pxo", | 75 | "pxo", |
76 | "pll4_vote", | 76 | "pll4_vote", |
77 | }; | 77 | }; |
@@ -146,7 +146,7 @@ static struct clk_rcg mi2s_osr_src = { | |||
146 | }, | 146 | }, |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static const char *lcc_mi2s_parents[] = { | 149 | static const char * const lcc_mi2s_parents[] = { |
150 | "mi2s_osr_src", | 150 | "mi2s_osr_src", |
151 | }; | 151 | }; |
152 | 152 | ||
@@ -340,7 +340,7 @@ static struct clk_rcg spdif_src = { | |||
340 | }, | 340 | }, |
341 | }; | 341 | }; |
342 | 342 | ||
343 | static const char *lcc_spdif_parents[] = { | 343 | static const char * const lcc_spdif_parents[] = { |
344 | "spdif_src", | 344 | "spdif_src", |
345 | }; | 345 | }; |
346 | 346 | ||
diff --git a/drivers/clk/qcom/lcc-msm8960.c b/drivers/clk/qcom/lcc-msm8960.c index d0df9d5fc3af..ecb96c284675 100644 --- a/drivers/clk/qcom/lcc-msm8960.c +++ b/drivers/clk/qcom/lcc-msm8960.c | |||
@@ -57,7 +57,7 @@ static const struct parent_map lcc_pxo_pll4_map[] = { | |||
57 | { P_PLL4, 2 } | 57 | { P_PLL4, 2 } |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static const char *lcc_pxo_pll4[] = { | 60 | static const char * const lcc_pxo_pll4[] = { |
61 | "pxo", | 61 | "pxo", |
62 | "pll4_vote", | 62 | "pll4_vote", |
63 | }; | 63 | }; |
@@ -127,7 +127,7 @@ static struct clk_rcg mi2s_osr_src = { | |||
127 | }, | 127 | }, |
128 | }; | 128 | }; |
129 | 129 | ||
130 | static const char *lcc_mi2s_parents[] = { | 130 | static const char * const lcc_mi2s_parents[] = { |
131 | "mi2s_osr_src", | 131 | "mi2s_osr_src", |
132 | }; | 132 | }; |
133 | 133 | ||
@@ -233,7 +233,7 @@ static struct clk_rcg prefix##_osr_src = { \ | |||
233 | }, \ | 233 | }, \ |
234 | }; \ | 234 | }; \ |
235 | \ | 235 | \ |
236 | static const char *lcc_##prefix##_parents[] = { \ | 236 | static const char * const lcc_##prefix##_parents[] = { \ |
237 | #prefix "_osr_src", \ | 237 | #prefix "_osr_src", \ |
238 | }; \ | 238 | }; \ |
239 | \ | 239 | \ |
@@ -445,7 +445,7 @@ static struct clk_rcg slimbus_src = { | |||
445 | }, | 445 | }, |
446 | }; | 446 | }; |
447 | 447 | ||
448 | static const char *lcc_slimbus_parents[] = { | 448 | static const char * const lcc_slimbus_parents[] = { |
449 | "slimbus_src", | 449 | "slimbus_src", |
450 | }; | 450 | }; |
451 | 451 | ||
diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c index 1b17df2cb0af..f0ee6bde11af 100644 --- a/drivers/clk/qcom/mmcc-apq8084.c +++ b/drivers/clk/qcom/mmcc-apq8084.c | |||
@@ -53,7 +53,7 @@ static const struct parent_map mmcc_xo_mmpll0_mmpll1_gpll0_map[] = { | |||
53 | { P_GPLL0, 5 } | 53 | { P_GPLL0, 5 } |
54 | }; | 54 | }; |
55 | 55 | ||
56 | static const char *mmcc_xo_mmpll0_mmpll1_gpll0[] = { | 56 | static const char * const mmcc_xo_mmpll0_mmpll1_gpll0[] = { |
57 | "xo", | 57 | "xo", |
58 | "mmpll0_vote", | 58 | "mmpll0_vote", |
59 | "mmpll1_vote", | 59 | "mmpll1_vote", |
@@ -69,7 +69,7 @@ static const struct parent_map mmcc_xo_mmpll0_dsi_hdmi_gpll0_map[] = { | |||
69 | { P_DSI1PLL, 3 } | 69 | { P_DSI1PLL, 3 } |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static const char *mmcc_xo_mmpll0_dsi_hdmi_gpll0[] = { | 72 | static const char * const mmcc_xo_mmpll0_dsi_hdmi_gpll0[] = { |
73 | "xo", | 73 | "xo", |
74 | "mmpll0_vote", | 74 | "mmpll0_vote", |
75 | "hdmipll", | 75 | "hdmipll", |
@@ -86,7 +86,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_2_gpll0_map[] = { | |||
86 | { P_MMPLL2, 3 } | 86 | { P_MMPLL2, 3 } |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static const char *mmcc_xo_mmpll0_1_2_gpll0[] = { | 89 | static const char * const mmcc_xo_mmpll0_1_2_gpll0[] = { |
90 | "xo", | 90 | "xo", |
91 | "mmpll0_vote", | 91 | "mmpll0_vote", |
92 | "mmpll1_vote", | 92 | "mmpll1_vote", |
@@ -102,7 +102,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_3_gpll0_map[] = { | |||
102 | { P_MMPLL3, 3 } | 102 | { P_MMPLL3, 3 } |
103 | }; | 103 | }; |
104 | 104 | ||
105 | static const char *mmcc_xo_mmpll0_1_3_gpll0[] = { | 105 | static const char * const mmcc_xo_mmpll0_1_3_gpll0[] = { |
106 | "xo", | 106 | "xo", |
107 | "mmpll0_vote", | 107 | "mmpll0_vote", |
108 | "mmpll1_vote", | 108 | "mmpll1_vote", |
@@ -119,7 +119,7 @@ static const struct parent_map mmcc_xo_dsi_hdmi_edp_map[] = { | |||
119 | { P_DSI1PLL, 2 } | 119 | { P_DSI1PLL, 2 } |
120 | }; | 120 | }; |
121 | 121 | ||
122 | static const char *mmcc_xo_dsi_hdmi_edp[] = { | 122 | static const char * const mmcc_xo_dsi_hdmi_edp[] = { |
123 | "xo", | 123 | "xo", |
124 | "edp_link_clk", | 124 | "edp_link_clk", |
125 | "hdmipll", | 125 | "hdmipll", |
@@ -137,7 +137,7 @@ static const struct parent_map mmcc_xo_dsi_hdmi_edp_gpll0_map[] = { | |||
137 | { P_DSI1PLL, 2 } | 137 | { P_DSI1PLL, 2 } |
138 | }; | 138 | }; |
139 | 139 | ||
140 | static const char *mmcc_xo_dsi_hdmi_edp_gpll0[] = { | 140 | static const char * const mmcc_xo_dsi_hdmi_edp_gpll0[] = { |
141 | "xo", | 141 | "xo", |
142 | "edp_link_clk", | 142 | "edp_link_clk", |
143 | "hdmipll", | 143 | "hdmipll", |
@@ -155,7 +155,7 @@ static const struct parent_map mmcc_xo_dsibyte_hdmi_edp_gpll0_map[] = { | |||
155 | { P_DSI1PLL_BYTE, 2 } | 155 | { P_DSI1PLL_BYTE, 2 } |
156 | }; | 156 | }; |
157 | 157 | ||
158 | static const char *mmcc_xo_dsibyte_hdmi_edp_gpll0[] = { | 158 | static const char * const mmcc_xo_dsibyte_hdmi_edp_gpll0[] = { |
159 | "xo", | 159 | "xo", |
160 | "edp_link_clk", | 160 | "edp_link_clk", |
161 | "hdmipll", | 161 | "hdmipll", |
@@ -172,7 +172,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_4_gpll0_map[] = { | |||
172 | { P_MMPLL4, 3 } | 172 | { P_MMPLL4, 3 } |
173 | }; | 173 | }; |
174 | 174 | ||
175 | static const char *mmcc_xo_mmpll0_1_4_gpll0[] = { | 175 | static const char * const mmcc_xo_mmpll0_1_4_gpll0[] = { |
176 | "xo", | 176 | "xo", |
177 | "mmpll0", | 177 | "mmpll0", |
178 | "mmpll1", | 178 | "mmpll1", |
@@ -189,7 +189,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_4_gpll1_0_map[] = { | |||
189 | { P_GPLL1, 4 } | 189 | { P_GPLL1, 4 } |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static const char *mmcc_xo_mmpll0_1_4_gpll1_0[] = { | 192 | static const char * const mmcc_xo_mmpll0_1_4_gpll1_0[] = { |
193 | "xo", | 193 | "xo", |
194 | "mmpll0", | 194 | "mmpll0", |
195 | "mmpll1", | 195 | "mmpll1", |
@@ -208,7 +208,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_4_gpll1_0_sleep_map[] = { | |||
208 | { P_MMSLEEP, 6 } | 208 | { P_MMSLEEP, 6 } |
209 | }; | 209 | }; |
210 | 210 | ||
211 | static const char *mmcc_xo_mmpll0_1_4_gpll1_0_sleep[] = { | 211 | static const char * const mmcc_xo_mmpll0_1_4_gpll1_0_sleep[] = { |
212 | "xo", | 212 | "xo", |
213 | "mmpll0", | 213 | "mmpll0", |
214 | "mmpll1", | 214 | "mmpll1", |
diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c index 9711bca9cc06..54aadbcda61a 100644 --- a/drivers/clk/qcom/mmcc-msm8960.c +++ b/drivers/clk/qcom/mmcc-msm8960.c | |||
@@ -50,7 +50,7 @@ static const struct parent_map mmcc_pxo_pll8_pll2_map[] = { | |||
50 | { P_PLL2, 1 } | 50 | { P_PLL2, 1 } |
51 | }; | 51 | }; |
52 | 52 | ||
53 | static const char *mmcc_pxo_pll8_pll2[] = { | 53 | static const char * const mmcc_pxo_pll8_pll2[] = { |
54 | "pxo", | 54 | "pxo", |
55 | "pll8_vote", | 55 | "pll8_vote", |
56 | "pll2", | 56 | "pll2", |
@@ -63,7 +63,7 @@ static const struct parent_map mmcc_pxo_pll8_pll2_pll3_map[] = { | |||
63 | { P_PLL3, 3 } | 63 | { P_PLL3, 3 } |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static const char *mmcc_pxo_pll8_pll2_pll15[] = { | 66 | static const char * const mmcc_pxo_pll8_pll2_pll15[] = { |
67 | "pxo", | 67 | "pxo", |
68 | "pll8_vote", | 68 | "pll8_vote", |
69 | "pll2", | 69 | "pll2", |
@@ -77,7 +77,7 @@ static const struct parent_map mmcc_pxo_pll8_pll2_pll15_map[] = { | |||
77 | { P_PLL15, 3 } | 77 | { P_PLL15, 3 } |
78 | }; | 78 | }; |
79 | 79 | ||
80 | static const char *mmcc_pxo_pll8_pll2_pll3[] = { | 80 | static const char * const mmcc_pxo_pll8_pll2_pll3[] = { |
81 | "pxo", | 81 | "pxo", |
82 | "pll8_vote", | 82 | "pll8_vote", |
83 | "pll2", | 83 | "pll2", |
@@ -579,7 +579,7 @@ static const struct clk_ops clk_ops_pix_rdi = { | |||
579 | .determine_rate = __clk_mux_determine_rate, | 579 | .determine_rate = __clk_mux_determine_rate, |
580 | }; | 580 | }; |
581 | 581 | ||
582 | static const char *pix_rdi_parents[] = { | 582 | static const char * const pix_rdi_parents[] = { |
583 | "csi0_clk", | 583 | "csi0_clk", |
584 | "csi1_clk", | 584 | "csi1_clk", |
585 | "csi2_clk", | 585 | "csi2_clk", |
@@ -709,7 +709,7 @@ static struct clk_rcg csiphytimer_src = { | |||
709 | }, | 709 | }, |
710 | }; | 710 | }; |
711 | 711 | ||
712 | static const char *csixphy_timer_src[] = { "csiphytimer_src" }; | 712 | static const char * const csixphy_timer_src[] = { "csiphytimer_src" }; |
713 | 713 | ||
714 | static struct clk_branch csiphy0_timer_clk = { | 714 | static struct clk_branch csiphy0_timer_clk = { |
715 | .halt_reg = 0x01e8, | 715 | .halt_reg = 0x01e8, |
@@ -1385,7 +1385,7 @@ static const struct parent_map mmcc_pxo_hdmi_map[] = { | |||
1385 | { P_HDMI_PLL, 3 } | 1385 | { P_HDMI_PLL, 3 } |
1386 | }; | 1386 | }; |
1387 | 1387 | ||
1388 | static const char *mmcc_pxo_hdmi[] = { | 1388 | static const char * const mmcc_pxo_hdmi[] = { |
1389 | "pxo", | 1389 | "pxo", |
1390 | "hdmi_pll", | 1390 | "hdmi_pll", |
1391 | }; | 1391 | }; |
@@ -1428,7 +1428,7 @@ static struct clk_rcg tv_src = { | |||
1428 | }, | 1428 | }, |
1429 | }; | 1429 | }; |
1430 | 1430 | ||
1431 | static const char *tv_src_name[] = { "tv_src" }; | 1431 | static const char * const tv_src_name[] = { "tv_src" }; |
1432 | 1432 | ||
1433 | static struct clk_branch tv_enc_clk = { | 1433 | static struct clk_branch tv_enc_clk = { |
1434 | .halt_reg = 0x01d4, | 1434 | .halt_reg = 0x01d4, |
diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c index 07f4cc159ad3..0987bf443e1f 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c | |||
@@ -56,7 +56,7 @@ static const struct parent_map mmcc_xo_mmpll0_mmpll1_gpll0_map[] = { | |||
56 | { P_GPLL0, 5 } | 56 | { P_GPLL0, 5 } |
57 | }; | 57 | }; |
58 | 58 | ||
59 | static const char *mmcc_xo_mmpll0_mmpll1_gpll0[] = { | 59 | static const char * const mmcc_xo_mmpll0_mmpll1_gpll0[] = { |
60 | "xo", | 60 | "xo", |
61 | "mmpll0_vote", | 61 | "mmpll0_vote", |
62 | "mmpll1_vote", | 62 | "mmpll1_vote", |
@@ -72,7 +72,7 @@ static const struct parent_map mmcc_xo_mmpll0_dsi_hdmi_gpll0_map[] = { | |||
72 | { P_DSI1PLL, 3 } | 72 | { P_DSI1PLL, 3 } |
73 | }; | 73 | }; |
74 | 74 | ||
75 | static const char *mmcc_xo_mmpll0_dsi_hdmi_gpll0[] = { | 75 | static const char * const mmcc_xo_mmpll0_dsi_hdmi_gpll0[] = { |
76 | "xo", | 76 | "xo", |
77 | "mmpll0_vote", | 77 | "mmpll0_vote", |
78 | "hdmipll", | 78 | "hdmipll", |
@@ -89,7 +89,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_2_gpll0_map[] = { | |||
89 | { P_MMPLL2, 3 } | 89 | { P_MMPLL2, 3 } |
90 | }; | 90 | }; |
91 | 91 | ||
92 | static const char *mmcc_xo_mmpll0_1_2_gpll0[] = { | 92 | static const char * const mmcc_xo_mmpll0_1_2_gpll0[] = { |
93 | "xo", | 93 | "xo", |
94 | "mmpll0_vote", | 94 | "mmpll0_vote", |
95 | "mmpll1_vote", | 95 | "mmpll1_vote", |
@@ -105,7 +105,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_3_gpll0_map[] = { | |||
105 | { P_MMPLL3, 3 } | 105 | { P_MMPLL3, 3 } |
106 | }; | 106 | }; |
107 | 107 | ||
108 | static const char *mmcc_xo_mmpll0_1_3_gpll0[] = { | 108 | static const char * const mmcc_xo_mmpll0_1_3_gpll0[] = { |
109 | "xo", | 109 | "xo", |
110 | "mmpll0_vote", | 110 | "mmpll0_vote", |
111 | "mmpll1_vote", | 111 | "mmpll1_vote", |
@@ -121,7 +121,7 @@ static const struct parent_map mmcc_xo_mmpll0_1_gpll1_0_map[] = { | |||
121 | { P_GPLL1, 4 } | 121 | { P_GPLL1, 4 } |
122 | }; | 122 | }; |
123 | 123 | ||
124 | static const char *mmcc_xo_mmpll0_1_gpll1_0[] = { | 124 | static const char * const mmcc_xo_mmpll0_1_gpll1_0[] = { |
125 | "xo", | 125 | "xo", |
126 | "mmpll0_vote", | 126 | "mmpll0_vote", |
127 | "mmpll1_vote", | 127 | "mmpll1_vote", |
@@ -138,7 +138,7 @@ static const struct parent_map mmcc_xo_dsi_hdmi_edp_map[] = { | |||
138 | { P_DSI1PLL, 2 } | 138 | { P_DSI1PLL, 2 } |
139 | }; | 139 | }; |
140 | 140 | ||
141 | static const char *mmcc_xo_dsi_hdmi_edp[] = { | 141 | static const char * const mmcc_xo_dsi_hdmi_edp[] = { |
142 | "xo", | 142 | "xo", |
143 | "edp_link_clk", | 143 | "edp_link_clk", |
144 | "hdmipll", | 144 | "hdmipll", |
@@ -156,7 +156,7 @@ static const struct parent_map mmcc_xo_dsi_hdmi_edp_gpll0_map[] = { | |||
156 | { P_DSI1PLL, 2 } | 156 | { P_DSI1PLL, 2 } |
157 | }; | 157 | }; |
158 | 158 | ||
159 | static const char *mmcc_xo_dsi_hdmi_edp_gpll0[] = { | 159 | static const char * const mmcc_xo_dsi_hdmi_edp_gpll0[] = { |
160 | "xo", | 160 | "xo", |
161 | "edp_link_clk", | 161 | "edp_link_clk", |
162 | "hdmipll", | 162 | "hdmipll", |
@@ -174,7 +174,7 @@ static const struct parent_map mmcc_xo_dsibyte_hdmi_edp_gpll0_map[] = { | |||
174 | { P_DSI1PLL_BYTE, 2 } | 174 | { P_DSI1PLL_BYTE, 2 } |
175 | }; | 175 | }; |
176 | 176 | ||
177 | static const char *mmcc_xo_dsibyte_hdmi_edp_gpll0[] = { | 177 | static const char * const mmcc_xo_dsibyte_hdmi_edp_gpll0[] = { |
178 | "xo", | 178 | "xo", |
179 | "edp_link_clk", | 179 | "edp_link_clk", |
180 | "hdmipll", | 180 | "hdmipll", |