1 files changed, 70 insertions, 56 deletions
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index e1450a56fc07..3c97f2c0fdfe 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -641,9 +641,9 @@ static const struct mfd_cell axp221_cells[] = {
 static const struct mfd_cell axp223_cells[] = {
        {
-                .name                   = "axp221-pek",
+                .name           = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp22x_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp22x_pek_resources),
-                .resources              = axp22x_pek_resources,
+                .resources      = axp22x_pek_resources,
        }, {
                .name           = "axp22x-adc",
                .of_compatible  = "x-powers,axp221-adc",
@@ -651,7 +651,7 @@ static const struct mfd_cell axp223_cells[] = {
                .name           = "axp20x-battery-power-supply",
                .of_compatible  = "x-powers,axp221-battery-power-supply",
        }, {
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
        }, {
                .name           = "axp20x-ac-power-supply",
                .of_compatible  = "x-powers,axp221-ac-power-supply",
@@ -667,9 +667,9 @@ static const struct mfd_cell axp223_cells[] = {
 static const struct mfd_cell axp152_cells[] = {
        {
-                .name                   = "axp20x-pek",
+                .name           = "axp20x-pek",
-                .num_resources          = ARRAY_SIZE(axp152_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp152_pek_resources),
-                .resources              = axp152_pek_resources,
+                .resources      = axp152_pek_resources,
        },
 };
@@ -698,87 +698,101 @@ static const struct resource axp288_charger_resources[] = {
 static const struct mfd_cell axp288_cells[] = {
        {
-                .name = "axp288_adc",
+                .name           = "axp288_adc",
-                .num_resources = ARRAY_SIZE(axp288_adc_resources),
+                .num_resources  = ARRAY_SIZE(axp288_adc_resources),
-                .resources = axp288_adc_resources,
+                .resources      = axp288_adc_resources,
-        },
+        }, {
-        {
+                .name           = "axp288_extcon",
-                .name = "axp288_extcon",
+                .num_resources  = ARRAY_SIZE(axp288_extcon_resources),
-                .num_resources = ARRAY_SIZE(axp288_extcon_resources),
+                .resources      = axp288_extcon_resources,
-                .resources = axp288_extcon_resources,
+        }, {
-        },
+                .name           = "axp288_charger",
-        {
+                .num_resources  = ARRAY_SIZE(axp288_charger_resources),
-                .name = "axp288_charger",
+                .resources      = axp288_charger_resources,
-                .num_resources = ARRAY_SIZE(axp288_charger_resources),
+        }, {
-                .resources = axp288_charger_resources,
+                .name           = "axp288_fuel_gauge",
-        },
+                .num_resources  = ARRAY_SIZE(axp288_fuel_gauge_resources),
-        {
+                .resources      = axp288_fuel_gauge_resources,
-                .name = "axp288_fuel_gauge",
+        }, {
-                .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
+                .name           = "axp221-pek",
-                .resources = axp288_fuel_gauge_resources,
+                .num_resources  = ARRAY_SIZE(axp288_power_button_resources),
-        },
+                .resources      = axp288_power_button_resources,
-        {
+        }, {
-                .name = "axp221-pek",
+                .name           = "axp288_pmic_acpi",
-                .num_resources = ARRAY_SIZE(axp288_power_button_resources),
-                .resources = axp288_power_button_resources,
-        },
-        {
-                .name = "axp288_pmic_acpi",
        },
 };
 static const struct mfd_cell axp803_cells[] = {
        {
-                .name                   = "axp221-pek",
+                .name           = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp803_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp803_pek_resources),
-                .resources              = axp803_pek_resources,
+                .resources      = axp803_pek_resources,
+        }, {
+                .name           = "axp20x-gpio",
+                .of_compatible  = "x-powers,axp813-gpio",
+        }, {
+                .name           = "axp813-adc",
+                .of_compatible  = "x-powers,axp813-adc",
+        }, {
+                .name           = "axp20x-battery-power-supply",
+                .of_compatible  = "x-powers,axp813-battery-power-supply",
+        }, {
+                .name           = "axp20x-ac-power-supply",
+                .of_compatible  = "x-powers,axp813-ac-power-supply",
+                .num_resources  = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+                .resources      = axp20x_ac_power_supply_resources,
        },
-        {       .name                   = "axp20x-regulator" },
+        {       .name           = "axp20x-regulator" },
 };
 static const struct mfd_cell axp806_self_working_cells[] = {
        {
-                .name                   = "axp221-pek",
+                .name           = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp806_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp806_pek_resources),
-                .resources              = axp806_pek_resources,
+                .resources      = axp806_pek_resources,
        },
-        {       .name                   = "axp20x-regulator" },
+        {       .name           = "axp20x-regulator" },
 };
 static const struct mfd_cell axp806_cells[] = {
        {
-                .id                     = 2,
+                .id             = 2,
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
        },
 };
 static const struct mfd_cell axp809_cells[] = {
        {
-                .name                   = "axp221-pek",
+                .name           = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp809_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp809_pek_resources),
-                .resources              = axp809_pek_resources,
+                .resources      = axp809_pek_resources,
        }, {
-                .id                     = 1,
+                .id             = 1,
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
        },
 };
 static const struct mfd_cell axp813_cells[] = {
        {
-                .name                   = "axp221-pek",
+                .name           = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp803_pek_resources),
+                .num_resources  = ARRAY_SIZE(axp803_pek_resources),
-                .resources              = axp803_pek_resources,
+                .resources      = axp803_pek_resources,
        }, {
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
        }, {
-                .name                   = "axp20x-gpio",
+                .name           = "axp20x-gpio",
-                .of_compatible          = "x-powers,axp813-gpio",
+                .of_compatible  = "x-powers,axp813-gpio",
        }, {
-                .name                   = "axp813-adc",
+                .name           = "axp813-adc",
-                .of_compatible          = "x-powers,axp813-adc",
+                .of_compatible  = "x-powers,axp813-adc",
        }, {
                .name           = "axp20x-battery-power-supply",
                .of_compatible  = "x-powers,axp813-battery-power-supply",
+        }, {
+                .name           = "axp20x-ac-power-supply",
+                .of_compatible  = "x-powers,axp813-ac-power-supply",
+                .num_resources  = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+                .resources      = axp20x_ac_power_supply_resources,
        },
 };

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index e1450a56fc07..3c97f2c0fdfe 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c
@@ -641,9 +641,9 @@ static const struct mfd_cell axp221_cells[] = {
641		641
642	static const struct mfd_cell axp223_cells[] = {	642	static const struct mfd_cell axp223_cells[] = {
643	{	643	{
644	.name = "axp221-pek",	644	.name = "axp221-pek",
645	.num_resources = ARRAY_SIZE(axp22x_pek_resources),	645	.num_resources = ARRAY_SIZE(axp22x_pek_resources),
646	.resources = axp22x_pek_resources,	646	.resources = axp22x_pek_resources,
647	}, {	647	}, {
648	.name = "axp22x-adc",	648	.name = "axp22x-adc",
649	.of_compatible = "x-powers,axp221-adc",	649	.of_compatible = "x-powers,axp221-adc",
@@ -651,7 +651,7 @@ static const struct mfd_cell axp223_cells[] = {
651	.name = "axp20x-battery-power-supply",	651	.name = "axp20x-battery-power-supply",
652	.of_compatible = "x-powers,axp221-battery-power-supply",	652	.of_compatible = "x-powers,axp221-battery-power-supply",
653	}, {	653	}, {
654	.name = "axp20x-regulator",	654	.name = "axp20x-regulator",
655	}, {	655	}, {
656	.name = "axp20x-ac-power-supply",	656	.name = "axp20x-ac-power-supply",
657	.of_compatible = "x-powers,axp221-ac-power-supply",	657	.of_compatible = "x-powers,axp221-ac-power-supply",
@@ -667,9 +667,9 @@ static const struct mfd_cell axp223_cells[] = {
667		667
668	static const struct mfd_cell axp152_cells[] = {	668	static const struct mfd_cell axp152_cells[] = {
669	{	669	{
670	.name = "axp20x-pek",	670	.name = "axp20x-pek",
671	.num_resources = ARRAY_SIZE(axp152_pek_resources),	671	.num_resources = ARRAY_SIZE(axp152_pek_resources),
672	.resources = axp152_pek_resources,	672	.resources = axp152_pek_resources,
673	},	673	},
674	};	674	};
675		675
@@ -698,87 +698,101 @@ static const struct resource axp288_charger_resources[] = {
698		698
699	static const struct mfd_cell axp288_cells[] = {	699	static const struct mfd_cell axp288_cells[] = {
700	{	700	{
701	.name = "axp288_adc",	701	.name = "axp288_adc",
702	.num_resources = ARRAY_SIZE(axp288_adc_resources),	702	.num_resources = ARRAY_SIZE(axp288_adc_resources),
703	.resources = axp288_adc_resources,	703	.resources = axp288_adc_resources,
704	},	704	}, {
705	{	705	.name = "axp288_extcon",
706	.name = "axp288_extcon",	706	.num_resources = ARRAY_SIZE(axp288_extcon_resources),
707	.num_resources = ARRAY_SIZE(axp288_extcon_resources),	707	.resources = axp288_extcon_resources,
708	.resources = axp288_extcon_resources,	708	}, {
709	},	709	.name = "axp288_charger",
710	{	710	.num_resources = ARRAY_SIZE(axp288_charger_resources),
711	.name = "axp288_charger",	711	.resources = axp288_charger_resources,
712	.num_resources = ARRAY_SIZE(axp288_charger_resources),	712	}, {
713	.resources = axp288_charger_resources,	713	.name = "axp288_fuel_gauge",
714	},	714	.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
715	{	715	.resources = axp288_fuel_gauge_resources,
716	.name = "axp288_fuel_gauge",	716	}, {
717	.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),	717	.name = "axp221-pek",
718	.resources = axp288_fuel_gauge_resources,	718	.num_resources = ARRAY_SIZE(axp288_power_button_resources),
719	},	719	.resources = axp288_power_button_resources,
720	{	720	}, {
721	.name = "axp221-pek",	721	.name = "axp288_pmic_acpi",
722	.num_resources = ARRAY_SIZE(axp288_power_button_resources),
723	.resources = axp288_power_button_resources,
724	},
725	{
726	.name = "axp288_pmic_acpi",
727	},	722	},
728	};	723	};
729		724
730	static const struct mfd_cell axp803_cells[] = {	725	static const struct mfd_cell axp803_cells[] = {
731	{	726	{
732	.name = "axp221-pek",	727	.name = "axp221-pek",
733	.num_resources = ARRAY_SIZE(axp803_pek_resources),	728	.num_resources = ARRAY_SIZE(axp803_pek_resources),
734	.resources = axp803_pek_resources,	729	.resources = axp803_pek_resources,
		730	}, {
		731	.name = "axp20x-gpio",
		732	.of_compatible = "x-powers,axp813-gpio",
		733	}, {
		734	.name = "axp813-adc",
		735	.of_compatible = "x-powers,axp813-adc",
		736	}, {
		737	.name = "axp20x-battery-power-supply",
		738	.of_compatible = "x-powers,axp813-battery-power-supply",
		739	}, {
		740	.name = "axp20x-ac-power-supply",
		741	.of_compatible = "x-powers,axp813-ac-power-supply",
		742	.num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
		743	.resources = axp20x_ac_power_supply_resources,
735	},	744	},
736	{ .name = "axp20x-regulator" },	745	{ .name = "axp20x-regulator" },
737	};	746	};
738		747
739	static const struct mfd_cell axp806_self_working_cells[] = {	748	static const struct mfd_cell axp806_self_working_cells[] = {
740	{	749	{
741	.name = "axp221-pek",	750	.name = "axp221-pek",
742	.num_resources = ARRAY_SIZE(axp806_pek_resources),	751	.num_resources = ARRAY_SIZE(axp806_pek_resources),
743	.resources = axp806_pek_resources,	752	.resources = axp806_pek_resources,
744	},	753	},
745	{ .name = "axp20x-regulator" },	754	{ .name = "axp20x-regulator" },
746	};	755	};
747		756
748	static const struct mfd_cell axp806_cells[] = {	757	static const struct mfd_cell axp806_cells[] = {
749	{	758	{
750	.id = 2,	759	.id = 2,
751	.name = "axp20x-regulator",	760	.name = "axp20x-regulator",
752	},	761	},
753	};	762	};
754		763
755	static const struct mfd_cell axp809_cells[] = {	764	static const struct mfd_cell axp809_cells[] = {
756	{	765	{
757	.name = "axp221-pek",	766	.name = "axp221-pek",
758	.num_resources = ARRAY_SIZE(axp809_pek_resources),	767	.num_resources = ARRAY_SIZE(axp809_pek_resources),
759	.resources = axp809_pek_resources,	768	.resources = axp809_pek_resources,
760	}, {	769	}, {
761	.id = 1,	770	.id = 1,
762	.name = "axp20x-regulator",	771	.name = "axp20x-regulator",
763	},	772	},
764	};	773	};
765		774
766	static const struct mfd_cell axp813_cells[] = {	775	static const struct mfd_cell axp813_cells[] = {
767	{	776	{
768	.name = "axp221-pek",	777	.name = "axp221-pek",
769	.num_resources = ARRAY_SIZE(axp803_pek_resources),	778	.num_resources = ARRAY_SIZE(axp803_pek_resources),
770	.resources = axp803_pek_resources,	779	.resources = axp803_pek_resources,
771	}, {	780	}, {
772	.name = "axp20x-regulator",	781	.name = "axp20x-regulator",
773	}, {	782	}, {
774	.name = "axp20x-gpio",	783	.name = "axp20x-gpio",
775	.of_compatible = "x-powers,axp813-gpio",	784	.of_compatible = "x-powers,axp813-gpio",
776	}, {	785	}, {
777	.name = "axp813-adc",	786	.name = "axp813-adc",
778	.of_compatible = "x-powers,axp813-adc",	787	.of_compatible = "x-powers,axp813-adc",
779	}, {	788	}, {
780	.name = "axp20x-battery-power-supply",	789	.name = "axp20x-battery-power-supply",
781	.of_compatible = "x-powers,axp813-battery-power-supply",	790	.of_compatible = "x-powers,axp813-battery-power-supply",
		791	}, {
		792	.name = "axp20x-ac-power-supply",
		793	.of_compatible = "x-powers,axp813-ac-power-supply",
		794	.num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
		795	.resources = axp20x_ac_power_supply_resources,
782	},	796	},
783	};	797	};
784		798