linux-next: build failure after merge of the regmap tree

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 834 bytes --]

Hi Mark,

After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_sync_unlock':
drivers/base/regmap/regmap-irq.c:62:12: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_enable':
drivers/base/regmap/regmap-irq.c:77:37: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_disable':
drivers/base/regmap/regmap-irq.c:85:37: error: 'map' undeclared (first use in this function)

Caused by commit f01ee60fffa4 ("regmap: implement register striding").
Please build test ...

I have used the regmap tree from next-20120410 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the regmap tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

On Wed, Apr 11, 2012 at 02:13:46PM +1000, Stephen Rothwell wrote:

> Caused by commit f01ee60fffa4 ("regmap: implement register striding").
> Please build test ...

Mainline *still* doesn't build with the .configs I routinely use.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

mainline build failure (Was: Re: linux-next: build failure after merge of the regmap tree)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

On Wed, 11 Apr 2012 09:17:11 +0100 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> On Wed, Apr 11, 2012 at 02:13:46PM +1000, Stephen Rothwell wrote:
> 
> > Caused by commit f01ee60fffa4 ("regmap: implement register striding").
> > Please build test ...
> 
> Mainline *still* doesn't build with the .configs I routinely use.

So, what is this failure and what configs do you build?  And has a fix
been submitted?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: mainline build failure (Was: Re: linux-next: build failure after merge of the regmap tree)

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

On Thu, Apr 12, 2012 at 08:07:14AM +1000, Stephen Rothwell wrote:

> So, what is this failure and what configs do you build?  And has a fix
> been submitted?

It's a build failure in the trace subsystem when perf isn't enabled; I
submitted a patch as soon as I noticed the issue which was either during
the merge window or just after -rc1 came out and resubmitted it again
this week.  In response to the reposting Steven Rostedt said he'd pick
the fix up but I'm not sure when that'll happen or how long it'll take
to propagate to mainline, this appears to be one of those areas where
things get processed in batch mode.

I mainly build an ARM config that I can run usefully on my development
boards which is mostly built in and a modular x86 config since x86 seems
to have lots of issues with modular stuff.  I should be able to adjust
the ARM config to build, I didn't yet mostly because I wasn't expecting
the issue to be ignored for so long.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the regmap tree

[Pierre-Louis Bossart]

>>> I'll drop this, hopefully it can be re-added in future.
> 
>> We fixed this problem in October, must be a patch that wasn't merged while
>> upstreaming. If you give me 2-3 hours I can send the fix.
> 
> I already pushed out the revert (but we can re-apply), and I'm also
> about to send another mail about how I can't build any of the other
> drivers separately which was why it was only this one that got applied
> in the first case.

Sounds like we'll submit a v2 then, we've got small additional fixes 
that were added for UCM integration. Sorry for the noise and delays in 
responding with last week's break.

Re: linux-next: build failure after merge of the regmap tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

On Mon, Nov 30, 2020 at 12:07:17PM -0600, Pierre-Louis Bossart wrote:
> On 11/30/20 11:59 AM, Mark Brown wrote:

> > I'll drop this, hopefully it can be re-added in future.

> We fixed this problem in October, must be a patch that wasn't merged while
> upstreaming. If you give me 2-3 hours I can send the fix.

I already pushed out the revert (but we can re-apply), and I'm also
about to send another mail about how I can't build any of the other
drivers separately which was why it was only this one that got applied
in the first case.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the regmap tree

[Pierre-Louis Bossart]

On 11/30/20 11:59 AM, Mark Brown wrote:
> On Fri, Nov 27, 2020 at 06:24:11PM +1100, Stephen Rothwell wrote:
>> Caused by commit
>>
>>    6f4a038b9967 ("ASoC/SoundWire: rt715-sdca: First version of rt715 sdw sdca codec driver")
>>
>> I have reverted that commit for today.
> 
> I'll drop this, hopefully it can be re-added in future.

We fixed this problem in October, must be a patch that wasn't merged 
while upstreaming. If you give me 2-3 hours I can send the fix.

Re: linux-next: build failure after merge of the regmap tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

On Fri, Nov 27, 2020 at 06:24:11PM +1100, Stephen Rothwell wrote:
> Caused by commit
> 
>   6f4a038b9967 ("ASoC/SoundWire: rt715-sdca: First version of rt715 sdw sdca codec driver")
> 
> I have reverted that commit for today.

I'll drop this, hopefully it can be re-added in future.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1035 bytes --]

Hi all,

After merging the regmap tree, today's linux-next build (powerpc
allyesconfig) failed like this:

ld: sound/soc/codecs/rt715-sdca.o:(.opd+0xf0): multiple definition of `rt715_init'; sound/soc/codecs/rt715.o:(.opd+0x108): first defined here
ld: sound/soc/codecs/rt715-sdca.o: in function `.rt715_init':
rt715-sdca.c:(.text.rt715_init+0x0): multiple definition of `.rt715_init'; sound/soc/codecs/rt715.o:rt715.c:(.text.rt715_init+0x0): first defined here
ld: sound/soc/codecs/rt715-sdca.o:(.opd+0x108): multiple definition of `rt715_io_init'; sound/soc/codecs/rt715.o:(.opd+0x120): first defined here
ld: sound/soc/codecs/rt715-sdca.o: in function `.rt715_io_init':
rt715-sdca.c:(.text.rt715_io_init+0x0): multiple definition of `.rt715_io_init'; sound/soc/codecs/rt715.o:rt715.c:(.text.rt715_io_init+0x0): first defined here

Caused by commit

  6f4a038b9967 ("ASoC/SoundWire: rt715-sdca: First version of rt715 sdw sdca codec driver")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

Hi Mark,

After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/base/regmap/regmap.o: In function `regmap_unlock_hwlock':
regmap.c:(.text+0x13a5): undefined reference to `__hwspin_unlock'
drivers/base/regmap/regmap.o: In function `regmap_unlock_hwlock_irq':
regmap.c:(.text+0x13d8): undefined reference to `__hwspin_unlock'
drivers/base/regmap/regmap.o: In function `regmap_unlock_hwlock_irqrestore':
regmap.c:(.text+0x140a): undefined reference to `__hwspin_unlock'
drivers/base/regmap/regmap.o: In function `regmap_lock_hwlock':
regmap.c:(.text+0x144a): undefined reference to `__hwspin_lock_timeout'
drivers/base/regmap/regmap.o: In function `regmap_lock_hwlock_irq':
regmap.c:(.text+0x148d): undefined reference to `__hwspin_lock_timeout'
drivers/base/regmap/regmap.o: In function `regmap_lock_hwlock_irqsave':
regmap.c:(.text+0x14cf): undefined reference to `__hwspin_lock_timeout'
drivers/base/regmap/regmap.o: In function `__regmap_init':
(.text+0x5139): undefined reference to `hwspin_lock_free'
drivers/base/regmap/regmap.o: In function `__regmap_init':
(.text+0x5e25): undefined reference to `hwspin_lock_request_specific'

Presumably caused by commit

  8698b9364710 ("regmap: Add hardware spinlock support")

Note that CONFIG_HWSPINLOCK=m for this build, but CONFIG_REGMAP=y

I have used the version of the regmap tree from next-20171018 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 934 bytes --]

Hi Mark,

After merging the regmap tree, today's linux-next build
(x86_64_allmodconfig) failed like this:

drivers/base/regmap/regcache-lzo.c: In function 'regcache_lzo_sync':
drivers/base/regmap/regcache-lzo.c:344:2: error: implicit declaration of function 'for_each_set_bit_from' [-Werror=implicit-function-declaration]
drivers/base/regmap/regcache-lzo.c:345:41: error: expected ';' before '{' token
drivers/base/regmap/regcache-lzo.c:340:6: warning: unused variable 'ret' [-Wunused-variable]
drivers/base/regmap/regcache-lzo.c:338:15: warning: unused variable 'val' [-Wunused-variable]
drivers/base/regmap/regcache-lzo.c:368:1: warning: no return statement in function returning non-void [-Wreturn-type]

Caused by commit ac8d91c80190 ("regmap: Supply ranges to the sync operations").

I have used the regmap tree form next-20120224 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the regmap tree

[Grant Likely]

On Fri, Dec 16, 2011 at 1:15 AM, Ashish Jangam
<Ashish.Jangam@kpitcummins.com> wrote:
> -----Original Message-----
> From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
> Sent: Friday, December 16, 2011 1:41 PM
> To: Ashish Jangam
> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
> Subject: Re: linux-next: build failure after merge of the regmap tree
>
> On Fri, Dec 16, 2011 at 12:19 AM, Ashish Jangam
> <Ashish.Jangam@kpitcummins.com> wrote:
>>
>>
>> -----Original Message-----
>> From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
>> Sent: Thursday, December 15, 2011 11:55 PM
>> To: Ashish Jangam
>> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
>> Subject: Re: linux-next: build failure after merge of the regmap tree
>>
>> On Thu, Dec 15, 2011 at 2:25 AM, Ashish Jangam
>> <ashish.jangam@kpitcummins.com> wrote:
>>> Fixes DA9052 GPIO errors.
>>>
>>> This patch is functionally tested on Samsung SMDKV6410.
>>>
>>> Signed-off-by: David Dajun Chen <dchen@diasemi.com>
>>> Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
>>> ---
>>>  drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
>>>  include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++
>>
>> gpio-da9052.c is the only users of mfd/da9052/gpio.h.  Why is this
>> include file needed?  The #defines can simply stay in the .c file.
>> I've picked up the patch, but modified it to keep the header defines
>> in the .c file.  If there is a reason this won't work, then please let
>> me know.
>>
>> This header file is shared between GPIO and LED module. I have already
>> posted this LED long back got ACK but did not got merged due to its
>> dependency on MFD module.
>
> Are the LEDs attached to GPIOs?  If so, then is there a reason that
> the leds-gpio driver can't be used?
>
> Oh yes we can use leds-gpio driver.

Please do, and keep the gpio internal details in the .c file.  Thanks,

g.

RE: linux-next: build failure after merge of the regmap tree

[Ashish Jangam]

-----Original Message-----
From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
Sent: Friday, December 16, 2011 1:41 PM
To: Ashish Jangam
Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
Subject: Re: linux-next: build failure after merge of the regmap tree

On Fri, Dec 16, 2011 at 12:19 AM, Ashish Jangam
<Ashish.Jangam@kpitcummins.com> wrote:
>
>
> -----Original Message-----
> From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
> Sent: Thursday, December 15, 2011 11:55 PM
> To: Ashish Jangam
> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
> Subject: Re: linux-next: build failure after merge of the regmap tree
>
> On Thu, Dec 15, 2011 at 2:25 AM, Ashish Jangam
> <ashish.jangam@kpitcummins.com> wrote:
>> Fixes DA9052 GPIO errors.
>>
>> This patch is functionally tested on Samsung SMDKV6410.
>>
>> Signed-off-by: David Dajun Chen <dchen@diasemi.com>
>> Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
>> ---
>>  drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
>>  include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++
>
> gpio-da9052.c is the only users of mfd/da9052/gpio.h.  Why is this
> include file needed?  The #defines can simply stay in the .c file.
> I've picked up the patch, but modified it to keep the header defines
> in the .c file.  If there is a reason this won't work, then please let
> me know.
>
> This header file is shared between GPIO and LED module. I have already
> posted this LED long back got ACK but did not got merged due to its
> dependency on MFD module.

Are the LEDs attached to GPIOs?  If so, then is there a reason that
the leds-gpio driver can't be used?

Oh yes we can use leds-gpio driver.

g.

Re: linux-next: build failure after merge of the regmap tree

[Grant Likely]

On Fri, Dec 16, 2011 at 12:19 AM, Ashish Jangam
<Ashish.Jangam@kpitcummins.com> wrote:
>
>
> -----Original Message-----
> From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
> Sent: Thursday, December 15, 2011 11:55 PM
> To: Ashish Jangam
> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
> Subject: Re: linux-next: build failure after merge of the regmap tree
>
> On Thu, Dec 15, 2011 at 2:25 AM, Ashish Jangam
> <ashish.jangam@kpitcummins.com> wrote:
>> Fixes DA9052 GPIO errors.
>>
>> This patch is functionally tested on Samsung SMDKV6410.
>>
>> Signed-off-by: David Dajun Chen <dchen@diasemi.com>
>> Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
>> ---
>>  drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
>>  include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++
>
> gpio-da9052.c is the only users of mfd/da9052/gpio.h.  Why is this
> include file needed?  The #defines can simply stay in the .c file.
> I've picked up the patch, but modified it to keep the header defines
> in the .c file.  If there is a reason this won't work, then please let
> me know.
>
> This header file is shared between GPIO and LED module. I have already
> posted this LED long back got ACK but did not got merged due to its
> dependency on MFD module.

Are the LEDs attached to GPIOs?  If so, then is there a reason that
the leds-gpio driver can't be used?

g.

RE: linux-next: build failure after merge of the regmap tree

[Ashish Jangam]

-----Original Message-----
From: glikely@secretlab.ca [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely
Sent: Thursday, December 15, 2011 11:55 PM
To: Ashish Jangam
Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Mark Brown; Dajun
Subject: Re: linux-next: build failure after merge of the regmap tree

On Thu, Dec 15, 2011 at 2:25 AM, Ashish Jangam
<ashish.jangam@kpitcummins.com> wrote:
> Fixes DA9052 GPIO errors.
>
> This patch is functionally tested on Samsung SMDKV6410.
>
> Signed-off-by: David Dajun Chen <dchen@diasemi.com>
> Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
> ---
>  drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
>  include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++

gpio-da9052.c is the only users of mfd/da9052/gpio.h.  Why is this
include file needed?  The #defines can simply stay in the .c file.
I've picked up the patch, but modified it to keep the header defines
in the .c file.  If there is a reason this won't work, then please let
me know.

This header file is shared between GPIO and LED module. I have already 
posted this LED long back got ACK but did not got merged due to its
dependency on MFD module.  

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: linux-next: build failure after merge of the regmap tree

[Grant Likely]

On Thu, Dec 15, 2011 at 2:25 AM, Ashish Jangam
<ashish.jangam@kpitcummins.com> wrote:
> Fixes DA9052 GPIO errors.
>
> This patch is functionally tested on Samsung SMDKV6410.
>
> Signed-off-by: David Dajun Chen <dchen@diasemi.com>
> Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
> ---
>  drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
>  include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++

gpio-da9052.c is the only users of mfd/da9052/gpio.h.  Why is this
include file needed?  The #defines can simply stay in the .c file.
I've picked up the patch, but modified it to keep the header defines
in the .c file.  If there is a reason this won't work, then please let
me know.

g.

>  2 files changed, 53 insertions(+), 32 deletions(-)
>  create mode 100644 include/linux/mfd/da9052/gpio.h
> diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
> index 038f5eb..a404ebd 100644
> --- a/drivers/gpio/gpio-da9052.c
> +++ b/drivers/gpio/gpio-da9052.c
> @@ -24,26 +24,6 @@
>  #include <linux/mfd/da9052/pdata.h>
>  #include <linux/mfd/da9052/gpio.h>
>
> -#define DA9052_INPUT                           1
> -#define DA9052_OUTPUT_OPENDRAIN                2
> -#define DA9052_OUTPUT_PUSHPULL                 3
> -
> -#define DA9052_SUPPLY_VDD_IO1                  0
> -
> -#define DA9052_DEBOUNCING_OFF                  0
> -#define DA9052_DEBOUNCING_ON                   1
> -
> -#define DA9052_OUTPUT_LOWLEVEL                 0
> -
> -#define DA9052_ACTIVE_LOW                      0
> -#define DA9052_ACTIVE_HIGH                     1
> -
> -#define DA9052_GPIO_MAX_PORTS_PER_REGISTER     8
> -#define DA9052_GPIO_SHIFT_COUNT(no)            (no%8)
> -#define DA9052_GPIO_MASK_UPPER_NIBBLE          0xF0
> -#define DA9052_GPIO_MASK_LOWER_NIBBLE          0x0F
> -#define DA9052_GPIO_NIBBLE_SHIFT               4
> -
>  struct da9052_gpio {
>        struct da9052 *da9052;
>        struct gpio_chip gp;
> @@ -104,33 +84,26 @@ static int da9052_gpio_get(struct gpio_chip *gc, unsigned offset)
>  static void da9052_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
>  {
>        struct da9052_gpio *gpio = to_da9052_gpio(gc);
> -       unsigned char register_value = 0;
>        int ret;
>
>        if (da9052_gpio_port_odd(offset)) {
> -               if (value) {
> -                       register_value = DA9052_GPIO_ODD_PORT_MODE;
>                        ret = da9052_reg_update(gpio->da9052, (offset >> 1) +
>                                                DA9052_GPIO_0_1_REG,
>                                                DA9052_GPIO_ODD_PORT_MODE,
> -                                               register_value);
> +                                               value << DA9052_GPIO_ODD_SHIFT);
>                        if (ret != 0)
>                                dev_err(gpio->da9052->dev,
>                                        "Failed to updated gpio odd reg,%d",
>                                        ret);
> -               }
>        } else {
> -               if (value) {
> -                       register_value = DA9052_GPIO_EVEN_PORT_MODE;
>                        ret = da9052_reg_update(gpio->da9052, (offset >> 1) +
>                                                DA9052_GPIO_0_1_REG,
>                                                DA9052_GPIO_EVEN_PORT_MODE,
> -                                               register_value);
> +                                               value << DA9052_GPIO_EVEN_SHIFT);
>                        if (ret != 0)
>                                dev_err(gpio->da9052->dev,
>                                        "Failed to updated gpio even reg,%d",
>                                        ret);
> -               }
>        }
>  }
>
> @@ -201,9 +174,9 @@ static struct gpio_chip reference_gp __devinitdata = {
>        .direction_input = da9052_gpio_direction_input,
>        .direction_output = da9052_gpio_direction_output,
>        .to_irq = da9052_gpio_to_irq,
> -       .can_sleep = 1;
> -       .ngpio = 16;
> -       .base = -1;
> +       .can_sleep = 1,
> +       .ngpio = 16,
> +       .base = -1,
>  };
>
>  static int __devinit da9052_gpio_probe(struct platform_device *pdev)
> diff --git a/include/linux/mfd/da9052/gpio.h b/include/linux/mfd/da9052/gpio.h
> new file mode 100644
> index 0000000..c427670
> --- /dev/null
> +++ b/include/linux/mfd/da9052/gpio.h
> @@ -0,0 +1,48 @@
> +/*
> + * GPIO module declarations for DA9052 PMICs.
> + *
> + * Copyright(c) 2011 Dialog Semiconductor Ltd.
> + *
> + * 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.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + */
> +
> +#ifndef __LINUX_MFD_DA9052_GPIO_H
> +#define __LINUX_MFD_DA9052_GPIO_H
> +
> +#define DA9052_INPUT                           1
> +#define DA9052_OUTPUT_OPENDRAIN                2
> +#define DA9052_OUTPUT_PUSHPULL                 3
> +
> +#define DA9052_SUPPLY_VDD_IO1                  0
> +
> +#define DA9052_DEBOUNCING_OFF                  0
> +#define DA9052_DEBOUNCING_ON                   1
> +
> +#define DA9052_OUTPUT_LOWLEVEL                 0
> +
> +#define DA9052_ACTIVE_LOW                      0
> +#define DA9052_ACTIVE_HIGH                     1
> +
> +#define DA9052_GPIO_MAX_PORTS_PER_REGISTER     8
> +#define DA9052_GPIO_SHIFT_COUNT(no)            (no%8)
> +#define DA9052_GPIO_MASK_UPPER_NIBBLE          0xF0
> +#define DA9052_GPIO_MASK_LOWER_NIBBLE          0x0F
> +#define DA9052_GPIO_NIBBLE_SHIFT               4
> +#define DA9052_IRQ_GPI0                        16
> +#define DA9052_GPIO_ODD_SHIFT                  7
> +#define DA9052_GPIO_EVEN_SHIFT                 3
> +
> +#endif /* __LINUX_MFD_DA9052_GPIO_H */
> ---
> On Thu, 2011-12-15 at 14:31 +0530, Ashish Jangam wrote:
>>
>> Hi Mark,
>>
>> After merging the regmap tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpio/gpio-da9052.c:25:35: fatal error: linux/mfd/da9052/gpio.h: No such file or directory
>>
>> So, it looks like this would never have built
>> (include/linux/mfd/da9052/gpio.h never existed) but noone ever enabled
>> CONFIG_PMIC_DA9052 before (which CONFIG_GPIO_DA9052 depends on).
>>
>> drivers/gpio/gpio-da9052.c was added with commit 07bfc9152365 ("GPIO:
>> DA9052 GPIO module v3") in v3.1-rc1.
>>
>> I have added this patch for today:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 15 Dec 2011 16:59:59 +1100
>> Subject: [PATCH] gpio: disable broken driver
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/gpio/Kconfig |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
>> index 79199f4..e338013 100644
>> --- a/drivers/gpio/Kconfig
>> +++ b/drivers/gpio/Kconfig
>> @@ -70,7 +70,7 @@ config GPIO_GENERIC
>>
>>  config GPIO_DA9052
>>       tristate "Dialog DA9052 GPIO"
>> -     depends on PMIC_DA9052
>> +     depends on PMIC_DA9052 && BROKEN
>>       help
>>         Say yes here to enable the GPIO driver for the DA9052 chip.
>>
>> --
>> 1.7.7.3
>>
>
>
> --
> 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/



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: linux-next: build failure after merge of the regmap tree

[Ashish Jangam]

Fixes DA9052 GPIO errors.

This patch is functionally tested on Samsung SMDKV6410.

Signed-off-by: David Dajun Chen <dchen@diasemi.com>
Signed-off-by: Ashish Jangam <ashish.jangam@kpitcummins.com>
---
 drivers/gpio/gpio-da9052.c      |   37 ++++--------------------------
 include/linux/mfd/da9052/gpio.h |   48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100644 include/linux/mfd/da9052/gpio.h
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 038f5eb..a404ebd 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -24,26 +24,6 @@
 #include <linux/mfd/da9052/pdata.h>
 #include <linux/mfd/da9052/gpio.h>
 
-#define DA9052_INPUT				1
-#define DA9052_OUTPUT_OPENDRAIN		2
-#define DA9052_OUTPUT_PUSHPULL			3
-
-#define DA9052_SUPPLY_VDD_IO1			0
-
-#define DA9052_DEBOUNCING_OFF			0
-#define DA9052_DEBOUNCING_ON			1
-
-#define DA9052_OUTPUT_LOWLEVEL			0
-
-#define DA9052_ACTIVE_LOW			0
-#define DA9052_ACTIVE_HIGH			1
-
-#define DA9052_GPIO_MAX_PORTS_PER_REGISTER	8
-#define DA9052_GPIO_SHIFT_COUNT(no)		(no%8)
-#define DA9052_GPIO_MASK_UPPER_NIBBLE		0xF0
-#define DA9052_GPIO_MASK_LOWER_NIBBLE		0x0F
-#define DA9052_GPIO_NIBBLE_SHIFT		4
-
 struct da9052_gpio {
 	struct da9052 *da9052;
 	struct gpio_chip gp;
@@ -104,33 +84,26 @@ static int da9052_gpio_get(struct gpio_chip *gc, unsigned offset)
 static void da9052_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
 {
 	struct da9052_gpio *gpio = to_da9052_gpio(gc);
-	unsigned char register_value = 0;
 	int ret;
 
 	if (da9052_gpio_port_odd(offset)) {
-		if (value) {
-			register_value = DA9052_GPIO_ODD_PORT_MODE;
 			ret = da9052_reg_update(gpio->da9052, (offset >> 1) +
 						DA9052_GPIO_0_1_REG,
 						DA9052_GPIO_ODD_PORT_MODE,
-						register_value);
+						value << DA9052_GPIO_ODD_SHIFT);
 			if (ret != 0)
 				dev_err(gpio->da9052->dev,
 					"Failed to updated gpio odd reg,%d",
 					ret);
-		}
 	} else {
-		if (value) {
-			register_value = DA9052_GPIO_EVEN_PORT_MODE;
 			ret = da9052_reg_update(gpio->da9052, (offset >> 1) +
 						DA9052_GPIO_0_1_REG,
 						DA9052_GPIO_EVEN_PORT_MODE,
-						register_value);
+						value << DA9052_GPIO_EVEN_SHIFT);
 			if (ret != 0)
 				dev_err(gpio->da9052->dev,
 					"Failed to updated gpio even reg,%d",
 					ret);
-		}
 	}
 }
 
@@ -201,9 +174,9 @@ static struct gpio_chip reference_gp __devinitdata = {
 	.direction_input = da9052_gpio_direction_input,
 	.direction_output = da9052_gpio_direction_output,
 	.to_irq = da9052_gpio_to_irq,
-	.can_sleep = 1;
-	.ngpio = 16;
-	.base = -1;
+	.can_sleep = 1,
+	.ngpio = 16,
+	.base = -1,
 };
 
 static int __devinit da9052_gpio_probe(struct platform_device *pdev)
diff --git a/include/linux/mfd/da9052/gpio.h b/include/linux/mfd/da9052/gpio.h
new file mode 100644
index 0000000..c427670
--- /dev/null
+++ b/include/linux/mfd/da9052/gpio.h
@@ -0,0 +1,48 @@
+/*
+ * GPIO module declarations for DA9052 PMICs.
+ *
+ * Copyright(c) 2011 Dialog Semiconductor Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef __LINUX_MFD_DA9052_GPIO_H
+#define __LINUX_MFD_DA9052_GPIO_H
+
+#define DA9052_INPUT				1
+#define DA9052_OUTPUT_OPENDRAIN		2
+#define DA9052_OUTPUT_PUSHPULL			3
+
+#define DA9052_SUPPLY_VDD_IO1			0
+
+#define DA9052_DEBOUNCING_OFF			0
+#define DA9052_DEBOUNCING_ON			1
+
+#define DA9052_OUTPUT_LOWLEVEL			0
+
+#define DA9052_ACTIVE_LOW			0
+#define DA9052_ACTIVE_HIGH			1
+
+#define DA9052_GPIO_MAX_PORTS_PER_REGISTER	8
+#define DA9052_GPIO_SHIFT_COUNT(no)		(no%8)
+#define DA9052_GPIO_MASK_UPPER_NIBBLE		0xF0
+#define DA9052_GPIO_MASK_LOWER_NIBBLE		0x0F
+#define DA9052_GPIO_NIBBLE_SHIFT		4
+#define DA9052_IRQ_GPI0			16
+#define DA9052_GPIO_ODD_SHIFT			7
+#define DA9052_GPIO_EVEN_SHIFT			3
+
+#endif /* __LINUX_MFD_DA9052_GPIO_H */
---
On Thu, 2011-12-15 at 14:31 +0530, Ashish Jangam wrote:
> 
> Hi Mark,
> 
> After merging the regmap tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpio/gpio-da9052.c:25:35: fatal error: linux/mfd/da9052/gpio.h: No such file or directory
> 
> So, it looks like this would never have built
> (include/linux/mfd/da9052/gpio.h never existed) but noone ever enabled
> CONFIG_PMIC_DA9052 before (which CONFIG_GPIO_DA9052 depends on).
> 
> drivers/gpio/gpio-da9052.c was added with commit 07bfc9152365 ("GPIO:
> DA9052 GPIO module v3") in v3.1-rc1.
> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 15 Dec 2011 16:59:59 +1100
> Subject: [PATCH] gpio: disable broken driver
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpio/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 79199f4..e338013 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -70,7 +70,7 @@ config GPIO_GENERIC
>  
>  config GPIO_DA9052
>  	tristate "Dialog DA9052 GPIO"
> -	depends on PMIC_DA9052
> +	depends on PMIC_DA9052 && BROKEN
>  	help
>  	  Say yes here to enable the GPIO driver for the DA9052 chip.
>  
> -- 
> 1.7.7.3
> 

RE: linux-next: build failure after merge of the regmap tree

[Ashish Jangam]

> -----Original Message-----
> From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com]
> Sent: Thursday, December 15, 2011 11:48 AM
> To: Stephen Rothwell
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Ashish
> Jangam; Grant Likely; David Dajun Chen
> Subject: Re: linux-next: build failure after merge of the regmap tree
> 
> On Thu, Dec 15, 2011 at 05:05:17PM +1100, Stephen Rothwell wrote:
> 
> > drivers/gpio/gpio-da9052.c:25:35: fatal error: linux/mfd/da9052/gpio.h:
> No such file or directory
> 
> > So, it looks like this would never have built
> > (include/linux/mfd/da9052/gpio.h never existed) but noone ever enabled
> > CONFIG_PMIC_DA9052 before (which CONFIG_GPIO_DA9052 depends on).
> 
> > drivers/gpio/gpio-da9052.c was added with commit 07bfc9152365 ("GPIO:
> > DA9052 GPIO module v3") in v3.1-rc1.
> 
> The issue here is that the GPIO driver was merged prior to review being
> completed for the MFD and then problems with the MFD caused lots of
> changes in the rest of the series.  The MFD review is now fine so it's
> been merged (via regmap due to use of new regmap features) but the GPIO
> driver needs updating.
> 
> Ashish or Daneil, could you please send a patch fixing this?  Possibly
> just a case of adding the new header.
I have a fix for this issue will just take an incremental patch and post it.

Re: linux-next: build failure after merge of the regmap tree

[Mark Brown]

On Thu, Dec 15, 2011 at 05:05:17PM +1100, Stephen Rothwell wrote:

> drivers/gpio/gpio-da9052.c:25:35: fatal error: linux/mfd/da9052/gpio.h: No such file or directory

> So, it looks like this would never have built
> (include/linux/mfd/da9052/gpio.h never existed) but noone ever enabled
> CONFIG_PMIC_DA9052 before (which CONFIG_GPIO_DA9052 depends on).

> drivers/gpio/gpio-da9052.c was added with commit 07bfc9152365 ("GPIO:
> DA9052 GPIO module v3") in v3.1-rc1.

The issue here is that the GPIO driver was merged prior to review being
completed for the MFD and then problems with the MFD caused lots of
changes in the rest of the series.  The MFD review is now fine so it's
been merged (via regmap due to use of new regmap features) but the GPIO
driver needs updating.

Ashish or Daneil, could you please send a patch fixing this?  Possibly
just a case of adding the new header.

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

Hi Mark,

After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mfd/da9052-spi.c: In function 'da9052_spi_probe':
drivers/mfd/da9052-spi.c:42:2: error: 'da9052_regmap_config' undeclared (first use in this function)

Caused by commit cfe04478fa1b ("MFD: DA9052/53 MFD core module add SPI
support v2").  Really, was this ever build tested?

da9052_regmap_config is defined in drivers/mfd/da9052-core.c but not
declared in any header file.

drivers/regulator/da9052-regulator.c: In function 'da9052_regulator_probe':
drivers/regulator/da9052-regulator.c:550:11: error: too few arguments to function 'regulator_register'
include/linux/regulator/driver.h:215:23: note: declared here

Caused by commit 08bf1c0ae97f ("regulator: DA9052/53 Regulator support")
from the regulator tree interacting with commit 2c043bcbf287 ("regulator:
pass additional of_node to regulator_register()") also from the regulator
tree.  Again, building the above file depends on CONFIG_PMIC_DA9052 which
noone ever set before.

I have used the regmap tree from next-20111214 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

Hi Mark,

After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpio/gpio-da9052.c:25:35: fatal error: linux/mfd/da9052/gpio.h: No such file or directory

So, it looks like this would never have built
(include/linux/mfd/da9052/gpio.h never existed) but noone ever enabled
CONFIG_PMIC_DA9052 before (which CONFIG_GPIO_DA9052 depends on).

drivers/gpio/gpio-da9052.c was added with commit 07bfc9152365 ("GPIO:
DA9052 GPIO module v3") in v3.1-rc1.

I have added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Dec 2011 16:59:59 +1100
Subject: [PATCH] gpio: disable broken driver

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpio/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 79199f4..e338013 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -70,7 +70,7 @@ config GPIO_GENERIC
 
 config GPIO_DA9052
 	tristate "Dialog DA9052 GPIO"
-	depends on PMIC_DA9052
+	depends on PMIC_DA9052 && BROKEN
 	help
 	  Say yes here to enable the GPIO driver for the DA9052 chip.
 
-- 
1.7.7.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the regmap tree

[Mark Brown]

On Thu, Sep 29, 2011 at 03:18:41PM +1000, Stephen Rothwell wrote:

> After merging the regmap tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

Fixed now, thanks for reporting.

linux-next: build failure after merge of the regmap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

Hi Mark,

After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/base/regmap/regcache.c: In function 'regcache_cache_only':
drivers/base/regmap/regcache.c:276:2: error: 'struct regmap' has no member named 'sync_lock'
drivers/base/regmap/regcache.c:278:19: error: 'struct regmap' has no member named 'sync_lock'

Caused by commit 38f6916976f9 ("regmap: Grab the lock in
regcache_cache_only()").

I have used the regmap tree from next-20110928 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]