Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754889Ab0GNKNk (ORCPT ); Wed, 14 Jul 2010 06:13:40 -0400 Received: from mga11.intel.com ([192.55.52.93]:21446 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753565Ab0GNKNi (ORCPT ); Wed, 14 Jul 2010 06:13:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,201,1278313200"; d="scan'208";a="817988093" Date: Wed, 14 Jul 2010 12:13:31 +0200 From: Samuel Ortiz To: Sundar Iyer , lrg@slimlogic.co.uk Cc: broonie@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, STEricsson_nomadik_linux@list.st.com, Linus Walleij , "Acked-By: Mattias Wallin" , "Acked-By: Bengt JONSSON" Subject: Re: [PATCH 1/3] ab8500-mfd: add regulator support to ab8500 mfd device Message-ID: <20100714101330.GD2771@sortiz-mobl> References: <1279002090-11234-1-git-send-email-sundar.iyer@stericsson.com> <1279002090-11234-2-git-send-email-sundar.iyer@stericsson.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1279002090-11234-2-git-send-email-sundar.iyer@stericsson.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3964 Lines: 127 On Tue, Jul 13, 2010 at 11:51:28AM +0530, Sundar Iyer wrote: > From: Sundar R Iyer > > Acked-by: Linus Walleij > Acked-By: Mattias Wallin > Acked-By: Bengt JONSSON > Signed-off-by: Sundar R Iyer Liam, I guess this should make it upstream through your regulator tree. For the mfd part though: Acked-by: Samuel Ortiz Cheers, Samuel. > --- > drivers/mfd/ab8500-core.c | 4 +++- > include/linux/mfd/ab8500.h | 6 ++++++ > include/linux/regulator/ab8500.h | 25 +++++++++++++++++++++++++ > 3 files changed, 34 insertions(+), 1 deletions(-) > create mode 100644 include/linux/regulator/ab8500.h > > diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c > index f3d26fa..defa786 100644 > --- a/drivers/mfd/ab8500-core.c > +++ b/drivers/mfd/ab8500-core.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > /* > * 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) > diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h > index b63ff3b..f5cec45 100644 > --- a/include/linux/mfd/ab8500.h > +++ b/include/linux/mfd/ab8500.h > @@ -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); > diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h > new file mode 100644 > index 0000000..f509877 > --- /dev/null > +++ b/include/linux/regulator/ab8500.h > @@ -0,0 +1,25 @@ > +/* > + * Copyright (C) ST-Ericsson SA 2010 > + * > + * License Terms: GNU General Public License v2 > + * > + * Author: Sundar Iyer 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 > -- > 1.7.0 > -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/