update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/clk/mvebu/ap806-system-controller.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Marvell Armada AP806 System Controller
3
4
  *
..
..
@@ -5,25 +6,22 @@
5
6
  *
6
7
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
7
8
  *
8
- * This file is licensed under the terms of the GNU General Public
9
- * License version 2.  This program is licensed "as is" without any
10
- * warranty of any kind, whether express or implied.
11
9
  */
12
10
 
13
11
 #define pr_fmt(fmt) "ap806-system-controller: " fmt
14
12
 
13
+#include "armada_ap_cp_helper.h"
15
14
 #include <linux/clk-provider.h>
16
15
 #include <linux/mfd/syscon.h>
17
16
 #include <linux/init.h>
18
17
 #include <linux/of.h>
19
-#include <linux/of_address.h>
20
18
 #include <linux/platform_device.h>
21
19
 #include <linux/regmap.h>
22
20
 
23
21
 #define AP806_SAR_REG			0x400
24
22
 #define AP806_SAR_CLKFREQ_MODE_MASK	0x1f
25
23
 
26
-#define AP806_CLK_NUM			5
24
+#define AP806_CLK_NUM			6
27
25
 
28
26
 static struct clk *ap806_clks[AP806_CLK_NUM];
29
27
 
..
..
@@ -32,22 +30,106 @@
32
30
 	.clk_num = AP806_CLK_NUM,
33
31
 };
34
32
 
35
-static char *ap806_unique_name(struct device *dev, struct device_node *np,
36
-			       char *name)
33
+static int ap806_get_sar_clocks(unsigned int freq_mode,
34
+				unsigned int *cpuclk_freq,
35
+				unsigned int *dclk_freq)
37
36
 {
38
-	const __be32 *reg;
39
-	u64 addr;
37
+	switch (freq_mode) {
38
+	case 0x0:
39
+		*cpuclk_freq = 2000;
40
+		*dclk_freq = 600;
41
+		break;
42
+	case 0x1:
43
+		*cpuclk_freq = 2000;
44
+		*dclk_freq = 525;
45
+		break;
46
+	case 0x6:
47
+		*cpuclk_freq = 1800;
48
+		*dclk_freq = 600;
49
+		break;
50
+	case 0x7:
51
+		*cpuclk_freq = 1800;
52
+		*dclk_freq = 525;
53
+		break;
54
+	case 0x4:
55
+		*cpuclk_freq = 1600;
56
+		*dclk_freq = 400;
57
+		break;
58
+	case 0xB:
59
+		*cpuclk_freq = 1600;
60
+		*dclk_freq = 450;
61
+		break;
62
+	case 0xD:
63
+		*cpuclk_freq = 1600;
64
+		*dclk_freq = 525;
65
+		break;
66
+	case 0x1a:
67
+		*cpuclk_freq = 1400;
68
+		*dclk_freq = 400;
69
+		break;
70
+	case 0x14:
71
+		*cpuclk_freq = 1300;
72
+		*dclk_freq = 400;
73
+		break;
74
+	case 0x17:
75
+		*cpuclk_freq = 1300;
76
+		*dclk_freq = 325;
77
+		break;
78
+	case 0x19:
79
+		*cpuclk_freq = 1200;
80
+		*dclk_freq = 400;
81
+		break;
82
+	case 0x13:
83
+		*cpuclk_freq = 1000;
84
+		*dclk_freq = 325;
85
+		break;
86
+	case 0x1d:
87
+		*cpuclk_freq = 1000;
88
+		*dclk_freq = 400;
89
+		break;
90
+	case 0x1c:
91
+		*cpuclk_freq = 800;
92
+		*dclk_freq = 400;
93
+		break;
94
+	case 0x1b:
95
+		*cpuclk_freq = 600;
96
+		*dclk_freq = 400;
97
+		break;
98
+	default:
99
+		return -EINVAL;
100
+	}
40
101
 
41
-	reg = of_get_property(np, "reg", NULL);
42
-	addr = of_translate_address(np, reg);
43
-	return devm_kasprintf(dev, GFP_KERNEL, "%llx-%s",
44
-			(unsigned long long)addr, name);
102
+	return 0;
103
+}
104
+
105
+static int ap807_get_sar_clocks(unsigned int freq_mode,
106
+				unsigned int *cpuclk_freq,
107
+				unsigned int *dclk_freq)
108
+{
109
+	switch (freq_mode) {
110
+	case 0x0:
111
+		*cpuclk_freq = 2000;
112
+		*dclk_freq = 1200;
113
+		break;
114
+	case 0x6:
115
+		*cpuclk_freq = 2200;
116
+		*dclk_freq = 1200;
117
+		break;
118
+	case 0xD:
119
+		*cpuclk_freq = 1600;
120
+		*dclk_freq = 1200;
121
+		break;
122
+	default:
123
+		return -EINVAL;
124
+	}
125
+
126
+	return 0;
45
127
 }
46
128
 
47
129
 static int ap806_syscon_common_probe(struct platform_device *pdev,
48
130
 				     struct device_node *syscon_node)
49
131
 {
50
-	unsigned int freq_mode, cpuclk_freq;
132
+	unsigned int freq_mode, cpuclk_freq, dclk_freq;
51
133
 	const char *name, *fixedclk_name;
52
134
 	struct device *dev = &pdev->dev;
53
135
 	struct device_node *np = dev->of_node;
..
..
@@ -68,50 +150,29 @@
68
150
 	}
69
151
 
70
152
 	freq_mode = reg & AP806_SAR_CLKFREQ_MODE_MASK;
71
-	switch (freq_mode) {
72
-	case 0x0:
73
-	case 0x1:
74
-		cpuclk_freq = 2000;
75
-		break;
76
-	case 0x6:
77
-	case 0x7:
78
-		cpuclk_freq = 1800;
79
-		break;
80
-	case 0x4:
81
-	case 0xB:
82
-	case 0xD:
83
-		cpuclk_freq = 1600;
84
-		break;
85
-	case 0x1a:
86
-		cpuclk_freq = 1400;
87
-		break;
88
-	case 0x14:
89
-	case 0x17:
90
-		cpuclk_freq = 1300;
91
-		break;
92
-	case 0x19:
93
-		cpuclk_freq = 1200;
94
-		break;
95
-	case 0x13:
96
-	case 0x1d:
97
-		cpuclk_freq = 1000;
98
-		break;
99
-	case 0x1c:
100
-		cpuclk_freq = 800;
101
-		break;
102
-	case 0x1b:
103
-		cpuclk_freq = 600;
104
-		break;
105
-	default:
106
-		dev_err(dev, "invalid SAR value\n");
153
+
154
+	if (of_device_is_compatible(pdev->dev.of_node,
155
+				    "marvell,ap806-clock")) {
156
+		ret = ap806_get_sar_clocks(freq_mode, &cpuclk_freq, &dclk_freq);
157
+	} else if (of_device_is_compatible(pdev->dev.of_node,
158
+					   "marvell,ap807-clock")) {
159
+		ret = ap807_get_sar_clocks(freq_mode, &cpuclk_freq, &dclk_freq);
160
+	} else {
161
+		dev_err(dev, "compatible not supported\n");
107
162
 		return -EINVAL;
163
+	}
164
+
165
+	if (ret) {
166
+		dev_err(dev, "invalid Sample at Reset value\n");
167
+		return ret;
108
168
 	}
109
169
 
110
170
 	/* Convert to hertz */
111
171
 	cpuclk_freq *= 1000 * 1000;
172
+	dclk_freq *= 1000 * 1000;
112
173
 
113
174
 	/* CPU clocks depend on the Sample At Reset configuration */
114
-	name = ap806_unique_name(dev, syscon_node, "cpu-cluster-0");
175
+	name = ap_cp_unique_name(dev, syscon_node, "pll-cluster-0");
115
176
 	ap806_clks[0] = clk_register_fixed_rate(dev, name, NULL,
116
177
 						0, cpuclk_freq);
117
178
 	if (IS_ERR(ap806_clks[0])) {
..
..
@@ -119,7 +180,7 @@
119
180
 		goto fail0;
120
181
 	}
121
182
 
122
-	name = ap806_unique_name(dev, syscon_node, "cpu-cluster-1");
183
+	name = ap_cp_unique_name(dev, syscon_node, "pll-cluster-1");
123
184
 	ap806_clks[1] = clk_register_fixed_rate(dev, name, NULL, 0,
124
185
 						cpuclk_freq);
125
186
 	if (IS_ERR(ap806_clks[1])) {
..
..
@@ -128,7 +189,7 @@
128
189
 	}
129
190
 
130
191
 	/* Fixed clock is always 1200 Mhz */
131
-	fixedclk_name = ap806_unique_name(dev, syscon_node, "fixed");
192
+	fixedclk_name = ap_cp_unique_name(dev, syscon_node, "fixed");
132
193
 	ap806_clks[2] = clk_register_fixed_rate(dev, fixedclk_name, NULL,
133
194
 						0, 1200 * 1000 * 1000);
134
195
 	if (IS_ERR(ap806_clks[2])) {
..
..
@@ -137,7 +198,7 @@
137
198
 	}
138
199
 
139
200
 	/* MSS Clock is fixed clock divided by 6 */
140
-	name = ap806_unique_name(dev, syscon_node, "mss");
201
+	name = ap_cp_unique_name(dev, syscon_node, "mss");
141
202
 	ap806_clks[3] = clk_register_fixed_factor(NULL, name, fixedclk_name,
142
203
 						  0, 1, 6);
143
204
 	if (IS_ERR(ap806_clks[3])) {
..
..
@@ -146,7 +207,7 @@
146
207
 	}
147
208
 
148
209
 	/* SDIO(/eMMC) Clock is fixed clock divided by 3 */
149
-	name = ap806_unique_name(dev, syscon_node, "sdio");
210
+	name = ap_cp_unique_name(dev, syscon_node, "sdio");
150
211
 	ap806_clks[4] = clk_register_fixed_factor(NULL, name,
151
212
 						  fixedclk_name,
152
213
 						  0, 1, 3);
..
..
@@ -155,7 +216,14 @@
155
216
 		goto fail4;
156
217
 	}
157
218
 
158
-	of_clk_add_provider(np, of_clk_src_onecell_get, &ap806_clk_data);
219
+	/* AP-DCLK(HCLK) Clock is DDR clock divided by 2 */
220
+	name = ap_cp_unique_name(dev, syscon_node, "ap-dclk");
221
+	ap806_clks[5] = clk_register_fixed_rate(dev, name, NULL, 0, dclk_freq);
222
+	if (IS_ERR(ap806_clks[5])) {
223
+		ret = PTR_ERR(ap806_clks[5]);
224
+		goto fail5;
225
+	}
226
+
159
227
 	ret = of_clk_add_provider(np, of_clk_src_onecell_get, &ap806_clk_data);
160
228
 	if (ret)
161
229
 		goto fail_clk_add;
..
..
@@ -163,6 +231,8 @@
163
231
 	return 0;
164
232
 
165
233
 fail_clk_add:
234
+	clk_unregister_fixed_factor(ap806_clks[5]);
235
+fail5:
166
236
 	clk_unregister_fixed_factor(ap806_clks[4]);
167
237
 fail4:
168
238
 	clk_unregister_fixed_factor(ap806_clks[3]);
..
..
@@ -209,6 +279,7 @@
209
279
 
210
280
 static const struct of_device_id ap806_clock_of_match[] = {
211
281
 	{ .compatible = "marvell,ap806-clock", },
282
+	{ .compatible = "marvell,ap807-clock", },
212
283
 	{ }
213
284
 };
214
285