.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0 |
---|
1 | 2 | /* |
---|
2 | 3 | * Copyright (c) 2015, The Linux Foundation. All rights reserved. |
---|
3 | | - * |
---|
4 | | - * This program is free software; you can redistribute it and/or modify |
---|
5 | | - * it under the terms of the GNU General Public License version 2 and |
---|
6 | | - * only version 2 as published by the Free Software Foundation. |
---|
7 | | - * |
---|
8 | | - * This program is distributed in the hope that it will be useful, |
---|
9 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
10 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
11 | | - * GNU General Public License for more details. |
---|
12 | | - * |
---|
13 | 4 | */ |
---|
14 | 5 | |
---|
15 | 6 | #include <linux/platform_device.h> |
---|
.. | .. |
---|
65 | 56 | #define TRDY_MASK BIT(7) |
---|
66 | 57 | #define TIMEOUT_US 100 |
---|
67 | 58 | |
---|
68 | | -static int suspend_8960(struct tsens_device *tmdev) |
---|
| 59 | +static int suspend_8960(struct tsens_priv *priv) |
---|
69 | 60 | { |
---|
70 | 61 | int ret; |
---|
71 | 62 | unsigned int mask; |
---|
72 | | - struct regmap *map = tmdev->map; |
---|
| 63 | + struct regmap *map = priv->tm_map; |
---|
73 | 64 | |
---|
74 | | - ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold); |
---|
| 65 | + ret = regmap_read(map, THRESHOLD_ADDR, &priv->ctx.threshold); |
---|
75 | 66 | if (ret) |
---|
76 | 67 | return ret; |
---|
77 | 68 | |
---|
78 | | - ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control); |
---|
| 69 | + ret = regmap_read(map, CNTL_ADDR, &priv->ctx.control); |
---|
79 | 70 | if (ret) |
---|
80 | 71 | return ret; |
---|
81 | 72 | |
---|
82 | | - if (tmdev->num_sensors > 1) |
---|
| 73 | + if (priv->num_sensors > 1) |
---|
83 | 74 | mask = SLP_CLK_ENA | EN; |
---|
84 | 75 | else |
---|
85 | 76 | mask = SLP_CLK_ENA_8660 | EN; |
---|
.. | .. |
---|
91 | 82 | return 0; |
---|
92 | 83 | } |
---|
93 | 84 | |
---|
94 | | -static int resume_8960(struct tsens_device *tmdev) |
---|
| 85 | +static int resume_8960(struct tsens_priv *priv) |
---|
95 | 86 | { |
---|
96 | 87 | int ret; |
---|
97 | | - struct regmap *map = tmdev->map; |
---|
| 88 | + struct regmap *map = priv->tm_map; |
---|
98 | 89 | |
---|
99 | 90 | ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST); |
---|
100 | 91 | if (ret) |
---|
.. | .. |
---|
104 | 95 | * Separate CONFIG restore is not needed only for 8660 as |
---|
105 | 96 | * config is part of CTRL Addr and its restored as such |
---|
106 | 97 | */ |
---|
107 | | - if (tmdev->num_sensors > 1) { |
---|
| 98 | + if (priv->num_sensors > 1) { |
---|
108 | 99 | ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG); |
---|
109 | 100 | if (ret) |
---|
110 | 101 | return ret; |
---|
111 | 102 | } |
---|
112 | 103 | |
---|
113 | | - ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold); |
---|
| 104 | + ret = regmap_write(map, THRESHOLD_ADDR, priv->ctx.threshold); |
---|
114 | 105 | if (ret) |
---|
115 | 106 | return ret; |
---|
116 | 107 | |
---|
117 | | - ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control); |
---|
| 108 | + ret = regmap_write(map, CNTL_ADDR, priv->ctx.control); |
---|
118 | 109 | if (ret) |
---|
119 | 110 | return ret; |
---|
120 | 111 | |
---|
121 | 112 | return 0; |
---|
122 | 113 | } |
---|
123 | 114 | |
---|
124 | | -static int enable_8960(struct tsens_device *tmdev, int id) |
---|
| 115 | +static int enable_8960(struct tsens_priv *priv, int id) |
---|
125 | 116 | { |
---|
126 | 117 | int ret; |
---|
127 | 118 | u32 reg, mask; |
---|
128 | 119 | |
---|
129 | | - ret = regmap_read(tmdev->map, CNTL_ADDR, ®); |
---|
| 120 | + ret = regmap_read(priv->tm_map, CNTL_ADDR, ®); |
---|
130 | 121 | if (ret) |
---|
131 | 122 | return ret; |
---|
132 | 123 | |
---|
133 | 124 | mask = BIT(id + SENSOR0_SHIFT); |
---|
134 | | - ret = regmap_write(tmdev->map, CNTL_ADDR, reg | SW_RST); |
---|
| 125 | + ret = regmap_write(priv->tm_map, CNTL_ADDR, reg | SW_RST); |
---|
135 | 126 | if (ret) |
---|
136 | 127 | return ret; |
---|
137 | 128 | |
---|
138 | | - if (tmdev->num_sensors > 1) |
---|
| 129 | + if (priv->num_sensors > 1) |
---|
139 | 130 | reg |= mask | SLP_CLK_ENA | EN; |
---|
140 | 131 | else |
---|
141 | 132 | reg |= mask | SLP_CLK_ENA_8660 | EN; |
---|
142 | 133 | |
---|
143 | | - ret = regmap_write(tmdev->map, CNTL_ADDR, reg); |
---|
| 134 | + ret = regmap_write(priv->tm_map, CNTL_ADDR, reg); |
---|
144 | 135 | if (ret) |
---|
145 | 136 | return ret; |
---|
146 | 137 | |
---|
147 | 138 | return 0; |
---|
148 | 139 | } |
---|
149 | 140 | |
---|
150 | | -static void disable_8960(struct tsens_device *tmdev) |
---|
| 141 | +static void disable_8960(struct tsens_priv *priv) |
---|
151 | 142 | { |
---|
152 | 143 | int ret; |
---|
153 | 144 | u32 reg_cntl; |
---|
154 | 145 | u32 mask; |
---|
155 | 146 | |
---|
156 | | - mask = GENMASK(tmdev->num_sensors - 1, 0); |
---|
| 147 | + mask = GENMASK(priv->num_sensors - 1, 0); |
---|
157 | 148 | mask <<= SENSOR0_SHIFT; |
---|
158 | 149 | mask |= EN; |
---|
159 | 150 | |
---|
160 | | - ret = regmap_read(tmdev->map, CNTL_ADDR, ®_cntl); |
---|
| 151 | + ret = regmap_read(priv->tm_map, CNTL_ADDR, ®_cntl); |
---|
161 | 152 | if (ret) |
---|
162 | 153 | return; |
---|
163 | 154 | |
---|
164 | 155 | reg_cntl &= ~mask; |
---|
165 | 156 | |
---|
166 | | - if (tmdev->num_sensors > 1) |
---|
| 157 | + if (priv->num_sensors > 1) |
---|
167 | 158 | reg_cntl &= ~SLP_CLK_ENA; |
---|
168 | 159 | else |
---|
169 | 160 | reg_cntl &= ~SLP_CLK_ENA_8660; |
---|
170 | 161 | |
---|
171 | | - regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); |
---|
| 162 | + regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); |
---|
172 | 163 | } |
---|
173 | 164 | |
---|
174 | | -static int init_8960(struct tsens_device *tmdev) |
---|
| 165 | +static int init_8960(struct tsens_priv *priv) |
---|
175 | 166 | { |
---|
176 | 167 | int ret, i; |
---|
177 | 168 | u32 reg_cntl; |
---|
178 | 169 | |
---|
179 | | - tmdev->map = dev_get_regmap(tmdev->dev, NULL); |
---|
180 | | - if (!tmdev->map) |
---|
| 170 | + priv->tm_map = dev_get_regmap(priv->dev, NULL); |
---|
| 171 | + if (!priv->tm_map) |
---|
181 | 172 | return -ENODEV; |
---|
182 | 173 | |
---|
183 | 174 | /* |
---|
.. | .. |
---|
186 | 177 | * but the control registers stay in the same place, i.e |
---|
187 | 178 | * directly after the first 5 status registers. |
---|
188 | 179 | */ |
---|
189 | | - for (i = 0; i < tmdev->num_sensors; i++) { |
---|
| 180 | + for (i = 0; i < priv->num_sensors; i++) { |
---|
190 | 181 | if (i >= 5) |
---|
191 | | - tmdev->sensor[i].status = S0_STATUS_ADDR + 40; |
---|
192 | | - tmdev->sensor[i].status += i * 4; |
---|
| 182 | + priv->sensor[i].status = S0_STATUS_ADDR + 40; |
---|
| 183 | + priv->sensor[i].status += i * 4; |
---|
193 | 184 | } |
---|
194 | 185 | |
---|
195 | 186 | reg_cntl = SW_RST; |
---|
196 | | - ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl); |
---|
| 187 | + ret = regmap_update_bits(priv->tm_map, CNTL_ADDR, SW_RST, reg_cntl); |
---|
197 | 188 | if (ret) |
---|
198 | 189 | return ret; |
---|
199 | 190 | |
---|
200 | | - if (tmdev->num_sensors > 1) { |
---|
| 191 | + if (priv->num_sensors > 1) { |
---|
201 | 192 | reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18); |
---|
202 | 193 | reg_cntl &= ~SW_RST; |
---|
203 | | - ret = regmap_update_bits(tmdev->map, CONFIG_ADDR, |
---|
| 194 | + ret = regmap_update_bits(priv->tm_map, CONFIG_ADDR, |
---|
204 | 195 | CONFIG_MASK, CONFIG); |
---|
205 | 196 | } else { |
---|
206 | 197 | reg_cntl |= SLP_CLK_ENA_8660 | (MEASURE_PERIOD << 16); |
---|
.. | .. |
---|
208 | 199 | reg_cntl |= CONFIG_8660 << CONFIG_SHIFT_8660; |
---|
209 | 200 | } |
---|
210 | 201 | |
---|
211 | | - reg_cntl |= GENMASK(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT; |
---|
212 | | - ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); |
---|
| 202 | + reg_cntl |= GENMASK(priv->num_sensors - 1, 0) << SENSOR0_SHIFT; |
---|
| 203 | + ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); |
---|
213 | 204 | if (ret) |
---|
214 | 205 | return ret; |
---|
215 | 206 | |
---|
216 | 207 | reg_cntl |= EN; |
---|
217 | | - ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); |
---|
| 208 | + ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl); |
---|
218 | 209 | if (ret) |
---|
219 | 210 | return ret; |
---|
220 | 211 | |
---|
221 | 212 | return 0; |
---|
222 | 213 | } |
---|
223 | 214 | |
---|
224 | | -static int calibrate_8960(struct tsens_device *tmdev) |
---|
| 215 | +static int calibrate_8960(struct tsens_priv *priv) |
---|
225 | 216 | { |
---|
226 | 217 | int i; |
---|
227 | 218 | char *data; |
---|
228 | 219 | |
---|
229 | | - ssize_t num_read = tmdev->num_sensors; |
---|
230 | | - struct tsens_sensor *s = tmdev->sensor; |
---|
| 220 | + ssize_t num_read = priv->num_sensors; |
---|
| 221 | + struct tsens_sensor *s = priv->sensor; |
---|
231 | 222 | |
---|
232 | | - data = qfprom_read(tmdev->dev, "calib"); |
---|
| 223 | + data = qfprom_read(priv->dev, "calib"); |
---|
233 | 224 | if (IS_ERR(data)) |
---|
234 | | - data = qfprom_read(tmdev->dev, "calib_backup"); |
---|
| 225 | + data = qfprom_read(priv->dev, "calib_backup"); |
---|
235 | 226 | if (IS_ERR(data)) |
---|
236 | 227 | return PTR_ERR(data); |
---|
237 | 228 | |
---|
238 | 229 | for (i = 0; i < num_read; i++, s++) |
---|
239 | 230 | s->offset = data[i]; |
---|
| 231 | + |
---|
| 232 | + kfree(data); |
---|
240 | 233 | |
---|
241 | 234 | return 0; |
---|
242 | 235 | } |
---|
.. | .. |
---|
252 | 245 | return adc_code * slope + offset; |
---|
253 | 246 | } |
---|
254 | 247 | |
---|
255 | | -static int get_temp_8960(struct tsens_device *tmdev, int id, int *temp) |
---|
| 248 | +static int get_temp_8960(const struct tsens_sensor *s, int *temp) |
---|
256 | 249 | { |
---|
257 | 250 | int ret; |
---|
258 | 251 | u32 code, trdy; |
---|
259 | | - const struct tsens_sensor *s = &tmdev->sensor[id]; |
---|
| 252 | + struct tsens_priv *priv = s->priv; |
---|
260 | 253 | unsigned long timeout; |
---|
261 | 254 | |
---|
262 | 255 | timeout = jiffies + usecs_to_jiffies(TIMEOUT_US); |
---|
263 | 256 | do { |
---|
264 | | - ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy); |
---|
| 257 | + ret = regmap_read(priv->tm_map, INT_STATUS_ADDR, &trdy); |
---|
265 | 258 | if (ret) |
---|
266 | 259 | return ret; |
---|
267 | 260 | if (!(trdy & TRDY_MASK)) |
---|
268 | 261 | continue; |
---|
269 | | - ret = regmap_read(tmdev->map, s->status, &code); |
---|
| 262 | + ret = regmap_read(priv->tm_map, s->status, &code); |
---|
270 | 263 | if (ret) |
---|
271 | 264 | return ret; |
---|
272 | 265 | *temp = code_to_mdegC(code, s); |
---|
.. | .. |
---|
286 | 279 | .resume = resume_8960, |
---|
287 | 280 | }; |
---|
288 | 281 | |
---|
289 | | -const struct tsens_data data_8960 = { |
---|
| 282 | +struct tsens_plat_data data_8960 = { |
---|
290 | 283 | .num_sensors = 11, |
---|
291 | 284 | .ops = &ops_8960, |
---|
292 | 285 | }; |
---|