regulator: twl-regulator: make TWL4030_ALLOW_UNSUPPORTED more configurable.

The regulators in the twl4030 can provide some voltage settings
that are not offically supported.
These settings are disabled by default, but can be enabled with
  CONFIG_TWL4030_ALLOW_UNSUPPORTED=y
However
 - that config variable is not mentioned in any Kconfig so cannot
   be used, and
 - a global setting is clumsy - a per regulator setting would be
   better.

So define a new 'feature' flag that a board file can set to enable
these unsupported volatages for boards which need them.

This flag cannot (yet) be set using device-tree.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index fffacb4837adbd9258fd4e175929179a2b328973..c7390711d9547e2762e818ae13cbdb8784fc29f4 100644 (file)
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -395,14 +395,12 @@ static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
  * VAUX3 at 3V is incorrectly listed in some TI manuals as unsupported.
  * TI are revising the twl5030/tps659x0 specs to support that 3.0V setting.
  */
-#ifdef CONFIG_TWL4030_ALLOW_UNSUPPORTED
-#define UNSUP_MASK     0x0000
-#else
 #define UNSUP_MASK     0x8000
-#endif
 
 #define UNSUP(x)       (UNSUP_MASK | (x))
-#define IS_UNSUP(x)    (UNSUP_MASK & (x))
+#define IS_UNSUP(info, x)                      \
+       ((UNSUP_MASK & (x)) &&                  \
+        !((info)->features & TWL4030_ALLOW_UNSUPPORTED))
 #define LDO_MV(x)      (~UNSUP_MASK & (x))
 
 
@@ -476,7 +474,7 @@ static int twl4030ldo_list_voltage(struct regulator_dev *rdev, unsigned index)
        struct twlreg_info      *info = rdev_get_drvdata(rdev);
        int                     mV = info->table[index];
 
-       return IS_UNSUP(mV) ? 0 : (LDO_MV(mV) * 1000);
+       return IS_UNSUP(info, mV) ? 0 : (LDO_MV(mV) * 1000);
 }
 
 static int

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 18fc937c867d381052cbbcf75e52a9ff4a59e73d..c1be3dba20eacebfc02dc8dc1c2ee4dabc98dfb7 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -762,6 +762,11 @@ struct twl_regulator_driver_data {
 #define TWL5031                        BIT(2)  /* twl5031 has different registers */
 #define TWL6030_CLASS          BIT(3)  /* TWL6030 class */
 #define TWL6025_SUBCLASS       BIT(4)  /* TWL6025 has changed registers */
+#define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible
+                                         * but not officially supported.
+                                         * This flag is necessary to
+                                         * enable them.
+                                         */
 
 /*----------------------------------------------------------------------*/