.. | .. |
---|
1 | | -// SPDX-License-Identifier: GPL-2.0 |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
2 | 2 | /* |
---|
3 | 3 | * Core MFD support for Cirrus Logic Madera codecs |
---|
4 | 4 | * |
---|
5 | 5 | * Copyright (C) 2015-2018 Cirrus Logic |
---|
6 | | - * |
---|
7 | | - * This program is free software; you can redistribute it and/or modify |
---|
8 | | - * it under the terms of the GNU General Public License as published by the |
---|
9 | | - * Free Software Foundation; version 2. |
---|
10 | 6 | */ |
---|
11 | 7 | |
---|
12 | 8 | #include <linux/device.h> |
---|
.. | .. |
---|
15 | 11 | #include <linux/gpio.h> |
---|
16 | 12 | #include <linux/mfd/core.h> |
---|
17 | 13 | #include <linux/module.h> |
---|
| 14 | +#include <linux/mutex.h> |
---|
18 | 15 | #include <linux/notifier.h> |
---|
19 | 16 | #include <linux/of.h> |
---|
20 | 17 | #include <linux/of_gpio.h> |
---|
.. | .. |
---|
30 | 27 | |
---|
31 | 28 | #include "madera.h" |
---|
32 | 29 | |
---|
| 30 | +#define CS47L15_SILICON_ID 0x6370 |
---|
33 | 31 | #define CS47L35_SILICON_ID 0x6360 |
---|
34 | 32 | #define CS47L85_SILICON_ID 0x6338 |
---|
35 | 33 | #define CS47L90_SILICON_ID 0x6364 |
---|
| 34 | +#define CS47L92_SILICON_ID 0x6371 |
---|
36 | 35 | |
---|
37 | 36 | #define MADERA_32KZ_MCLK2 1 |
---|
| 37 | + |
---|
| 38 | +#define MADERA_RESET_MIN_US 2000 |
---|
| 39 | +#define MADERA_RESET_MAX_US 3000 |
---|
38 | 40 | |
---|
39 | 41 | static const char * const madera_core_supplies[] = { |
---|
40 | 42 | "AVDD", |
---|
.. | .. |
---|
42 | 44 | }; |
---|
43 | 45 | |
---|
44 | 46 | static const struct mfd_cell madera_ldo1_devs[] = { |
---|
45 | | - { .name = "madera-ldo1" }, |
---|
| 47 | + { |
---|
| 48 | + .name = "madera-ldo1", |
---|
| 49 | + .level = MFD_DEP_LEVEL_HIGH, |
---|
| 50 | + }, |
---|
| 51 | +}; |
---|
| 52 | + |
---|
| 53 | +static const char * const cs47l15_supplies[] = { |
---|
| 54 | + "MICVDD", |
---|
| 55 | + "CPVDD1", |
---|
| 56 | + "SPKVDD", |
---|
| 57 | +}; |
---|
| 58 | + |
---|
| 59 | +static const struct mfd_cell cs47l15_devs[] = { |
---|
| 60 | + { .name = "madera-pinctrl", }, |
---|
| 61 | + { .name = "madera-irq", }, |
---|
| 62 | + { .name = "madera-gpio", }, |
---|
| 63 | + { |
---|
| 64 | + .name = "madera-extcon", |
---|
| 65 | + .parent_supplies = cs47l15_supplies, |
---|
| 66 | + .num_parent_supplies = 1, /* We only need MICVDD */ |
---|
| 67 | + }, |
---|
| 68 | + { |
---|
| 69 | + .name = "cs47l15-codec", |
---|
| 70 | + .parent_supplies = cs47l15_supplies, |
---|
| 71 | + .num_parent_supplies = ARRAY_SIZE(cs47l15_supplies), |
---|
| 72 | + }, |
---|
46 | 73 | }; |
---|
47 | 74 | |
---|
48 | 75 | static const char * const cs47l35_supplies[] = { |
---|
.. | .. |
---|
58 | 85 | { .name = "madera-irq", }, |
---|
59 | 86 | { .name = "madera-micsupp", }, |
---|
60 | 87 | { .name = "madera-gpio", }, |
---|
61 | | - { .name = "madera-extcon", }, |
---|
| 88 | + { |
---|
| 89 | + .name = "madera-extcon", |
---|
| 90 | + .parent_supplies = cs47l35_supplies, |
---|
| 91 | + .num_parent_supplies = 1, /* We only need MICVDD */ |
---|
| 92 | + }, |
---|
62 | 93 | { |
---|
63 | 94 | .name = "cs47l35-codec", |
---|
64 | 95 | .parent_supplies = cs47l35_supplies, |
---|
.. | .. |
---|
80 | 111 | static const struct mfd_cell cs47l85_devs[] = { |
---|
81 | 112 | { .name = "madera-pinctrl", }, |
---|
82 | 113 | { .name = "madera-irq", }, |
---|
83 | | - { .name = "madera-micsupp" }, |
---|
| 114 | + { .name = "madera-micsupp", }, |
---|
84 | 115 | { .name = "madera-gpio", }, |
---|
85 | | - { .name = "madera-extcon", }, |
---|
| 116 | + { |
---|
| 117 | + .name = "madera-extcon", |
---|
| 118 | + .parent_supplies = cs47l85_supplies, |
---|
| 119 | + .num_parent_supplies = 1, /* We only need MICVDD */ |
---|
| 120 | + }, |
---|
86 | 121 | { |
---|
87 | 122 | .name = "cs47l85-codec", |
---|
88 | 123 | .parent_supplies = cs47l85_supplies, |
---|
.. | .. |
---|
104 | 139 | { .name = "madera-irq", }, |
---|
105 | 140 | { .name = "madera-micsupp", }, |
---|
106 | 141 | { .name = "madera-gpio", }, |
---|
107 | | - { .name = "madera-extcon", }, |
---|
| 142 | + { |
---|
| 143 | + .name = "madera-extcon", |
---|
| 144 | + .parent_supplies = cs47l90_supplies, |
---|
| 145 | + .num_parent_supplies = 1, /* We only need MICVDD */ |
---|
| 146 | + }, |
---|
108 | 147 | { |
---|
109 | 148 | .name = "cs47l90-codec", |
---|
110 | 149 | .parent_supplies = cs47l90_supplies, |
---|
.. | .. |
---|
112 | 151 | }, |
---|
113 | 152 | }; |
---|
114 | 153 | |
---|
| 154 | +static const char * const cs47l92_supplies[] = { |
---|
| 155 | + "MICVDD", |
---|
| 156 | + "CPVDD1", |
---|
| 157 | + "CPVDD2", |
---|
| 158 | +}; |
---|
| 159 | + |
---|
| 160 | +static const struct mfd_cell cs47l92_devs[] = { |
---|
| 161 | + { .name = "madera-pinctrl", }, |
---|
| 162 | + { .name = "madera-irq", }, |
---|
| 163 | + { .name = "madera-micsupp", }, |
---|
| 164 | + { .name = "madera-gpio", }, |
---|
| 165 | + { |
---|
| 166 | + .name = "madera-extcon", |
---|
| 167 | + .parent_supplies = cs47l92_supplies, |
---|
| 168 | + .num_parent_supplies = 1, /* We only need MICVDD */ |
---|
| 169 | + }, |
---|
| 170 | + { |
---|
| 171 | + .name = "cs47l92-codec", |
---|
| 172 | + .parent_supplies = cs47l92_supplies, |
---|
| 173 | + .num_parent_supplies = ARRAY_SIZE(cs47l92_supplies), |
---|
| 174 | + }, |
---|
| 175 | +}; |
---|
| 176 | + |
---|
115 | 177 | /* Used by madera-i2c and madera-spi drivers */ |
---|
116 | 178 | const char *madera_name_from_type(enum madera_type type) |
---|
117 | 179 | { |
---|
118 | 180 | switch (type) { |
---|
| 181 | + case CS47L15: |
---|
| 182 | + return "CS47L15"; |
---|
119 | 183 | case CS47L35: |
---|
120 | 184 | return "CS47L35"; |
---|
121 | 185 | case CS47L85: |
---|
.. | .. |
---|
124 | 188 | return "CS47L90"; |
---|
125 | 189 | case CS47L91: |
---|
126 | 190 | return "CS47L91"; |
---|
| 191 | + case CS42L92: |
---|
| 192 | + return "CS42L92"; |
---|
| 193 | + case CS47L92: |
---|
| 194 | + return "CS47L92"; |
---|
| 195 | + case CS47L93: |
---|
| 196 | + return "CS47L93"; |
---|
127 | 197 | case WM1840: |
---|
128 | 198 | return "WM1840"; |
---|
129 | 199 | default: |
---|
.. | .. |
---|
132 | 202 | } |
---|
133 | 203 | EXPORT_SYMBOL_GPL(madera_name_from_type); |
---|
134 | 204 | |
---|
135 | | -#define MADERA_BOOT_POLL_MAX_INTERVAL_US 5000 |
---|
136 | | -#define MADERA_BOOT_POLL_TIMEOUT_US 25000 |
---|
| 205 | +#define MADERA_BOOT_POLL_INTERVAL_USEC 5000 |
---|
| 206 | +#define MADERA_BOOT_POLL_TIMEOUT_USEC 25000 |
---|
137 | 207 | |
---|
138 | | -static int madera_wait_for_boot(struct madera *madera) |
---|
| 208 | +static int madera_wait_for_boot_noack(struct madera *madera) |
---|
139 | 209 | { |
---|
140 | | - unsigned int val; |
---|
141 | | - int ret; |
---|
| 210 | + ktime_t timeout; |
---|
| 211 | + unsigned int val = 0; |
---|
| 212 | + int ret = 0; |
---|
142 | 213 | |
---|
143 | 214 | /* |
---|
144 | 215 | * We can't use an interrupt as we need to runtime resume to do so, |
---|
145 | 216 | * so we poll the status bit. This won't race with the interrupt |
---|
146 | 217 | * handler because it will be blocked on runtime resume. |
---|
| 218 | + * The chip could NAK a read request while it is booting so ignore |
---|
| 219 | + * errors from regmap_read. |
---|
147 | 220 | */ |
---|
148 | | - ret = regmap_read_poll_timeout(madera->regmap, |
---|
149 | | - MADERA_IRQ1_RAW_STATUS_1, |
---|
150 | | - val, |
---|
151 | | - (val & MADERA_BOOT_DONE_STS1), |
---|
152 | | - MADERA_BOOT_POLL_MAX_INTERVAL_US, |
---|
153 | | - MADERA_BOOT_POLL_TIMEOUT_US); |
---|
| 221 | + timeout = ktime_add_us(ktime_get(), MADERA_BOOT_POLL_TIMEOUT_USEC); |
---|
| 222 | + regmap_read(madera->regmap, MADERA_IRQ1_RAW_STATUS_1, &val); |
---|
| 223 | + while (!(val & MADERA_BOOT_DONE_STS1) && |
---|
| 224 | + !ktime_after(ktime_get(), timeout)) { |
---|
| 225 | + usleep_range(MADERA_BOOT_POLL_INTERVAL_USEC / 2, |
---|
| 226 | + MADERA_BOOT_POLL_INTERVAL_USEC); |
---|
| 227 | + regmap_read(madera->regmap, MADERA_IRQ1_RAW_STATUS_1, &val); |
---|
| 228 | + } |
---|
154 | 229 | |
---|
155 | | - if (ret) |
---|
156 | | - dev_err(madera->dev, "Polling BOOT_DONE_STS failed: %d\n", ret); |
---|
| 230 | + if (!(val & MADERA_BOOT_DONE_STS1)) { |
---|
| 231 | + dev_err(madera->dev, "Polling BOOT_DONE_STS timed out\n"); |
---|
| 232 | + ret = -ETIMEDOUT; |
---|
| 233 | + } |
---|
| 234 | + |
---|
| 235 | + return ret; |
---|
| 236 | +} |
---|
| 237 | + |
---|
| 238 | +static int madera_wait_for_boot(struct madera *madera) |
---|
| 239 | +{ |
---|
| 240 | + int ret = madera_wait_for_boot_noack(madera); |
---|
157 | 241 | |
---|
158 | 242 | /* |
---|
159 | 243 | * BOOT_DONE defaults to unmasked on boot so we must ack it. |
---|
160 | | - * Do this unconditionally to avoid interrupt storms. |
---|
| 244 | + * Do this even after a timeout to avoid interrupt storms. |
---|
161 | 245 | */ |
---|
162 | 246 | regmap_write(madera->regmap, MADERA_IRQ1_STATUS_1, |
---|
163 | 247 | MADERA_BOOT_DONE_EINT1); |
---|
.. | .. |
---|
178 | 262 | } |
---|
179 | 263 | |
---|
180 | 264 | /* Allow time for internal clocks to startup after reset */ |
---|
181 | | - usleep_range(1000, 2000); |
---|
| 265 | + usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US); |
---|
182 | 266 | |
---|
183 | 267 | return 0; |
---|
184 | 268 | } |
---|
185 | 269 | |
---|
186 | 270 | static void madera_enable_hard_reset(struct madera *madera) |
---|
187 | 271 | { |
---|
188 | | - if (!madera->pdata.reset) |
---|
189 | | - return; |
---|
190 | | - |
---|
191 | 272 | /* |
---|
192 | 273 | * There are many existing out-of-tree users of these codecs that we |
---|
193 | 274 | * can't break so preserve the expected behaviour of setting the line |
---|
.. | .. |
---|
198 | 279 | |
---|
199 | 280 | static void madera_disable_hard_reset(struct madera *madera) |
---|
200 | 281 | { |
---|
201 | | - if (!madera->pdata.reset) |
---|
202 | | - return; |
---|
203 | | - |
---|
204 | 282 | gpiod_set_raw_value_cansleep(madera->pdata.reset, 1); |
---|
205 | | - usleep_range(1000, 2000); |
---|
| 283 | + |
---|
| 284 | + usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US); |
---|
206 | 285 | } |
---|
207 | 286 | |
---|
208 | 287 | static int __maybe_unused madera_runtime_resume(struct device *dev) |
---|
.. | .. |
---|
220 | 299 | |
---|
221 | 300 | regcache_cache_only(madera->regmap, false); |
---|
222 | 301 | regcache_cache_only(madera->regmap_32bit, false); |
---|
| 302 | + |
---|
| 303 | + usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US); |
---|
223 | 304 | |
---|
224 | 305 | ret = madera_wait_for_boot(madera); |
---|
225 | 306 | if (ret) |
---|
.. | .. |
---|
271 | 352 | EXPORT_SYMBOL_GPL(madera_pm_ops); |
---|
272 | 353 | |
---|
273 | 354 | const struct of_device_id madera_of_match[] = { |
---|
| 355 | + { .compatible = "cirrus,cs47l15", .data = (void *)CS47L15 }, |
---|
274 | 356 | { .compatible = "cirrus,cs47l35", .data = (void *)CS47L35 }, |
---|
275 | 357 | { .compatible = "cirrus,cs47l85", .data = (void *)CS47L85 }, |
---|
276 | 358 | { .compatible = "cirrus,cs47l90", .data = (void *)CS47L90 }, |
---|
277 | 359 | { .compatible = "cirrus,cs47l91", .data = (void *)CS47L91 }, |
---|
| 360 | + { .compatible = "cirrus,cs42l92", .data = (void *)CS42L92 }, |
---|
| 361 | + { .compatible = "cirrus,cs47l92", .data = (void *)CS47L92 }, |
---|
| 362 | + { .compatible = "cirrus,cs47l93", .data = (void *)CS47L93 }, |
---|
278 | 363 | { .compatible = "cirrus,wm1840", .data = (void *)WM1840 }, |
---|
279 | 364 | {} |
---|
280 | 365 | }; |
---|
.. | .. |
---|
284 | 369 | static int madera_get_reset_gpio(struct madera *madera) |
---|
285 | 370 | { |
---|
286 | 371 | struct gpio_desc *reset; |
---|
287 | | - int ret; |
---|
288 | 372 | |
---|
289 | 373 | if (madera->pdata.reset) |
---|
290 | 374 | return 0; |
---|
291 | 375 | |
---|
292 | 376 | reset = devm_gpiod_get_optional(madera->dev, "reset", GPIOD_OUT_LOW); |
---|
293 | | - if (IS_ERR(reset)) { |
---|
294 | | - ret = PTR_ERR(reset); |
---|
295 | | - if (ret != -EPROBE_DEFER) |
---|
296 | | - dev_err(madera->dev, "Failed to request /RESET: %d\n", |
---|
297 | | - ret); |
---|
298 | | - return ret; |
---|
299 | | - } |
---|
| 377 | + if (IS_ERR(reset)) |
---|
| 378 | + return dev_err_probe(madera->dev, PTR_ERR(reset), |
---|
| 379 | + "Failed to request /RESET"); |
---|
300 | 380 | |
---|
301 | 381 | /* |
---|
302 | 382 | * A hard reset is needed for full reset of the chip. We allow running |
---|
.. | .. |
---|
319 | 399 | * childbiases for each micbias. Unspecified values default to 0. |
---|
320 | 400 | */ |
---|
321 | 401 | switch (madera->type) { |
---|
| 402 | + case CS47L15: |
---|
| 403 | + madera->num_micbias = 1; |
---|
| 404 | + madera->num_childbias[0] = 3; |
---|
| 405 | + return; |
---|
322 | 406 | case CS47L35: |
---|
323 | 407 | madera->num_micbias = 2; |
---|
324 | 408 | madera->num_childbias[0] = 2; |
---|
.. | .. |
---|
334 | 418 | madera->num_micbias = 2; |
---|
335 | 419 | madera->num_childbias[0] = 4; |
---|
336 | 420 | madera->num_childbias[1] = 4; |
---|
| 421 | + return; |
---|
| 422 | + case CS42L92: |
---|
| 423 | + case CS47L92: |
---|
| 424 | + case CS47L93: |
---|
| 425 | + madera->num_micbias = 2; |
---|
| 426 | + madera->num_childbias[0] = 4; |
---|
| 427 | + madera->num_childbias[1] = 2; |
---|
337 | 428 | return; |
---|
338 | 429 | default: |
---|
339 | 430 | return; |
---|
.. | .. |
---|
351 | 442 | |
---|
352 | 443 | dev_set_drvdata(madera->dev, madera); |
---|
353 | 444 | BLOCKING_INIT_NOTIFIER_HEAD(&madera->notifier); |
---|
| 445 | + mutex_init(&madera->dapm_ptr_lock); |
---|
| 446 | + |
---|
354 | 447 | madera_set_micbias_info(madera); |
---|
355 | 448 | |
---|
356 | 449 | /* |
---|
.. | .. |
---|
361 | 454 | memcpy(&madera->pdata, dev_get_platdata(madera->dev), |
---|
362 | 455 | sizeof(madera->pdata)); |
---|
363 | 456 | } |
---|
| 457 | + |
---|
| 458 | + madera->mclk[MADERA_MCLK1].id = "mclk1"; |
---|
| 459 | + madera->mclk[MADERA_MCLK2].id = "mclk2"; |
---|
| 460 | + madera->mclk[MADERA_MCLK3].id = "mclk3"; |
---|
| 461 | + |
---|
| 462 | + ret = devm_clk_bulk_get_optional(madera->dev, ARRAY_SIZE(madera->mclk), |
---|
| 463 | + madera->mclk); |
---|
| 464 | + if (ret) { |
---|
| 465 | + dev_err(madera->dev, "Failed to get clocks: %d\n", ret); |
---|
| 466 | + return ret; |
---|
| 467 | + } |
---|
| 468 | + |
---|
| 469 | + /* Not using devm_clk_get to prevent breakage of existing DTs */ |
---|
| 470 | + if (!madera->mclk[MADERA_MCLK2].clk) |
---|
| 471 | + dev_warn(madera->dev, "Missing MCLK2, requires 32kHz clock\n"); |
---|
364 | 472 | |
---|
365 | 473 | ret = madera_get_reset_gpio(madera); |
---|
366 | 474 | if (ret) |
---|
.. | .. |
---|
380 | 488 | * No devm_ because we need to control shutdown order of children. |
---|
381 | 489 | */ |
---|
382 | 490 | switch (madera->type) { |
---|
| 491 | + case CS47L15: |
---|
383 | 492 | case CS47L35: |
---|
384 | 493 | case CS47L90: |
---|
385 | 494 | case CS47L91: |
---|
| 495 | + case CS42L92: |
---|
| 496 | + case CS47L92: |
---|
| 497 | + case CS47L93: |
---|
386 | 498 | break; |
---|
387 | 499 | case CS47L85: |
---|
388 | 500 | case WM1840: |
---|
.. | .. |
---|
438 | 550 | regcache_cache_only(madera->regmap, false); |
---|
439 | 551 | regcache_cache_only(madera->regmap_32bit, false); |
---|
440 | 552 | |
---|
| 553 | + ret = madera_wait_for_boot_noack(madera); |
---|
| 554 | + if (ret) { |
---|
| 555 | + dev_err(madera->dev, "Device failed initial boot: %d\n", ret); |
---|
| 556 | + goto err_reset; |
---|
| 557 | + } |
---|
| 558 | + |
---|
441 | 559 | /* |
---|
442 | 560 | * Now we can power up and verify that this is a chip we know about |
---|
443 | 561 | * before we start doing any writes to its registers. |
---|
.. | .. |
---|
449 | 567 | } |
---|
450 | 568 | |
---|
451 | 569 | switch (hwid) { |
---|
| 570 | + case CS47L15_SILICON_ID: |
---|
| 571 | + if (IS_ENABLED(CONFIG_MFD_CS47L15)) { |
---|
| 572 | + switch (madera->type) { |
---|
| 573 | + case CS47L15: |
---|
| 574 | + patch_fn = &cs47l15_patch; |
---|
| 575 | + mfd_devs = cs47l15_devs; |
---|
| 576 | + n_devs = ARRAY_SIZE(cs47l15_devs); |
---|
| 577 | + break; |
---|
| 578 | + default: |
---|
| 579 | + break; |
---|
| 580 | + } |
---|
| 581 | + } |
---|
| 582 | + break; |
---|
452 | 583 | case CS47L35_SILICON_ID: |
---|
453 | 584 | if (IS_ENABLED(CONFIG_MFD_CS47L35)) { |
---|
454 | 585 | switch (madera->type) { |
---|
.. | .. |
---|
490 | 621 | } |
---|
491 | 622 | } |
---|
492 | 623 | break; |
---|
| 624 | + case CS47L92_SILICON_ID: |
---|
| 625 | + if (IS_ENABLED(CONFIG_MFD_CS47L92)) { |
---|
| 626 | + switch (madera->type) { |
---|
| 627 | + case CS42L92: |
---|
| 628 | + case CS47L92: |
---|
| 629 | + case CS47L93: |
---|
| 630 | + patch_fn = cs47l92_patch; |
---|
| 631 | + mfd_devs = cs47l92_devs; |
---|
| 632 | + n_devs = ARRAY_SIZE(cs47l92_devs); |
---|
| 633 | + break; |
---|
| 634 | + default: |
---|
| 635 | + break; |
---|
| 636 | + } |
---|
| 637 | + } |
---|
| 638 | + break; |
---|
493 | 639 | default: |
---|
494 | 640 | dev_err(madera->dev, "Unknown device ID: %x\n", hwid); |
---|
495 | 641 | ret = -EINVAL; |
---|
.. | .. |
---|
515 | 661 | |
---|
516 | 662 | ret = madera_wait_for_boot(madera); |
---|
517 | 663 | if (ret) { |
---|
518 | | - dev_err(madera->dev, "Device failed initial boot: %d\n", ret); |
---|
| 664 | + dev_err(madera->dev, "Failed to clear boot done: %d\n", ret); |
---|
519 | 665 | goto err_reset; |
---|
520 | 666 | } |
---|
521 | 667 | |
---|
.. | .. |
---|
540 | 686 | } |
---|
541 | 687 | |
---|
542 | 688 | /* Init 32k clock sourced from MCLK2 */ |
---|
| 689 | + ret = clk_prepare_enable(madera->mclk[MADERA_MCLK2].clk); |
---|
| 690 | + if (ret) { |
---|
| 691 | + dev_err(madera->dev, "Failed to enable 32k clock: %d\n", ret); |
---|
| 692 | + goto err_reset; |
---|
| 693 | + } |
---|
| 694 | + |
---|
543 | 695 | ret = regmap_update_bits(madera->regmap, |
---|
544 | 696 | MADERA_CLOCK_32K_1, |
---|
545 | 697 | MADERA_CLK_32K_ENA_MASK | MADERA_CLK_32K_SRC_MASK, |
---|
546 | 698 | MADERA_CLK_32K_ENA | MADERA_32KZ_MCLK2); |
---|
547 | 699 | if (ret) { |
---|
548 | 700 | dev_err(madera->dev, "Failed to init 32k clock: %d\n", ret); |
---|
549 | | - goto err_reset; |
---|
| 701 | + goto err_clock; |
---|
550 | 702 | } |
---|
551 | 703 | |
---|
552 | 704 | pm_runtime_set_active(madera->dev); |
---|
.. | .. |
---|
567 | 719 | |
---|
568 | 720 | err_pm_runtime: |
---|
569 | 721 | pm_runtime_disable(madera->dev); |
---|
| 722 | +err_clock: |
---|
| 723 | + clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk); |
---|
570 | 724 | err_reset: |
---|
571 | 725 | madera_enable_hard_reset(madera); |
---|
572 | 726 | regulator_disable(madera->dcvdd); |
---|
.. | .. |
---|
587 | 741 | /* Prevent any IRQs being serviced while we clean up */ |
---|
588 | 742 | disable_irq(madera->irq); |
---|
589 | 743 | |
---|
590 | | - /* |
---|
591 | | - * DCVDD could be supplied by a child node, we must disable it before |
---|
592 | | - * removing the children, and prevent PM runtime from turning it back on |
---|
593 | | - */ |
---|
| 744 | + pm_runtime_get_sync(madera->dev); |
---|
| 745 | + |
---|
| 746 | + mfd_remove_devices(madera->dev); |
---|
| 747 | + |
---|
594 | 748 | pm_runtime_disable(madera->dev); |
---|
595 | 749 | |
---|
596 | 750 | regulator_disable(madera->dcvdd); |
---|
597 | 751 | regulator_put(madera->dcvdd); |
---|
598 | 752 | |
---|
599 | | - mfd_remove_devices(madera->dev); |
---|
| 753 | + mfd_remove_devices_late(madera->dev); |
---|
| 754 | + |
---|
| 755 | + pm_runtime_set_suspended(madera->dev); |
---|
| 756 | + pm_runtime_put_noidle(madera->dev); |
---|
| 757 | + |
---|
| 758 | + clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk); |
---|
| 759 | + |
---|
600 | 760 | madera_enable_hard_reset(madera); |
---|
601 | 761 | |
---|
602 | 762 | regulator_bulk_disable(madera->num_core_supplies, |
---|