lkml.org 
[lkml]   [2010]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[39/74] regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit a2fad9bf26a1d44a8d31a5c4528108a2b9f468ab upstream.

    The WM8350 LED driver needs to be able to enable and disable the
    regulators it is using. Previously the core wasn't properly enforcing
    status change constraints so the driver was able to function but this
    has always been intended to be required.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/regulator/wm8350-regulator.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/regulator/wm8350-regulator.c
    +++ b/drivers/regulator/wm8350-regulator.c
    @@ -1504,7 +1504,8 @@ int wm8350_register_led(struct wm8350 *w
    led->isink_init.consumer_supplies = &led->isink_consumer;
    led->isink_init.constraints.min_uA = 0;
    led->isink_init.constraints.max_uA = pdata->max_uA;
    - led->isink_init.constraints.valid_ops_mask = REGULATOR_CHANGE_CURRENT;
    + led->isink_init.constraints.valid_ops_mask
    + = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS;
    led->isink_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL;
    ret = wm8350_register_regulator(wm8350, isink, &led->isink_init);
    if (ret != 0) {
    @@ -1517,6 +1518,7 @@ int wm8350_register_led(struct wm8350 *w
    led->dcdc_init.num_consumer_supplies = 1;
    led->dcdc_init.consumer_supplies = &led->dcdc_consumer;
    led->dcdc_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL;
    + led->dcdc_init.constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS;
    ret = wm8350_register_regulator(wm8350, dcdc, &led->dcdc_init);
    if (ret != 0) {
    platform_device_put(pdev);



    \
     
     \ /
      Last update: 2010-02-04 18:25    [W:5.021 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site