| Message ID | 20161209110419.28981-7-quentin.schulz@free-electrons.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Dec 09, 2016 at 12:04:14PM +0100, Quentin Schulz wrote: > 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> Thanks, Maxime
On Fri, 09 Dec 2016, Quentin Schulz wrote: > 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> > --- > > v2: > - correct indentation, > - renaming axp22x_cells to axp221_cells to avoid confusion between axp22x, > axp221 and axp223 > > drivers/mfd/axp20x.c | 28 ++++++++++++++++++++++++---- > 1 file changed, 24 insertions(+), 4 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 6ee2cc6..b31f123 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -591,7 +591,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), > @@ -600,7 +615,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, > }, > @@ -793,9 +808,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;
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 6ee2cc6..b31f123 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -591,7 +591,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), @@ -600,7 +615,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, }, @@ -793,9 +808,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;