Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c650561 authored by Quentin Schulz's avatar Quentin Schulz Committed by Lee Jones
Browse files

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: default avatarQuentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent cd532166

drivers/mfd/axp20x.c

+24 −4
Original line number Original line Diff line number Diff line
@@ -599,7 +599,7 @@ static struct mfd_cell axp20x_cells[] = { 
	},

	},

};

};





static struct mfd_cell axp22x_cells[] = {

static struct mfd_cell axp221_cells[] = {

	{

	{

		.name		= "axp20x-pek",

		.name		= "axp20x-pek",

		.num_resources	= ARRAY_SIZE(axp22x_pek_resources),

		.num_resources	= ARRAY_SIZE(axp22x_pek_resources),
@@ -614,6 +614,21 @@ static struct mfd_cell axp22x_cells[] = { 
	},

	},

};

};





static struct mfd_cell axp223_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,axp223-usb-power-supply",

		.num_resources	= ARRAY_SIZE(axp22x_usb_power_supply_resources),

		.resources	= axp22x_usb_power_supply_resources,

	},

};



static struct mfd_cell axp152_cells[] = {

static struct mfd_cell axp152_cells[] = {

	{

	{

		.name			= "axp20x-pek",

		.name			= "axp20x-pek",
@@ -801,9 +816,14 @@ int axp20x_match_device(struct axp20x_dev *axp20x) 
		axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;

		axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;

		break;

		break;

	case AXP221_ID:

	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:

	case AXP223_ID:

		axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);

		axp20x->nr_cells = ARRAY_SIZE(axp223_cells);

		axp20x->cells = axp22x_cells;

		axp20x->cells = axp223_cells;

		axp20x->regmap_cfg = &axp22x_regmap_config;

		axp20x->regmap_cfg = &axp22x_regmap_config;

		axp20x->regmap_irq_chip = &axp22x_regmap_irq_chip;

		axp20x->regmap_irq_chip = &axp22x_regmap_irq_chip;

		break;

		break;