lkml.org 
[lkml]   [2014]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] mfd: arizona: Map MICVDD from extcon device to the Arizona core
    Date
    The extcon driver should be able to get its regulator against rather
    than against the main arizona device, we must add a supply mapping
    allowing the regulator to be located. This patch does so.

    Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    ---
    drivers/mfd/arizona-core.c | 20 ++++++++++++++++----
    1 files changed, 16 insertions(+), 4 deletions(-)

    diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
    index e0d415e..cf3689f 100644
    --- a/drivers/mfd/arizona-core.c
    +++ b/drivers/mfd/arizona-core.c
    @@ -578,17 +578,21 @@ static const struct mfd_cell early_devs[] = {
    };

    static const char *wm5102_supplies[] = {
    + "MICVDD",
    "DBVDD2",
    "DBVDD3",
    "CPVDD",
    "SPKVDDL",
    "SPKVDDR",
    - "MICVDD",
    };

    static const struct mfd_cell wm5102_devs[] = {
    { .name = "arizona-micsupp" },
    - { .name = "arizona-extcon" },
    + {
    + .name = "arizona-extcon",
    + .parent_supplies = wm5102_supplies,
    + .num_parent_supplies = 1, /* We only need MICVDD */
    + },
    { .name = "arizona-gpio" },
    { .name = "arizona-haptics" },
    { .name = "arizona-pwm" },
    @@ -601,7 +605,11 @@ static const struct mfd_cell wm5102_devs[] = {

    static const struct mfd_cell wm5110_devs[] = {
    { .name = "arizona-micsupp" },
    - { .name = "arizona-extcon" },
    + {
    + .name = "arizona-extcon",
    + .parent_supplies = wm5102_supplies,
    + .num_parent_supplies = 1, /* We only need MICVDD */
    + },
    { .name = "arizona-gpio" },
    { .name = "arizona-haptics" },
    { .name = "arizona-pwm" },
    @@ -621,7 +629,11 @@ static const char *wm8997_supplies[] = {

    static const struct mfd_cell wm8997_devs[] = {
    { .name = "arizona-micsupp" },
    - { .name = "arizona-extcon" },
    + {
    + .name = "arizona-extcon",
    + .parent_supplies = wm8997_supplies,
    + .num_parent_supplies = 1, /* We only need MICVDD */
    + },
    { .name = "arizona-gpio" },
    { .name = "arizona-haptics" },
    { .name = "arizona-pwm" },
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2014-07-25 18:41    [W:5.196 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site