change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/nvmem/sc27xx-efuse.c
..
..
@@ -4,12 +4,14 @@
4
4
 #include <linux/hwspinlock.h>
5
5
 #include <linux/module.h>
6
6
 #include <linux/of.h>
7
+#include <linux/of_device.h>
7
8
 #include <linux/platform_device.h>
8
9
 #include <linux/regmap.h>
9
10
 #include <linux/nvmem-provider.h>
10
11
 
11
12
 /* PMIC global registers definition */
12
13
 #define SC27XX_MODULE_EN		0xc08
14
+#define SC2730_MODULE_EN		0x1808
13
15
 #define SC27XX_EFUSE_EN			BIT(6)
14
16
 
15
17
 /* Efuse controller registers definition */
..
..
@@ -49,12 +51,29 @@
49
51
 #define SC27XX_EFUSE_POLL_TIMEOUT	3000000
50
52
 #define SC27XX_EFUSE_POLL_DELAY_US	10000
51
53
 
54
+/*
55
+ * Since different PMICs of SC27xx series can have different
56
+ * address , we should save address in the device data structure.
57
+ */
58
+struct sc27xx_efuse_variant_data {
59
+	u32 module_en;
60
+};
61
+
52
62
 struct sc27xx_efuse {
53
63
 	struct device *dev;
54
64
 	struct regmap *regmap;
55
65
 	struct hwspinlock *hwlock;
56
66
 	struct mutex mutex;
57
67
 	u32 base;
68
+	const struct sc27xx_efuse_variant_data *var_data;
69
+};
70
+
71
+static const struct sc27xx_efuse_variant_data sc2731_edata = {
72
+	.module_en = SC27XX_MODULE_EN,
73
+};
74
+
75
+static const struct sc27xx_efuse_variant_data sc2730_edata = {
76
+	.module_en = SC2730_MODULE_EN,
58
77
 };
59
78
 
60
79
 /*
..
..
@@ -106,10 +125,12 @@
106
125
 static int sc27xx_efuse_read(void *context, u32 offset, void *val, size_t bytes)
107
126
 {
108
127
 	struct sc27xx_efuse *efuse = context;
109
-	u32 buf;
128
+	u32 buf, blk_index = offset / SC27XX_EFUSE_BLOCK_WIDTH;
129
+	u32 blk_offset = (offset % SC27XX_EFUSE_BLOCK_WIDTH) * BITS_PER_BYTE;
110
130
 	int ret;
111
131
 
112
-	if (offset > SC27XX_EFUSE_BLOCK_MAX || bytes > SC27XX_EFUSE_BLOCK_WIDTH)
132
+	if (blk_index > SC27XX_EFUSE_BLOCK_MAX ||
133
+	    bytes > SC27XX_EFUSE_BLOCK_WIDTH)
113
134
 		return -EINVAL;
114
135
 
115
136
 	ret = sc27xx_efuse_lock(efuse);
..
..
@@ -117,7 +138,7 @@
117
138
 		return ret;
118
139
 
119
140
 	/* Enable the efuse controller. */
120
-	ret = regmap_update_bits(efuse->regmap, SC27XX_MODULE_EN,
141
+	ret = regmap_update_bits(efuse->regmap, efuse->var_data->module_en,
121
142
 				 SC27XX_EFUSE_EN, SC27XX_EFUSE_EN);
122
143
 	if (ret)
123
144
 		goto unlock_efuse;
..
..
@@ -133,7 +154,7 @@
133
154
 	/* Set the block address to be read. */
134
155
 	ret = regmap_write(efuse->regmap,
135
156
 			   efuse->base + SC27XX_EFUSE_BLOCK_INDEX,
136
-			   offset & SC27XX_EFUSE_BLOCK_MASK);
157
+			   blk_index & SC27XX_EFUSE_BLOCK_MASK);
137
158
 	if (ret)
138
159
 		goto disable_efuse;
139
160
 
..
..
@@ -167,12 +188,14 @@
167
188
 
168
189
 disable_efuse:
169
190
 	/* Disable the efuse controller after reading. */
170
-	regmap_update_bits(efuse->regmap, SC27XX_MODULE_EN, SC27XX_EFUSE_EN, 0);
191
+	regmap_update_bits(efuse->regmap, efuse->var_data->module_en, SC27XX_EFUSE_EN, 0);
171
192
 unlock_efuse:
172
193
 	sc27xx_efuse_unlock(efuse);
173
194
 
174
-	if (!ret)
195
+	if (!ret) {
196
+		buf >>= blk_offset;
175
197
 		memcpy(val, &buf, bytes);
198
+	}
176
199
 
177
200
 	return ret;
178
201
 }
..
..
@@ -207,7 +230,7 @@
207
230
 		return ret;
208
231
 	}
209
232
 
210
-	efuse->hwlock = hwspin_lock_request_specific(ret);
233
+	efuse->hwlock = devm_hwspin_lock_request_specific(&pdev->dev, ret);
211
234
 	if (!efuse->hwlock) {
212
235
 		dev_err(&pdev->dev, "failed to request hwspinlock\n");
213
236
 		return -ENXIO;
..
..
@@ -215,7 +238,7 @@
215
238
 
216
239
 	mutex_init(&efuse->mutex);
217
240
 	efuse->dev = &pdev->dev;
218
-	platform_set_drvdata(pdev, efuse);
241
+	efuse->var_data = of_device_get_match_data(&pdev->dev);
219
242
 
220
243
 	econfig.stride = 1;
221
244
 	econfig.word_size = 1;
..
..
@@ -228,29 +251,20 @@
228
251
 	nvmem = devm_nvmem_register(&pdev->dev, &econfig);
229
252
 	if (IS_ERR(nvmem)) {
230
253
 		dev_err(&pdev->dev, "failed to register nvmem config\n");
231
-		hwspin_lock_free(efuse->hwlock);
232
254
 		return PTR_ERR(nvmem);
233
255
 	}
234
256
 
235
257
 	return 0;
236
258
 }
237
259
 
238
-static int sc27xx_efuse_remove(struct platform_device *pdev)
239
-{
240
-	struct sc27xx_efuse *efuse = platform_get_drvdata(pdev);
241
-
242
-	hwspin_lock_free(efuse->hwlock);
243
-	return 0;
244
-}
245
-
246
260
 static const struct of_device_id sc27xx_efuse_of_match[] = {
247
-	{ .compatible = "sprd,sc2731-efuse" },
261
+	{ .compatible = "sprd,sc2731-efuse", .data = &sc2731_edata},
262
+	{ .compatible = "sprd,sc2730-efuse", .data = &sc2730_edata},
248
263
 	{ }
249
264
 };
250
265
 
251
266
 static struct platform_driver sc27xx_efuse_driver = {
252
267
 	.probe = sc27xx_efuse_probe,
253
-	.remove = sc27xx_efuse_remove,
254
268
 	.driver = {
255
269
 		.name = "sc27xx-efuse",
256
270
 		.of_match_table = sc27xx_efuse_of_match,