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

Commit 509bd476 authored by Lukasz Majewski's avatar Lukasz Majewski Committed by Samuel Ortiz
Browse files

mfd: Support for ICs compliant with max8998 



Signed-off-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9d92492f

drivers/mfd/max8998.c

+3 −2
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c, 
	max8998->dev = &i2c->dev;

	max8998->i2c = i2c;

	max8998->irq = i2c->irq;

	max8998->type = id->driver_data;

	if (pdata) {

		max8998->ono = pdata->ono;

		max8998->irq_base = pdata->irq_base;
@@ -169,8 +170,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c) 
}



static const struct i2c_device_id max8998_i2c_id[] = {

	{ "max8998", 0 },

	{ "lp3974", 0 },

	{ "max8998", TYPE_MAX8998 },

	{ "lp3974", TYPE_LP3974},

	{ }

};

MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);

include/linux/mfd/max8998-private.h

+11 −0
Original line number Diff line number Diff line
@@ -101,6 +101,13 @@ enum { 
	MAX8998_IRQ_NR,

};



/* MAX8998 various variants */

enum {

	TYPE_MAX8998 = 0, /* Default */

	TYPE_LP3974,	/* National version of MAX8998 */

	TYPE_LP3979,	/* Added AVS */

};



#define MAX8998_IRQ_DCINF_MASK		(1 << 2)

#define MAX8998_IRQ_DCINR_MASK		(1 << 3)

#define MAX8998_IRQ_JIGF_MASK		(1 << 4)
@@ -123,6 +130,8 @@ enum { 
#define MAX8998_IRQ_LOBAT1_MASK		(1 << 0)

#define MAX8998_IRQ_LOBAT2_MASK		(1 << 1)



#define MAX8998_ENRAMP                  (1 << 4)



/**

 * struct max8998_dev - max8998 master device for sub-drivers

 * @dev: master device of the chip (can be used to access platform data)
@@ -135,6 +144,7 @@ enum { 
 * @ono: power onoff IRQ number for max8998

 * @irq_masks_cur: currently active value

 * @irq_masks_cache: cached hardware value

 * @type: indicate which max8998 "variant" is used

 */

struct max8998_dev {

	struct device *dev;
@@ -148,6 +158,7 @@ struct max8998_dev { 
	int ono;

	u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS];

	u8 irq_masks_cache[MAX8998_NUM_IRQ_REGS];

	int type;

};



int max8998_irq_init(struct max8998_dev *max8998);