On Thu, 21 Mar 2019, Chen-Yu Tsai wrote:
> From: Quentin Schulz <quentin.schulz@xxxxxxxxxxx>
>
> The AXP813 has a VBUS power input. Now that the axp20x_usb_power driver
> supports this variant, we can add an mfd cell for it to use it.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@xxxxxxxxxxx>
> [wens@xxxxxxxx: add commit message]
> Acked-for-MFD-by: Lee Jones <lee.jones@xxxxxxxxxx>
> Signed-off-by: Chen-Yu Tsai <wens@xxxxxxxx>
This patch looks orthogonal.
Unless anyone screams, I'm going to apply it.
> ---
>
> Changes since v1:
> - Made axp803_usb_power_supply_resources[] constant
> - Added Lee's acked-by
> ---
> drivers/mfd/axp20x.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 3c97f2c0fdfe..902f9f27e748 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -198,6 +198,12 @@ static const struct resource axp22x_usb_power_supply_resources[] = {
> DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_VBUS_REMOVAL, "VBUS_REMOVAL"),
> };
>
> +/* AXP803 and AXP813/AXP818 share the same interrupts */
> +static const struct resource axp803_usb_power_supply_resources[] = {
> + DEFINE_RES_IRQ_NAMED(AXP803_IRQ_VBUS_PLUGIN, "VBUS_PLUGIN"),
> + DEFINE_RES_IRQ_NAMED(AXP803_IRQ_VBUS_REMOVAL, "VBUS_REMOVAL"),
> +};
> +
> static const struct resource axp22x_pek_resources[] = {
> DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_PEK_RIS_EDGE, "PEK_DBR"),
> DEFINE_RES_IRQ_NAMED(AXP22X_IRQ_PEK_FAL_EDGE, "PEK_DBF"),
> @@ -793,6 +799,11 @@ static const struct mfd_cell axp813_cells[] = {
> .of_compatible = "x-powers,axp813-ac-power-supply",
> .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
> .resources = axp20x_ac_power_supply_resources,
> + }, {
> + .name = "axp20x-usb-power-supply",
> + .num_resources = ARRAY_SIZE(axp803_usb_power_supply_resources),
> + .resources = axp803_usb_power_supply_resources,
> + .of_compatible = "x-powers,axp813-usb-power-supply",
> },
> };
>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
