lkml.org 
[lkml]   [2008]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [patch 2.6.28-rc6 1/3] mfd: twl4030: simplified child creation code
    Date
    On Sunday 30 November 2008, Samuel Ortiz wrote:
    > All 3 patches pushed to my for-next branch, thanks.

    Great ... here's a small tweak, which you may want to just
    merge with the last one.

    - Dave


    ========== CUT HERE
    From: David Brownell <dbrownell@users.sourceforge.net>

    This contains two bugfixes to the initial twl4030 regulator
    support patch related to USB:

    (a) always overwrite the old list of consumers ... else
    the regulator handles all use the same "usb1v5" name;
    (b) don't set up the "usbcp" regulator, which turns out
    to be managed through separate controls, usually ULPI
    directly from the OTG controller.

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    ---
    drivers/mfd/twl4030-core.c | 11 +----------
    include/linux/i2c/twl4030.h | 1 -
    2 files changed, 1 insertion(+), 11 deletions(-)

    --- a/drivers/mfd/twl4030-core.c
    +++ b/drivers/mfd/twl4030-core.c
    @@ -433,7 +433,7 @@ add_regulator_linked(int num, struct reg
    if (!pdata)
    return NULL;

    - if (consumers && !pdata->consumer_supplies) {
    + if (consumers) {
    pdata->consumer_supplies = consumers;
    pdata->num_consumer_supplies = num_consumers;
    }
    @@ -556,9 +556,6 @@ add_children(struct twl4030_platform_dat
    static struct regulator_consumer_supply usb3v1 = {
    .supply = "usb3v1",
    };
    - static struct regulator_consumer_supply usbcp = {
    - .supply = "usbcp",
    - };

    /* this is a template that gets copied */
    struct regulator_init_data usb_fixed = {
    @@ -573,7 +570,6 @@ add_children(struct twl4030_platform_dat
    usb1v5.dev = usb_transceiver;
    usb1v8.dev = usb_transceiver;
    usb3v1.dev = usb_transceiver;
    - usbcp.dev = usb_transceiver;

    child = add_regulator_linked(TWL4030_REG_VUSB1V5, &usb_fixed,
    &usb1v5, 1);
    @@ -589,11 +585,6 @@ add_children(struct twl4030_platform_dat
    &usb3v1, 1);
    if (IS_ERR(child))
    return PTR_ERR(child);
    -
    - child = add_regulator_linked(TWL4030_REG_VUSBCP, &usb_fixed,
    - &usbcp, 1);
    - if (IS_ERR(child))
    - return PTR_ERR(child);
    }

    /* maybe add LDOs that are omitted on cost-reduced parts */
    --- a/include/linux/i2c/twl4030.h
    +++ b/include/linux/i2c/twl4030.h
    @@ -351,6 +351,5 @@ int twl4030_sih_setup(int module);
    #define TWL4030_REG_VUSB1V5 17
    #define TWL4030_REG_VUSB1V8 18
    #define TWL4030_REG_VUSB3V1 19
    -#define TWL4030_REG_VUSBCP 20

    #endif /* End of __TWL4030_H */


    \
     
     \ /
      Last update: 2008-12-01 22:57    [W:0.023 / U:0.856 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site