On Fri, 25 Jul 2014, Charles Keepax wrote:
> 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 <[email protected]>
> ---
> drivers/mfd/arizona-core.c | 20 ++++++++++++++++----
> 1 files changed, 16 insertions(+), 4 deletions(-)
Applied, thanks.
> 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" },
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
