Commit 8de4efda authored Aug 08, 2015 by Hans de Goede Committed by Lee Jones Aug 12, 2015

mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs



Add a cell for the usb power_supply part of the axp20x PMICs.

Note that this cell is only for the usb power_supply part and not the
ac-power / battery-charger / rtc-backup-bat-charger bits.

Depending on the board each of those must be enabled / disabled separately
in devicetree as most boards do not use all 4. So in dt each one needs its
own child-node of the axp20x node. Another reason for using separate child
nodes for each is so that other devicetree nodes can have a power-supply
property with a phandle referencing a node representing a single
power-supply.

The decision to use a separate devicetree node for each is reflected on
the kernel side by each getting its own mfd-cell / platform_device and
platform-driver.

Note this commit also makes some whitespace changes to the intialization
of existing cells in axp20x_cells, these are pure whitespace changes,
functionally nothing changes.

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 553ed4b5

drivers/mfd/axp20x.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -140,6 +140,13 @@ static struct resource axp20x_pek_resources[] = {
		},
		};

		static struct resource axp20x_usb_power_supply_resources[] = {
		DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_VBUS_PLUGIN, "VBUS_PLUGIN"),
		DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_VBUS_REMOVAL, "VBUS_REMOVAL"),
		DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_VBUS_VALID, "VBUS_VALID"),
		DEFINE_RES_IRQ_NAMED(AXP20X_IRQ_VBUS_NOT_VALID, "VBUS_NOT_VALID"),
		};

		static struct resource axp22x_pek_resources[] = {
		{
		.name = "PEK_DBR",
		@@ -437,6 +444,11 @@ static struct mfd_cell axp20x_cells[] = {
		.resources = axp20x_pek_resources,
		}, {
		.name = "axp20x-regulator",
		}, {
		.name = "axp20x-usb-power-supply",
		.of_compatible = "x-powers,axp202-usb-power-supply",
		.num_resources = ARRAY_SIZE(axp20x_usb_power_supply_resources),
		.resources = axp20x_usb_power_supply_resources,
		},
		};