Merge tag '5.2-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / drivers / mfd / axp20x.c

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 3c97f2c..2215660 100644 (file)
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -198,6 +198,12 @@ static const struct resource axp22x_usb_power_supply_resources[] = {
        DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_VBUS_REMOVAL, "VBUS_REMOVAL"),
 };
 
+/* AXP803 and AXP813/AXP818 share the same interrupts */
+static const struct resource axp803_usb_power_supply_resources[] = {
+       DEFINE_RES_IRQ_NAMED(AXP803_IRQ_VBUS_PLUGIN, "VBUS_PLUGIN"),
+       DEFINE_RES_IRQ_NAMED(AXP803_IRQ_VBUS_REMOVAL, "VBUS_REMOVAL"),
+};
+
 static const struct resource axp22x_pek_resources[] = {
        DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_PEK_RIS_EDGE, "PEK_DBR"),
        DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_PEK_FAL_EDGE, "PEK_DBF"),
@@ -741,6 +747,11 @@ static const struct mfd_cell axp803_cells[] = {
                .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-usb-power-supply",
+               .num_resources  = ARRAY_SIZE(axp803_usb_power_supply_resources),
+               .resources      = axp803_usb_power_supply_resources,
+               .of_compatible  = "x-powers,axp813-usb-power-supply",
        },
        {       .name           = "axp20x-regulator" },
 };
@@ -793,6 +804,11 @@ static const struct mfd_cell axp813_cells[] = {
                .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-usb-power-supply",
+               .num_resources  = ARRAY_SIZE(axp803_usb_power_supply_resources),
+               .resources      = axp803_usb_power_supply_resources,
+               .of_compatible  = "x-powers,axp813-usb-power-supply",
        },
 };