Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[cascardo/linux.git] / drivers / mfd / arizona-core.c

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5319f25..bf27179 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -908,12 +908,12 @@ static const char * const wm5102_supplies[] = {
 
 static const struct mfd_cell wm5102_devs[] = {
        { .name = "arizona-micsupp" },
+       { .name = "arizona-gpio" },
        {
                .name = "arizona-extcon",
                .parent_supplies = wm5102_supplies,
                .num_parent_supplies = 1, /* We only need MICVDD */
        },
-       { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
        {
@@ -925,12 +925,12 @@ static const struct mfd_cell wm5102_devs[] = {
 
 static const struct mfd_cell wm5110_devs[] = {
        { .name = "arizona-micsupp" },
+       { .name = "arizona-gpio" },
        {
                .name = "arizona-extcon",
                .parent_supplies = wm5102_supplies,
                .num_parent_supplies = 1, /* We only need MICVDD */
        },
-       { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
        {
@@ -966,12 +966,12 @@ static const char * const wm8997_supplies[] = {
 
 static const struct mfd_cell wm8997_devs[] = {
        { .name = "arizona-micsupp" },
+       { .name = "arizona-gpio" },
        {
                .name = "arizona-extcon",
                .parent_supplies = wm8997_supplies,
                .num_parent_supplies = 1, /* We only need MICVDD */
        },
-       { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
        {
@@ -982,12 +982,13 @@ static const struct mfd_cell wm8997_devs[] = {
 };
 
 static const struct mfd_cell wm8998_devs[] = {
+       { .name = "arizona-micsupp" },
+       { .name = "arizona-gpio" },
        {
                .name = "arizona-extcon",
                .parent_supplies = wm5102_supplies,
                .num_parent_supplies = 1, /* We only need MICVDD */
        },
-       { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
        {
@@ -995,7 +996,6 @@ static const struct mfd_cell wm8998_devs[] = {
                .parent_supplies = wm5102_supplies,
                .num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
        },
-       { .name = "arizona-micsupp" },
 };
 
 int arizona_dev_init(struct arizona *arizona)