On Wed, 07 Oct 2015, Adam Thomson wrote:
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx>
> Suggested-by: Lee Jones <lee.jones@xxxxxxxxxx>
> Acked-by: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
>
> Changes in v6:
> - Rebase to v4.3-rc4
>
> Changes in v5:
> - Rebase to v4.2
>
> Changes in v3:
> - Initial version.
>
> drivers/mfd/da9150-core.c | 35 +++++------------------------------
> 1 file changed, 5 insertions(+), 30 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
> index 85ca4b5..195fdcf 100644
> --- a/drivers/mfd/da9150-core.c
> +++ b/drivers/mfd/da9150-core.c
> @@ -355,39 +355,14 @@ static const struct regmap_irq_chip da9150_regmap_irq_chip = {
> };
>
> static struct resource da9150_gpadc_resources[] = {
> - {
> - .name = "GPADC",
> - .start = DA9150_IRQ_GPADC,
> - .end = DA9150_IRQ_GPADC,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_GPADC, "GPADC"),
> };
>
> static struct resource da9150_charger_resources[] = {
> - {
> - .name = "CHG_STATUS",
> - .start = DA9150_IRQ_CHG,
> - .end = DA9150_IRQ_CHG,
> - .flags = IORESOURCE_IRQ,
> - },
> - {
> - .name = "CHG_TJUNC",
> - .start = DA9150_IRQ_TJUNC,
> - .end = DA9150_IRQ_TJUNC,
> - .flags = IORESOURCE_IRQ,
> - },
> - {
> - .name = "CHG_VFAULT",
> - .start = DA9150_IRQ_VFAULT,
> - .end = DA9150_IRQ_VFAULT,
> - .flags = IORESOURCE_IRQ,
> - },
> - {
> - .name = "CHG_VBUS",
> - .start = DA9150_IRQ_VBUS,
> - .end = DA9150_IRQ_VBUS,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_CHG, "CHG_STATUS"),
> + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_TJUNC, "CHG_TJUNC"),
> + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VFAULT, "CHG_VFAULT"),
> + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VBUS, "CHG_VBUS"),
> };
>
> static struct resource da9150_fg_resources[] = {
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
