.. | .. |
---|
11 | 11 | * GNU General Public License for more details. |
---|
12 | 12 | */ |
---|
13 | 13 | |
---|
| 14 | +#include <linux/acpi.h> |
---|
14 | 15 | #include <linux/delay.h> |
---|
15 | 16 | #include <linux/device.h> |
---|
16 | 17 | #include <linux/io.h> |
---|
17 | 18 | #include <linux/module.h> |
---|
18 | 19 | #include <linux/nvmem-provider.h> |
---|
19 | 20 | #include <linux/of.h> |
---|
20 | | -#include <linux/of_address.h> |
---|
| 21 | +#include <linux/of_device.h> |
---|
21 | 22 | #include <linux/platform_device.h> |
---|
22 | 23 | |
---|
23 | 24 | /* |
---|
.. | .. |
---|
78 | 79 | }; |
---|
79 | 80 | |
---|
80 | 81 | struct otpc_priv { |
---|
81 | | - struct device *dev; |
---|
82 | | - void __iomem *base; |
---|
83 | | - struct otpc_map *map; |
---|
| 82 | + struct device *dev; |
---|
| 83 | + void __iomem *base; |
---|
| 84 | + const struct otpc_map *map; |
---|
84 | 85 | struct nvmem_config *config; |
---|
85 | 86 | }; |
---|
86 | 87 | |
---|
.. | .. |
---|
237 | 238 | }; |
---|
238 | 239 | |
---|
239 | 240 | static const struct of_device_id bcm_otpc_dt_ids[] = { |
---|
240 | | - { .compatible = "brcm,ocotp" }, |
---|
241 | | - { .compatible = "brcm,ocotp-v2" }, |
---|
| 241 | + { .compatible = "brcm,ocotp", .data = &otp_map }, |
---|
| 242 | + { .compatible = "brcm,ocotp-v2", .data = &otp_map_v2 }, |
---|
242 | 243 | { }, |
---|
243 | 244 | }; |
---|
244 | 245 | MODULE_DEVICE_TABLE(of, bcm_otpc_dt_ids); |
---|
245 | 246 | |
---|
| 247 | +static const struct acpi_device_id bcm_otpc_acpi_ids[] = { |
---|
| 248 | + { .id = "BRCM0700", .driver_data = (kernel_ulong_t)&otp_map }, |
---|
| 249 | + { .id = "BRCM0701", .driver_data = (kernel_ulong_t)&otp_map_v2 }, |
---|
| 250 | + { /* sentinel */ } |
---|
| 251 | +}; |
---|
| 252 | +MODULE_DEVICE_TABLE(acpi, bcm_otpc_acpi_ids); |
---|
| 253 | + |
---|
246 | 254 | static int bcm_otpc_probe(struct platform_device *pdev) |
---|
247 | 255 | { |
---|
248 | 256 | struct device *dev = &pdev->dev; |
---|
249 | | - struct device_node *dn = dev->of_node; |
---|
250 | 257 | struct resource *res; |
---|
251 | 258 | struct otpc_priv *priv; |
---|
252 | 259 | struct nvmem_device *nvmem; |
---|
.. | .. |
---|
257 | 264 | if (!priv) |
---|
258 | 265 | return -ENOMEM; |
---|
259 | 266 | |
---|
260 | | - if (of_device_is_compatible(dev->of_node, "brcm,ocotp")) |
---|
261 | | - priv->map = &otp_map; |
---|
262 | | - else if (of_device_is_compatible(dev->of_node, "brcm,ocotp-v2")) |
---|
263 | | - priv->map = &otp_map_v2; |
---|
264 | | - else { |
---|
265 | | - dev_err(dev, "%s otpc config map not defined\n", __func__); |
---|
266 | | - return -EINVAL; |
---|
267 | | - } |
---|
| 267 | + priv->map = device_get_match_data(dev); |
---|
| 268 | + if (!priv->map) |
---|
| 269 | + return -ENODEV; |
---|
268 | 270 | |
---|
269 | 271 | /* Get OTP base address register. */ |
---|
270 | 272 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
---|
.. | .. |
---|
281 | 283 | reset_start_bit(priv->base); |
---|
282 | 284 | |
---|
283 | 285 | /* Read size of memory in words. */ |
---|
284 | | - err = of_property_read_u32(dn, "brcm,ocotp-size", &num_words); |
---|
| 286 | + err = device_property_read_u32(dev, "brcm,ocotp-size", &num_words); |
---|
285 | 287 | if (err) { |
---|
286 | 288 | dev_err(dev, "size parameter not specified\n"); |
---|
287 | 289 | return -EINVAL; |
---|
.. | .. |
---|
294 | 296 | bcm_otpc_nvmem_config.dev = dev; |
---|
295 | 297 | bcm_otpc_nvmem_config.priv = priv; |
---|
296 | 298 | |
---|
297 | | - if (of_device_is_compatible(dev->of_node, "brcm,ocotp-v2")) { |
---|
| 299 | + if (priv->map == &otp_map_v2) { |
---|
298 | 300 | bcm_otpc_nvmem_config.word_size = 8; |
---|
299 | 301 | bcm_otpc_nvmem_config.stride = 8; |
---|
300 | 302 | } |
---|
.. | .. |
---|
315 | 317 | .driver = { |
---|
316 | 318 | .name = "brcm-otpc", |
---|
317 | 319 | .of_match_table = bcm_otpc_dt_ids, |
---|
| 320 | + .acpi_match_table = ACPI_PTR(bcm_otpc_acpi_ids), |
---|
318 | 321 | }, |
---|
319 | 322 | }; |
---|
320 | 323 | module_platform_driver(bcm_otpc_driver); |
---|