Merge tag 'ib-mfd-watchdog-v5.13' into ibs-for-mfd-merged

[linux-2.6-microblaze.git] / include / linux / mfd / rohm-generic.h

diff --git a/include/linux/mfd/rohm-generic.h b/include/linux/mfd/rohm-generic.h
index ac67874..35b392a 100644 (file)
--- a/include/linux/mfd/rohm-generic.h
+++ b/include/linux/mfd/rohm-generic.h
@@ -8,14 +8,15 @@
 #include <linux/regulator/driver.h>
 
 enum rohm_chip_type {
-       ROHM_CHIP_TYPE_BD71837 = 0,
-       ROHM_CHIP_TYPE_BD71847,
-       ROHM_CHIP_TYPE_BD70528,
-       ROHM_CHIP_TYPE_BD71828,
        ROHM_CHIP_TYPE_BD9571,
+       ROHM_CHIP_TYPE_BD9573,
        ROHM_CHIP_TYPE_BD9574,
        ROHM_CHIP_TYPE_BD9576,
-       ROHM_CHIP_TYPE_BD9573,
+       ROHM_CHIP_TYPE_BD70528,
+       ROHM_CHIP_TYPE_BD71815,
+       ROHM_CHIP_TYPE_BD71828,
+       ROHM_CHIP_TYPE_BD71837,
+       ROHM_CHIP_TYPE_BD71847,
        ROHM_CHIP_TYPE_AMOUNT
 };
 
@@ -28,7 +29,8 @@ struct rohm_regmap_dev {
 #define ROHM_DVS_LEVEL_IDLE            BIT(1)
 #define ROHM_DVS_LEVEL_SUSPEND         BIT(2)
 #define ROHM_DVS_LEVEL_LPSR            BIT(3)
-#define ROHM_DVS_LEVEL_VALID_AMOUNT    4
+#define ROHM_DVS_LEVEL_SNVS            BIT(4)
+#define ROHM_DVS_LEVEL_VALID_AMOUNT    5
 #define ROHM_DVS_LEVEL_UNKNOWN         0
 
 /**
@@ -67,6 +69,9 @@ struct rohm_dvs_config {
        unsigned int lpsr_reg;
        unsigned int lpsr_mask;
        unsigned int lpsr_on_mask;
+       unsigned int snvs_reg;
+       unsigned int snvs_mask;
+       unsigned int snvs_on_mask;
 };
 
 #if IS_ENABLED(CONFIG_REGULATOR_ROHM)