| Message ID | 1462511991-1911-3-git-send-email-haas@computerlinguist.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, 06 May 2016, Michael Haas wrote: > As a counterpart to the usb power_supply cell, this commit adds an AC > power_supply cell to the axp20x driver. > > Still missing are the RTC backup battery and the main battery charger > cells. > > Signed-off-by: Michael Haas <haas@computerlinguist.org> > Acked-by: Chen-Yu Tsai <wens@csie.org> > --- > drivers/mfd/axp20x.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) Applied, thanks. > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index a57d6e9..aa6ef08 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -128,6 +128,12 @@ static struct resource axp152_pek_resources[] = { > DEFINE_RES_IRQ_NAMED(AXP152_IRQ_PEK_FAL_EDGE, "PEK_DBF"), > }; > > +static struct resource axp20x_ac_power_supply_resources[] = { > + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_PLUGIN, "ACIN_PLUGIN"), > + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_REMOVAL, "ACIN_REMOVAL"), > + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_OVER_V, "ACIN_OVER_V"), > +}; > + > static struct resource axp20x_pek_resources[] = { > { > .name = "PEK_DBR", > @@ -436,6 +442,11 @@ static struct mfd_cell axp20x_cells[] = { > }, { > .name = "axp20x-regulator", > }, { > + .name = "axp20x-ac-power-supply", > + .of_compatible = "x-powers,axp202-ac-power-supply", > + .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources), > + .resources = axp20x_ac_power_supply_resources, > + }, { > .name = "axp20x-usb-power-supply", > .of_compatible = "x-powers,axp202-usb-power-supply", > .num_resources = ARRAY_SIZE(axp20x_usb_power_supply_resources),
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index a57d6e9..aa6ef08 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -128,6 +128,12 @@ static struct resource axp152_pek_resources[] = { DEFINE_RES_IRQ_NAMED(AXP152_IRQ_PEK_FAL_EDGE, "PEK_DBF"), }; +static struct resource axp20x_ac_power_supply_resources[] = { + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_PLUGIN, "ACIN_PLUGIN"), + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_REMOVAL, "ACIN_REMOVAL"), + DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_ACIN_OVER_V, "ACIN_OVER_V"), +}; + static struct resource axp20x_pek_resources[] = { { .name = "PEK_DBR", @@ -436,6 +442,11 @@ static struct mfd_cell axp20x_cells[] = { }, { .name = "axp20x-regulator", }, { + .name = "axp20x-ac-power-supply", + .of_compatible = "x-powers,axp202-ac-power-supply", + .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources), + .resources = axp20x_ac_power_supply_resources, + }, { .name = "axp20x-usb-power-supply", .of_compatible = "x-powers,axp202-usb-power-supply", .num_resources = ARRAY_SIZE(axp20x_usb_power_supply_resources),