Merge tag 'imx-dt64-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[cascardo/linux.git] / drivers / mfd / axp20x.c

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index a57d6e9..e4e3297 100644 (file)
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -37,6 +37,7 @@ static const char * const axp20x_model_names[] = {
        "AXP221",
        "AXP223",
        "AXP288",
+       "AXP809",
 };
 
 static const struct regmap_range axp152_writeable_ranges[] = {
@@ -85,6 +86,7 @@ static const struct regmap_access_table axp20x_volatile_table = {
        .n_yes_ranges   = ARRAY_SIZE(axp20x_volatile_ranges),
 };
 
+/* AXP22x ranges are shared with the AXP809, as they cover the same range */
 static const struct regmap_range axp22x_writeable_ranges[] = {
        regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
        regmap_reg_range(AXP20X_DCDC_MODE, AXP22X_BATLOW_THRES1),
@@ -128,6 +130,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",
@@ -211,6 +219,20 @@ static struct resource axp288_fuel_gauge_resources[] = {
        },
 };
 
+static struct resource axp809_pek_resources[] = {
+       {
+               .name   = "PEK_DBR",
+               .start  = AXP809_IRQ_PEK_RIS_EDGE,
+               .end    = AXP809_IRQ_PEK_RIS_EDGE,
+               .flags  = IORESOURCE_IRQ,
+       }, {
+               .name   = "PEK_DBF",
+               .start  = AXP809_IRQ_PEK_FAL_EDGE,
+               .end    = AXP809_IRQ_PEK_FAL_EDGE,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
 static const struct regmap_config axp152_regmap_config = {
        .reg_bits       = 8,
        .val_bits       = 8,
@@ -378,6 +400,41 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
        INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
 };
 
+static const struct regmap_irq axp809_regmap_irqs[] = {
+       INIT_REGMAP_IRQ(AXP809, ACIN_OVER_V,            0, 7),
+       INIT_REGMAP_IRQ(AXP809, ACIN_PLUGIN,            0, 6),
+       INIT_REGMAP_IRQ(AXP809, ACIN_REMOVAL,           0, 5),
+       INIT_REGMAP_IRQ(AXP809, VBUS_OVER_V,            0, 4),
+       INIT_REGMAP_IRQ(AXP809, VBUS_PLUGIN,            0, 3),
+       INIT_REGMAP_IRQ(AXP809, VBUS_REMOVAL,           0, 2),
+       INIT_REGMAP_IRQ(AXP809, VBUS_V_LOW,             0, 1),
+       INIT_REGMAP_IRQ(AXP809, BATT_PLUGIN,            1, 7),
+       INIT_REGMAP_IRQ(AXP809, BATT_REMOVAL,           1, 6),
+       INIT_REGMAP_IRQ(AXP809, BATT_ENT_ACT_MODE,      1, 5),
+       INIT_REGMAP_IRQ(AXP809, BATT_EXIT_ACT_MODE,     1, 4),
+       INIT_REGMAP_IRQ(AXP809, CHARG,                  1, 3),
+       INIT_REGMAP_IRQ(AXP809, CHARG_DONE,             1, 2),
+       INIT_REGMAP_IRQ(AXP809, BATT_CHG_TEMP_HIGH,     2, 7),
+       INIT_REGMAP_IRQ(AXP809, BATT_CHG_TEMP_HIGH_END, 2, 6),
+       INIT_REGMAP_IRQ(AXP809, BATT_CHG_TEMP_LOW,      2, 5),
+       INIT_REGMAP_IRQ(AXP809, BATT_CHG_TEMP_LOW_END,  2, 4),
+       INIT_REGMAP_IRQ(AXP809, BATT_ACT_TEMP_HIGH,     2, 3),
+       INIT_REGMAP_IRQ(AXP809, BATT_ACT_TEMP_HIGH_END, 2, 2),
+       INIT_REGMAP_IRQ(AXP809, BATT_ACT_TEMP_LOW,      2, 1),
+       INIT_REGMAP_IRQ(AXP809, BATT_ACT_TEMP_LOW_END,  2, 0),
+       INIT_REGMAP_IRQ(AXP809, DIE_TEMP_HIGH,          3, 7),
+       INIT_REGMAP_IRQ(AXP809, LOW_PWR_LVL1,           3, 1),
+       INIT_REGMAP_IRQ(AXP809, LOW_PWR_LVL2,           3, 0),
+       INIT_REGMAP_IRQ(AXP809, TIMER,                  4, 7),
+       INIT_REGMAP_IRQ(AXP809, PEK_RIS_EDGE,           4, 6),
+       INIT_REGMAP_IRQ(AXP809, PEK_FAL_EDGE,           4, 5),
+       INIT_REGMAP_IRQ(AXP809, PEK_SHORT,              4, 4),
+       INIT_REGMAP_IRQ(AXP809, PEK_LONG,               4, 3),
+       INIT_REGMAP_IRQ(AXP809, PEK_OVER_OFF,           4, 2),
+       INIT_REGMAP_IRQ(AXP809, GPIO1_INPUT,            4, 1),
+       INIT_REGMAP_IRQ(AXP809, GPIO0_INPUT,            4, 0),
+};
+
 static const struct regmap_irq_chip axp152_regmap_irq_chip = {
        .name                   = "axp152_irq_chip",
        .status_base            = AXP152_IRQ1_STATE,
@@ -428,6 +485,18 @@ static const struct regmap_irq_chip axp288_regmap_irq_chip = {
 
 };
 
+static const struct regmap_irq_chip axp809_regmap_irq_chip = {
+       .name                   = "axp809",
+       .status_base            = AXP20X_IRQ1_STATE,
+       .ack_base               = AXP20X_IRQ1_STATE,
+       .mask_base              = AXP20X_IRQ1_EN,
+       .mask_invert            = true,
+       .init_ack_masked        = true,
+       .irqs                   = axp809_regmap_irqs,
+       .num_irqs               = ARRAY_SIZE(axp809_regmap_irqs),
+       .num_regs               = 5,
+};
+
 static struct mfd_cell axp20x_cells[] = {
        {
                .name           = "axp20x-pek",
@@ -435,6 +504,11 @@ static struct mfd_cell axp20x_cells[] = {
                .resources      = axp20x_pek_resources,
        }, {
                .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",
@@ -572,6 +646,16 @@ static struct mfd_cell axp288_cells[] = {
        },
 };
 
+static struct mfd_cell axp809_cells[] = {
+       {
+               .name                   = "axp20x-pek",
+               .num_resources          = ARRAY_SIZE(axp809_pek_resources),
+               .resources              = axp809_pek_resources,
+       }, {
+               .name                   = "axp20x-regulator",
+       },
+};
+
 static struct axp20x_dev *axp20x_pm_power_off;
 static void axp20x_power_off(void)
 {
@@ -631,6 +715,12 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
                axp20x->regmap_cfg = &axp288_regmap_config;
                axp20x->regmap_irq_chip = &axp288_regmap_irq_chip;
                break;
+       case AXP809_ID:
+               axp20x->nr_cells = ARRAY_SIZE(axp809_cells);
+               axp20x->cells = axp809_cells;
+               axp20x->regmap_cfg = &axp22x_regmap_config;
+               axp20x->regmap_irq_chip = &axp809_regmap_irq_chip;
+               break;
        default:
                dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x->variant);
                return -EINVAL;