Add resistor-select parameter to the platform data.
Signed-off-by: Johan Hovold <[email protected]>
---
Hi Samuel,
I believe this one needs to go in through mfd as the iio driver
destined for staging-next depends on it.
Thanks,
Johan
include/linux/mfd/lm3533.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/mfd/lm3533.h b/include/linux/mfd/lm3533.h
index 9660feb..594bc59 100644
--- a/include/linux/mfd/lm3533.h
+++ b/include/linux/mfd/lm3533.h
@@ -43,6 +43,7 @@ struct lm3533_ctrlbank {
struct lm3533_als_platform_data {
unsigned pwm_mode:1; /* PWM input mode (default analog) */
+ u8 r_select; /* 1 - 127 (ignored in PWM-mode) */
};
struct lm3533_bl_platform_data {
--
1.7.8.5
Mark the two currently unused zone registers as volatile in regmap for
completeness.
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/mfd/lm3533-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 104faba..0b2879b 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -567,7 +567,7 @@ static bool lm3533_readable_register(struct device *dev, unsigned int reg)
static bool lm3533_volatile_register(struct device *dev, unsigned int reg)
{
switch (reg) {
- case 0x34: /* zone */
+ case 0x34 ... 0x36: /* zone */
case 0x37 ... 0x38: /* adc */
case 0xb0 ... 0xb1: /* fault */
return true;
--
1.7.8.5
Hi Johan,
On Fri, May 18, 2012 at 08:22:45PM +0200, Johan Hovold wrote:
> Add resistor-select parameter to the platform data.
>
> Signed-off-by: Johan Hovold <[email protected]>
> ---
>
> Hi Samuel,
>
> I believe this one needs to go in through mfd as the iio driver
> destined for staging-next depends on it.
It should go along with the iio driver if there is a build dependency.
No doing so will prevent the tree from being bisectable.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
Hi Johan,
On Fri, May 18, 2012 at 08:22:46PM +0200, Johan Hovold wrote:
> Mark the two currently unused zone registers as volatile in regmap for
> completeness.
Applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Sun, May 20, 2012 at 03:13:37PM +0200, Samuel Ortiz wrote:
> Hi Johan,
>
> On Fri, May 18, 2012 at 08:22:45PM +0200, Johan Hovold wrote:
> > Add resistor-select parameter to the platform data.
> >
> > Signed-off-by: Johan Hovold <[email protected]>
> > ---
> >
> > Hi Samuel,
> >
> > I believe this one needs to go in through mfd as the iio driver
> > destined for staging-next depends on it.
> It should go along with the iio driver if there is a build dependency.
> No doing so will prevent the tree from being bisectable.
The sub-drivers already depend on mfd to build as this is where the
header file resides. I can't add another platform data parameter via
staging-next simply because the header file isn't in that tree yet.
As long as mfd is merged first linus' tree will be bisectable.
Thanks,
Johan
Hi Johan,
On Mon, May 21, 2012 at 10:45:39AM +0200, Johan Hovold wrote:
> On Sun, May 20, 2012 at 03:13:37PM +0200, Samuel Ortiz wrote:
> > Hi Johan,
> >
> > On Fri, May 18, 2012 at 08:22:45PM +0200, Johan Hovold wrote:
> > > Add resistor-select parameter to the platform data.
> > >
> > > Signed-off-by: Johan Hovold <[email protected]>
> > > ---
> > >
> > > Hi Samuel,
> > >
> > > I believe this one needs to go in through mfd as the iio driver
> > > destined for staging-next depends on it.
> > It should go along with the iio driver if there is a build dependency.
> > No doing so will prevent the tree from being bisectable.
>
> The sub-drivers already depend on mfd to build as this is where the
> header file resides.
I haven't looked at it, but if the iio driver Kconfig entry depends on
MFD_LM3533, then I can take this change in as no one will be able to build
your iio driver until the MFD driver is merged.
Is that the case ?
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Mon, May 21, 2012 at 11:08:44AM +0200, Samuel Ortiz wrote:
> Hi Johan,
>
> On Mon, May 21, 2012 at 10:45:39AM +0200, Johan Hovold wrote:
> > On Sun, May 20, 2012 at 03:13:37PM +0200, Samuel Ortiz wrote:
> > > Hi Johan,
> > >
> > > On Fri, May 18, 2012 at 08:22:45PM +0200, Johan Hovold wrote:
> > > > Add resistor-select parameter to the platform data.
> > > >
> > > > Signed-off-by: Johan Hovold <[email protected]>
> > > > ---
> > > >
> > > > Hi Samuel,
> > > >
> > > > I believe this one needs to go in through mfd as the iio driver
> > > > destined for staging-next depends on it.
> > > It should go along with the iio driver if there is a build dependency.
> > > No doing so will prevent the tree from being bisectable.
> >
> > The sub-drivers already depend on mfd to build as this is where the
> > header file resides.
> I haven't looked at it, but if the iio driver Kconfig entry depends on
> MFD_LM3533, then I can take this change in as no one will be able to build
> your iio driver until the MFD driver is merged.
> Is that the case ?
Yes, it is.
Thanks,
Johan
Hi Johan,
On Mon, May 21, 2012 at 11:41:38AM +0200, Johan Hovold wrote:
> On Mon, May 21, 2012 at 11:08:44AM +0200, Samuel Ortiz wrote:
> > Hi Johan,
> >
> > On Mon, May 21, 2012 at 10:45:39AM +0200, Johan Hovold wrote:
> > > On Sun, May 20, 2012 at 03:13:37PM +0200, Samuel Ortiz wrote:
> > > > Hi Johan,
> > > >
> > > > On Fri, May 18, 2012 at 08:22:45PM +0200, Johan Hovold wrote:
> > > > > Add resistor-select parameter to the platform data.
> > > > >
> > > > > Signed-off-by: Johan Hovold <[email protected]>
> > > > > ---
> > > > >
> > > > > Hi Samuel,
> > > > >
> > > > > I believe this one needs to go in through mfd as the iio driver
> > > > > destined for staging-next depends on it.
> > > > It should go along with the iio driver if there is a build dependency.
> > > > No doing so will prevent the tree from being bisectable.
> > >
> > > The sub-drivers already depend on mfd to build as this is where the
> > > header file resides.
> > I haven't looked at it, but if the iio driver Kconfig entry depends on
> > MFD_LM3533, then I can take this change in as no one will be able to build
> > your iio driver until the MFD driver is merged.
> > Is that the case ?
>
> Yes, it is.
Applied then.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/