mfd: axp20x: Add separate MFD cell for AXP223

The AXP223 shares most of its logic with the AXP221 but has some
differences for the VBUS power supply driver. Thus, to probe the driver
with the correct compatible, the AXP221 and the AXP223 now have separate
MFD cells.

AXP221 MFD cells are renamed from axp22x_cells to axp221_cells to avoid
confusion.

Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index ed00ba0d64d2e51e2049a408b43a2cbcf05363df..20b95af9a217b0f40625e3116eedd8f75ed04e26 100644 (file)
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -599,7 +599,22 @@ static struct mfd_cell axp20x_cells[] = {
        },
 };
 
-static struct mfd_cell axp22x_cells[] = {
+static struct mfd_cell axp221_cells[] = {
+       {
+               .name           = "axp20x-pek",
+               .num_resources  = ARRAY_SIZE(axp22x_pek_resources),
+               .resources      = axp22x_pek_resources,
+       }, {
+               .name           = "axp20x-regulator",
+       }, {
+               .name           = "axp20x-usb-power-supply",
+               .of_compatible  = "x-powers,axp221-usb-power-supply",
+               .num_resources  = ARRAY_SIZE(axp22x_usb_power_supply_resources),
+               .resources      = axp22x_usb_power_supply_resources,
+       },
+};
+
+static struct mfd_cell axp223_cells[] = {
        {
                .name                   = "axp20x-pek",
                .num_resources          = ARRAY_SIZE(axp22x_pek_resources),
@@ -608,7 +623,7 @@ static struct mfd_cell axp22x_cells[] = {
                .name                   = "axp20x-regulator",
        }, {
                .name           = "axp20x-usb-power-supply",
-               .of_compatible  = "x-powers,axp221-usb-power-supply",
+               .of_compatible  = "x-powers,axp223-usb-power-supply",
                .num_resources  = ARRAY_SIZE(axp22x_usb_power_supply_resources),
                .resources      = axp22x_usb_power_supply_resources,
        },
@@ -801,9 +816,14 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
                axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
                break;
        case AXP221_ID:
+               axp20x->nr_cells = ARRAY_SIZE(axp221_cells);
+               axp20x->cells = axp221_cells;
+               axp20x->regmap_cfg = &axp22x_regmap_config;
+               axp20x->regmap_irq_chip = &axp22x_regmap_irq_chip;
+               break;
        case AXP223_ID:
-               axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
-               axp20x->cells = axp22x_cells;
+               axp20x->nr_cells = ARRAY_SIZE(axp223_cells);
+               axp20x->cells = axp223_cells;
                axp20x->regmap_cfg = &axp22x_regmap_config;
                axp20x->regmap_irq_chip = &axp22x_regmap_irq_chip;
                break;