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

Commit 549931f9 authored by Sundar R Iyer's avatar Sundar R Iyer Committed by Liam Girdwood
Browse files

ab8500-mfd: add regulator support to ab8500 mfd device 



Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-By: default avatarMattias Wallin <mattias.wallin@stericsson.com>
Acked-By: default avatarBengt JONSSON <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarSundar R Iyer <sundar.iyer@stericsson.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 1880a2fc

drivers/mfd/ab8500-core.c

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/mfd/ab8500.h>

#include <linux/regulator/ab8500.h>



/*

 * Interrupt register offsets
@@ -352,6 +353,7 @@ static struct mfd_cell ab8500_devs[] = { 
	{ .name = "ab8500-audio", },

	{ .name = "ab8500-usb", },

	{ .name = "ab8500-pwm", },

	{ .name = "ab8500-regulator", },

};



int __devinit ab8500_init(struct ab8500 *ab8500)
@@ -411,7 +413,7 @@ int __devinit ab8500_init(struct ab8500 *ab8500) 
			goto out_removeirq;

	}



	ret = mfd_add_devices(ab8500->dev, -1, ab8500_devs,

	ret = mfd_add_devices(ab8500->dev, 0, ab8500_devs,

			      ARRAY_SIZE(ab8500_devs), NULL,

			      ab8500->irq_base);

	if (ret)

include/linux/mfd/ab8500.h

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ 
#define AB8500_NR_IRQS			104

#define AB8500_NUM_IRQ_REGS		13



#define AB8500_NUM_REGULATORS   15



/**

 * struct ab8500 - ab8500 internal structure

 * @dev: parent device
@@ -108,14 +110,18 @@ struct ab8500 { 
	u8 oldmask[AB8500_NUM_IRQ_REGS];

};



struct regulator_init_data;



/**

 * struct ab8500_platform_data - AB8500 platform data

 * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used

 * @init: board-specific initialization after detection of ab8500

 * @regulator: machine-specific constraints for regulators

 */

struct ab8500_platform_data {

	int irq_base;

	void (*init) (struct ab8500 *);

	struct regulator_init_data *regulator[AB8500_NUM_REGULATORS];

};



extern int ab8500_write(struct ab8500 *a8500, u16 addr, u8 data);

include/linux/regulator/ab8500.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) ST-Ericsson SA 2010

 *

 * License Terms: GNU General Public License v2

 *

 * Author: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson

 *

 */



#ifndef __LINUX_MFD_AB8500_REGULATOR_H

#define __LINUX_MFD_AB8500_REGULATOR_H



/* AB8500 regulators */

#define AB8500_LDO_AUX1         0

#define AB8500_LDO_AUX2         1

#define AB8500_LDO_AUX3         2

#define AB8500_LDO_INTCORE      3

#define AB8500_LDO_TVOUT        4

#define AB8500_LDO_AUDIO	5

#define AB8500_LDO_ANAMIC1      6

#define AB8500_LDO_ANAMIC2      7

#define AB8500_LDO_DMIC         8

#define AB8500_LDO_ANA          9



#endif