Lee writes: "MFD fixes for v4.19 - Fix Dialog DA9063 regulator constraints issue causing failure in probe - Fix OMAP Device Tree compatible strings to match DT" * tag 'mfd-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: mfd: omap-usb-host: Fix dts probe of children mfd: da9063: Fix DT probing with constraints
Showing the changes to include (1 of 2 files). Show all
Unified · Split
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | /* |
| 22 | 22 | * Regulator configuration |
| 23 | 23 | */ |
| 24 | −/* DA9063 regulator IDs */ | |
| 24 | +/* DA9063 and DA9063L regulator IDs */ | |
| 25 | 25 | enum { |
| 26 | 26 | /* BUCKs */ |
| 27 | 27 | DA9063_ID_BCORE1, |
| @@ -37,18 +37,20 @@ enum { · 9 unmodified lines | ||
| 37 | 37 | DA9063_ID_BMEM_BIO_MERGED, |
| 38 | 38 | /* When two BUCKs are merged, they cannot be reused separately */ |
| 39 | 39 | |
| 40 | − /* LDOs */ | |
| 40 | + /* LDOs on both DA9063 and DA9063L */ | |
| 41 | + DA9063_ID_LDO3, | |
| 42 | + DA9063_ID_LDO7, | |
| 43 | + DA9063_ID_LDO8, | |
| 44 | + DA9063_ID_LDO9, | |
| 45 | + DA9063_ID_LDO11, | |
| 46 | + | |
| 47 | + /* DA9063-only LDOs */ | |
| 41 | 48 | DA9063_ID_LDO1, |
| 42 | 49 | DA9063_ID_LDO2, |
| 43 | − DA9063_ID_LDO3, | |
| 44 | 50 | DA9063_ID_LDO4, |
| 45 | 51 | DA9063_ID_LDO5, |
| 46 | 52 | DA9063_ID_LDO6, |
| 47 | − DA9063_ID_LDO7, | |
| 48 | − DA9063_ID_LDO8, | |
| 49 | − DA9063_ID_LDO9, | |
| 50 | 53 | DA9063_ID_LDO10, |
| 51 | − DA9063_ID_LDO11, | |
| 52 | 54 | }; |
| 53 | 55 | |
| 54 | 56 | /* Regulators platform data */ |