lkml.org 
[lkml]   [2012]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 2/2] 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>
    ---

    drivers/regulator/twl-regulator.c | 12 +++++-------
    include/linux/i2c/twl.h | 5 +++++
    2 files changed, 10 insertions(+), 7 deletions(-)

    diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
    index 9cdfc38..03a316d 100644
    --- a/drivers/regulator/twl-regulator.c
    +++ b/drivers/regulator/twl-regulator.c
    @@ -388,14 +388,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))


    @@ -469,7 +467,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
    @@ -483,7 +481,7 @@ twl4030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
    int mV = info->table[vsel];
    int uV;

    - if (IS_UNSUP(mV))
    + if (IS_UNSUP(info, mV))
    continue;
    uV = LDO_MV(mV) * 1000;

    diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
    index 88e8cd8..8eec440 100644
    --- a/include/linux/i2c/twl.h
    +++ b/include/linux/i2c/twl.h
    @@ -752,6 +752,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.
    + */

    /*----------------------------------------------------------------------*/




    \
     
     \ /
      Last update: 2012-05-01 23:21    [W:0.025 / U:60.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site