1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
From 1d14f9f23a8122fb286eb7c93cadd2233ac789ab Mon Sep 17 00:00:00 2001
From: Andrey Dolnikov <andrey.dolnikov@cogentembedded.com>
Date: Tue, 6 Nov 2018 16:43:06 +0300
Subject: [PATCH 160/211] clk: cs2000 add support for cs2300
Signed-off-by: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
---
drivers/clk/Kconfig | 5 ++-
drivers/clk/clk-cs2000-cp.c | 101 +++++++++++++++++++++++++++++++++-----------
2 files changed, 79 insertions(+), 27 deletions(-)
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 1c4e1aa..51667a3 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -128,10 +128,11 @@ config COMMON_CLK_CDCE925
divider to best approximate the desired output.
config COMMON_CLK_CS2000_CP
- tristate "Clock driver for CS2000 Fractional-N Clock Synthesizer & Clock Multiplier"
+ tristate "Clock driver for CS2x00 Fractional-N Clock Synthesizer & Clock Multiplier"
depends on I2C
help
- If you say yes here you get support for the CS2000 clock multiplier.
+ If you say yes here you get support for the CS2000 and CS2300 clock
+ multiplier.
config COMMON_CLK_GEMINI
bool "Clock driver for Cortina Systems Gemini SoC"
diff --git a/drivers/clk/clk-cs2000-cp.c b/drivers/clk/clk-cs2000-cp.c
index e8ea81c..2708e82 100644
--- a/drivers/clk/clk-cs2000-cp.c
+++ b/drivers/clk/clk-cs2000-cp.c
@@ -28,6 +28,7 @@
#define Val_Ratio(x, nth) ((x & 0xFF) << (24 - (8 * nth)))
#define FUNC_CFG1 0x16
#define FUNC_CFG2 0x17
+#define FUNC_CFG3 0x1E
/* DEVICE_ID */
#define REVISION_MASK (0x7)
@@ -57,8 +58,11 @@
/* FUNC_CFG1 */
#define CLKSKIPEN (1 << 7)
+#define ENDEV3 (1 << 4)
#define REFCLKDIV(x) (((x) & 0x3) << 3)
#define REFCLKDIV_MASK REFCLKDIV(0x3)
+#define RMODSEL(x) (((x) & 0x7) << 5)
+#define RMODSEL_MASK RMODSEL(0x7)
/* FUNC_CFG2 */
#define LFRATIO_MASK (1 << 3)
@@ -74,6 +78,11 @@
#define REF_CLK 1
#define CLK_MAX 2
+enum cs2x00_type {
+ DEVICE_CS2000,
+ DEVICE_CS2300
+};
+
struct cs2000_priv {
struct clk_hw hw;
struct i2c_client *client;
@@ -83,16 +92,20 @@ struct cs2000_priv {
/* suspend/resume */
unsigned long saved_rate;
unsigned long saved_parent_rate;
+
+ enum cs2x00_type type;
};
static const struct of_device_id cs2000_of_match[] = {
- { .compatible = "cirrus,cs2000-cp", },
+ { .compatible = "cirrus,cs2000-cp", .data = (void *)DEVICE_CS2000},
+ { .compatible = "cirrus,cs2300-cp", .data = (void *)DEVICE_CS2300},
{},
};
MODULE_DEVICE_TABLE(of, cs2000_of_match);
static const struct i2c_device_id cs2000_id[] = {
- { "cs2000-cp", },
+ { "cs2000-cp", DEVICE_CS2000},
+ { "cs2300-cp", DEVICE_CS2300},
{}
};
MODULE_DEVICE_TABLE(i2c, cs2000_id);
@@ -130,8 +143,13 @@ static int cs2000_enable_dev_config(struct cs2000_priv *priv, bool enable)
if (ret < 0)
return ret;
- ret = cs2000_bset(priv, FUNC_CFG1, CLKSKIPEN,
- enable ? CLKSKIPEN : 0);
+ if (priv->type == DEVICE_CS2000) {
+ ret = cs2000_bset(priv, FUNC_CFG1, CLKSKIPEN,
+ enable ? CLKSKIPEN : 0);
+ } else {
+ ret = cs2000_bset(priv, FUNC_CFG1, CLKSKIPEN | ENDEV3,
+ enable ? (CLKSKIPEN | ENDEV3) : 0);
+ }
if (ret < 0)
return ret;
@@ -163,6 +181,15 @@ static int cs2000_clk_in_bound_rate(struct cs2000_priv *priv,
REFCLKDIV(val));
}
+
+static int cs2300_clk_rmod_set(struct cs2000_priv *priv,
+ u32 rmod)
+{
+ return cs2000_bset(priv, FUNC_CFG1,
+ RMODSEL_MASK,
+ RMODSEL(rmod));
+}
+
static int cs2000_wait_pll_lock(struct cs2000_priv *priv)
{
struct device *dev = priv_to_dev(priv);
@@ -316,17 +343,27 @@ static int __cs2000_set_rate(struct cs2000_priv *priv, int ch,
{
int ret;
- ret = cs2000_clk_in_bound_rate(priv, parent_rate);
- if (ret < 0)
- return ret;
+ if (priv->type == DEVICE_CS2000) {
+ ret = cs2000_clk_in_bound_rate(priv, parent_rate);
+ if (ret < 0)
+ return ret;
- ret = cs2000_ratio_set(priv, ch, parent_rate, rate);
- if (ret < 0)
- return ret;
+ ret = cs2000_ratio_set(priv, ch, parent_rate, rate);
+ if (ret < 0)
+ return ret;
- ret = cs2000_ratio_select(priv, ch);
- if (ret < 0)
- return ret;
+ ret = cs2000_ratio_select(priv, ch);
+ if (ret < 0)
+ return ret;
+ } else {
+ ret = cs2300_clk_rmod_set(priv, 0);
+ if (ret < 0)
+ return ret;
+
+ ret = cs2000_ratio_set(priv, 0, parent_rate, rate);
+ if (ret < 0)
+ return ret;
+ }
priv->saved_rate = rate;
priv->saved_parent_rate = parent_rate;
@@ -383,8 +420,12 @@ static void cs2000_disable(struct clk_hw *hw)
static u8 cs2000_get_parent(struct clk_hw *hw)
{
- /* always return REF_CLK */
- return REF_CLK;
+ struct cs2000_priv *priv = hw_to_priv(hw);
+
+ if (priv->type == DEVICE_CS2000)
+ return REF_CLK;
+ else
+ return CLK_IN;
}
static const struct clk_ops cs2000_ops = {
@@ -399,17 +440,19 @@ static const struct clk_ops cs2000_ops = {
static int cs2000_clk_get(struct cs2000_priv *priv)
{
struct device *dev = priv_to_dev(priv);
- struct clk *clk_in, *ref_clk;
+ struct clk *clk_in, *ref_clk = NULL;
clk_in = devm_clk_get(dev, "clk_in");
/* not yet provided */
if (IS_ERR(clk_in))
return -EPROBE_DEFER;
- ref_clk = devm_clk_get(dev, "ref_clk");
- /* not yet provided */
- if (IS_ERR(ref_clk))
- return -EPROBE_DEFER;
+ if (priv->type == DEVICE_CS2000) {
+ ref_clk = devm_clk_get(dev, "ref_clk");
+ /* not yet provided */
+ if (IS_ERR(ref_clk))
+ return -EPROBE_DEFER;
+ }
priv->clk_in = clk_in;
priv->ref_clk = ref_clk;
@@ -435,19 +478,26 @@ static int cs2000_clk_register(struct cs2000_priv *priv)
* otherwise .set_rate which setup ratio
* is never called if user requests 1/1 rate
*/
- rate = clk_get_rate(priv->ref_clk);
+ if (priv->type == DEVICE_CS2000)
+ rate = clk_get_rate(priv->ref_clk);
+ else
+ rate = clk_get_rate(priv->clk_in);
ret = __cs2000_set_rate(priv, ch, rate, rate);
if (ret < 0)
return ret;
parent_names[CLK_IN] = __clk_get_name(priv->clk_in);
- parent_names[REF_CLK] = __clk_get_name(priv->ref_clk);
+ if (priv->type == DEVICE_CS2000)
+ parent_names[REF_CLK] = __clk_get_name(priv->ref_clk);
init.name = name;
init.ops = &cs2000_ops;
init.flags = CLK_SET_RATE_GATE;
init.parent_names = parent_names;
- init.num_parents = ARRAY_SIZE(parent_names);
+ if (priv->type == DEVICE_CS2000)
+ init.num_parents = ARRAY_SIZE(parent_names);
+ else
+ init.num_parents = 1;
priv->hw.init = &init;
@@ -474,7 +524,7 @@ static int cs2000_version_print(struct cs2000_priv *priv)
if (val < 0)
return val;
- /* CS2000 should be 0x0 */
+ /* CS2000/CS2300 should be 0x0 */
if (val >> 3)
return -EIO;
@@ -520,6 +570,7 @@ static int cs2000_probe(struct i2c_client *client,
priv->client = client;
i2c_set_clientdata(client, priv);
+ priv->type = (enum cs2x00_type)id->driver_data;
ret = cs2000_clk_get(priv);
if (ret < 0)
@@ -556,7 +607,7 @@ static struct i2c_driver cs2000_driver = {
.driver = {
.name = "cs2000-cp",
.pm = &cs2000_pm_ops,
- .of_match_table = cs2000_of_match,
+ .of_match_table = of_match_ptr(cs2000_of_match),
},
.probe = cs2000_probe,
.remove = cs2000_remove,
--
2.7.4
|
