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

Commit a0e08b86 authored by Krystian Garbaciak's avatar Krystian Garbaciak Committed by Samuel Ortiz
Browse files

mfd: da9063: Add IRQ support 

This patch adds a regmap irqchip for DA9063 IRQs. It depends on

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

 tags/regmap-irq-ack-mask

Signed-off-by: default avatarKrystian Garbaciak <krystian.garbaciak@diasemi.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8e685483

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ obj-$(CONFIG_MFD_LP8788) += lp8788.o lp8788-irq.o 
da9055-objs			:= da9055-core.o da9055-i2c.o

obj-$(CONFIG_MFD_DA9055)	+= da9055.o



da9063-objs			:= da9063-core.o da9063-i2c.o

da9063-objs			:= da9063-core.o da9063-irq.o da9063-i2c.o

obj-$(CONFIG_MFD_DA9063)	+= da9063.o



obj-$(CONFIG_MFD_MAX77686)	+= max77686.o max77686-irq.o

drivers/mfd/da9063-core.c

+56 −0
Original line number Diff line number Diff line
@@ -34,9 +34,52 @@ 
#include <linux/uaccess.h>





static struct resource da9063_regulators_resources[] = {

	{

		.name	= "LDO_LIM",

		.start	= DA9063_IRQ_LDO_LIM,

		.end	= DA9063_IRQ_LDO_LIM,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct resource da9063_rtc_resources[] = {

	{

		.name	= "ALARM",

		.start	= DA9063_IRQ_ALARM,

		.end	= DA9063_IRQ_ALARM,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.name	= "TICK",

		.start	= DA9063_IRQ_TICK,

		.end	= DA9063_IRQ_TICK,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct resource da9063_onkey_resources[] = {

	{

		.start	= DA9063_IRQ_ONKEY,

		.end	= DA9063_IRQ_ONKEY,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct resource da9063_hwmon_resources[] = {

	{

		.start	= DA9063_IRQ_ADC_RDY,

		.end	= DA9063_IRQ_ADC_RDY,

		.flags	= IORESOURCE_IRQ,

	},

};





static struct mfd_cell da9063_devs[] = {

	{

		.name		= DA9063_DRVNAME_REGULATORS,

		.num_resources	= ARRAY_SIZE(da9063_regulators_resources),

		.resources	= da9063_regulators_resources,

	},

	{

		.name		= DA9063_DRVNAME_LEDS,
@@ -46,12 +89,18 @@ static struct mfd_cell da9063_devs[] = { 
	},

	{

		.name		= DA9063_DRVNAME_HWMON,

		.num_resources	= ARRAY_SIZE(da9063_hwmon_resources),

		.resources	= da9063_hwmon_resources,

	},

	{

		.name		= DA9063_DRVNAME_ONKEY,

		.num_resources	= ARRAY_SIZE(da9063_onkey_resources),

		.resources	= da9063_onkey_resources,

	},

	{

		.name		= DA9063_DRVNAME_RTC,

		.num_resources	= ARRAY_SIZE(da9063_rtc_resources),

		.resources	= da9063_rtc_resources,

	},

	{

		.name		= DA9063_DRVNAME_VIBRATION,
@@ -110,6 +159,12 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) 
		 "Device detected (model-ID: 0x%02X  rev-ID: 0x%02X)\n",

		 model, revision);



	ret = da9063_irq_init(da9063);

	if (ret) {

		dev_err(da9063->dev, "Cannot initialize interrupts.\n");

		return ret;

	}



	ret = mfd_add_devices(da9063->dev, -1, da9063_devs,

			      ARRAY_SIZE(da9063_devs), NULL, da9063->irq_base,

			      NULL);
@@ -122,6 +177,7 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) 
void da9063_device_exit(struct da9063 *da9063)

{

	mfd_remove_devices(da9063->dev);

	da9063_irq_exit(da9063);

}



MODULE_DESCRIPTION("PMIC driver for Dialog DA9063");

drivers/mfd/da9063-irq.c

0 → 100644
+193 −0
Original line number Diff line number Diff line 
/* da9063-irq.c: Interrupts support for Dialog DA9063

 *

 * Copyright 2012 Dialog Semiconductor Ltd.

 * Copyright 2013 Philipp Zabel, Pengutronix

 *

 * Author: Michal Hajduk <michal.hajduk@diasemi.com>

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/irq.h>

#include <linux/mfd/core.h>

#include <linux/interrupt.h>

#include <linux/regmap.h>

#include <linux/mfd/da9063/core.h>

#include <linux/mfd/da9063/pdata.h>



#define	DA9063_REG_EVENT_A_OFFSET	0

#define	DA9063_REG_EVENT_B_OFFSET	1

#define	DA9063_REG_EVENT_C_OFFSET	2

#define	DA9063_REG_EVENT_D_OFFSET	3

#define EVENTS_BUF_LEN			4



static const u8 mask_events_buf[] = { [0 ... (EVENTS_BUF_LEN - 1)] = ~0 };



struct da9063_irq_data {

	u16 reg;

	u8 mask;

};



static struct regmap_irq da9063_irqs[] = {

	/* DA9063 event A register */

	[DA9063_IRQ_ONKEY] = {

		.reg_offset = DA9063_REG_EVENT_A_OFFSET,

		.mask = DA9063_M_ONKEY,

	},

	[DA9063_IRQ_ALARM] = {

		.reg_offset = DA9063_REG_EVENT_A_OFFSET,

		.mask = DA9063_M_ALARM,

	},

	[DA9063_IRQ_TICK] = {

		.reg_offset = DA9063_REG_EVENT_A_OFFSET,

		.mask = DA9063_M_TICK,

	},

	[DA9063_IRQ_ADC_RDY] = {

		.reg_offset = DA9063_REG_EVENT_A_OFFSET,

		.mask = DA9063_M_ADC_RDY,

	},

	[DA9063_IRQ_SEQ_RDY] = {

		.reg_offset = DA9063_REG_EVENT_A_OFFSET,

		.mask = DA9063_M_SEQ_RDY,

	},

	/* DA9063 event B register */

	[DA9063_IRQ_WAKE] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_WAKE,

	},

	[DA9063_IRQ_TEMP] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_TEMP,

	},

	[DA9063_IRQ_COMP_1V2] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_COMP_1V2,

	},

	[DA9063_IRQ_LDO_LIM] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_LDO_LIM,

	},

	[DA9063_IRQ_REG_UVOV] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_UVOV,

	},

	[DA9063_IRQ_VDD_MON] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_VDD_MON,

	},

	[DA9063_IRQ_WARN] = {

		.reg_offset = DA9063_REG_EVENT_B_OFFSET,

		.mask = DA9063_M_VDD_WARN,

	},

	/* DA9063 event C register */

	[DA9063_IRQ_GPI0] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI0,

	},

	[DA9063_IRQ_GPI1] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI1,

	},

	[DA9063_IRQ_GPI2] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI2,

	},

	[DA9063_IRQ_GPI3] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI3,

	},

	[DA9063_IRQ_GPI4] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI4,

	},

	[DA9063_IRQ_GPI5] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI5,

	},

	[DA9063_IRQ_GPI6] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI6,

	},

	[DA9063_IRQ_GPI7] = {

		.reg_offset = DA9063_REG_EVENT_C_OFFSET,

		.mask = DA9063_M_GPI7,

	},

	/* DA9063 event D register */

	[DA9063_IRQ_GPI8] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI8,

	},

	[DA9063_IRQ_GPI9] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI9,

	},

	[DA9063_IRQ_GPI10] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI10,

	},

	[DA9063_IRQ_GPI11] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI11,

	},

	[DA9063_IRQ_GPI12] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI12,

	},

	[DA9063_IRQ_GPI13] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI13,

	},

	[DA9063_IRQ_GPI14] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI14,

	},

	[DA9063_IRQ_GPI15] = {

		.reg_offset = DA9063_REG_EVENT_D_OFFSET,

		.mask = DA9063_M_GPI15,

	},

};



static struct regmap_irq_chip da9063_irq_chip = {

	.name = "da9063-irq",

	.irqs = da9063_irqs,

	.num_irqs = DA9063_NUM_IRQ,



	.num_regs = 4,

	.status_base = DA9063_REG_EVENT_A,

	.mask_base = DA9063_REG_IRQ_MASK_A,

	.ack_base = DA9063_REG_EVENT_A,

	.init_ack_masked = true,

};



int da9063_irq_init(struct da9063 *da9063)

{

	int ret;



	if (!da9063->chip_irq) {

		dev_err(da9063->dev, "No IRQ configured\n");

		return -EINVAL;

	}



	ret = regmap_add_irq_chip(da9063->regmap, da9063->chip_irq,

			IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED,

			da9063->irq_base, &da9063_irq_chip,

			&da9063->regmap_irq);

	if (ret) {

		dev_err(da9063->dev, "Failed to reguest IRQ %d: %d\n",

				da9063->chip_irq, ret);

		return ret;

	}



	return 0;

}



void da9063_irq_exit(struct da9063 *da9063)

{

	regmap_del_irq_chip(da9063->chip_irq, da9063->regmap_irq);

}

include/linux/mfd/da9063/core.h

+38 −0
Original line number Diff line number Diff line
@@ -33,6 +33,41 @@ enum da9063_models { 
	PMIC_DA9063 = 0x61,

};



/* Interrupts */

enum da9063_irqs {

	DA9063_IRQ_ONKEY = 0,

	DA9063_IRQ_ALARM,

	DA9063_IRQ_TICK,

	DA9063_IRQ_ADC_RDY,

	DA9063_IRQ_SEQ_RDY,

	DA9063_IRQ_WAKE,

	DA9063_IRQ_TEMP,

	DA9063_IRQ_COMP_1V2,

	DA9063_IRQ_LDO_LIM,

	DA9063_IRQ_REG_UVOV,

	DA9063_IRQ_VDD_MON,

	DA9063_IRQ_WARN,

	DA9063_IRQ_GPI0,

	DA9063_IRQ_GPI1,

	DA9063_IRQ_GPI2,

	DA9063_IRQ_GPI3,

	DA9063_IRQ_GPI4,

	DA9063_IRQ_GPI5,

	DA9063_IRQ_GPI6,

	DA9063_IRQ_GPI7,

	DA9063_IRQ_GPI8,

	DA9063_IRQ_GPI9,

	DA9063_IRQ_GPI10,

	DA9063_IRQ_GPI11,

	DA9063_IRQ_GPI12,

	DA9063_IRQ_GPI13,

	DA9063_IRQ_GPI14,

	DA9063_IRQ_GPI15,

};



#define DA9063_IRQ_BASE_OFFSET	0

#define DA9063_NUM_IRQ		(DA9063_IRQ_GPI15 + 1 - DA9063_IRQ_BASE_OFFSET)



struct da9063 {

	/* Device */

	struct device	*dev;
@@ -46,10 +81,13 @@ struct da9063 { 
	/* Interrupts */

	int		chip_irq;

	unsigned int	irq_base;

	struct regmap_irq_chip_data *regmap_irq;

};



int da9063_device_init(struct da9063 *da9063, unsigned int irq);

int da9063_irq_init(struct da9063 *da9063);



void da9063_device_exit(struct da9063 *da9063);

void da9063_irq_exit(struct da9063 *da9063);



#endif /* __MFD_DA9063_CORE_H__ */