Merge tag 'mfd-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

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

1 files changed, 9 insertions, 7 deletions

diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h
index 8a125701ef7b..50bed4f89c1a 100644
--- a/include/linux/mfd/da9063/pdata.h
+++ b/include/linux/mfd/da9063/pdata.h
@@ -21,7 +21,7 @@
 /*
  * Regulator configuration
  */
-/* DA9063 regulator IDs */
+/* DA9063 and DA9063L regulator IDs */
 enum {
         /* BUCKs */
         DA9063_ID_BCORE1,
@@ -37,18 +37,20 @@ enum {
         DA9063_ID_BMEM_BIO_MERGED,
         /* When two BUCKs are merged, they cannot be reused separately */
 
-        /* LDOs */
+        /* LDOs on both DA9063 and DA9063L */
+        DA9063_ID_LDO3,
+        DA9063_ID_LDO7,
+        DA9063_ID_LDO8,
+        DA9063_ID_LDO9,
+        DA9063_ID_LDO11,
+
+        /* DA9063-only LDOs */
         DA9063_ID_LDO1,
         DA9063_ID_LDO2,
-        DA9063_ID_LDO3,
         DA9063_ID_LDO4,
         DA9063_ID_LDO5,
         DA9063_ID_LDO6,
-        DA9063_ID_LDO7,
-        DA9063_ID_LDO8,
-        DA9063_ID_LDO9,
         DA9063_ID_LDO10,
-        DA9063_ID_LDO11,
 };
 
 /* Regulators platform data */