Patchwork mips: bcm47xx: select GPIOLIB for BCMA on bcm47xx platform

login
register
mail settings
Submitter Arend van Spriel
Date Jan. 4, 2013, 6:10 p.m.
Message ID <1357323005-28008-1-git-send-email-arend@broadcom.com>
Download mbox | patch
Permalink /patch/4759/
State Accepted
Delegated to: Ralf Baechle
Headers show

Comments

Arend van Spriel - Jan. 4, 2013, 6:10 p.m.
The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
options depend on GPIOLIB without explicitly selecting it
so it results in a warning when GPIOLIB is not set:

scripts/kconfig/conf --oldconfig Kconfig
warning: (BCM47XX_BCMA) selects BCMA_DRIVER_GPIO ... unmet direct
	dependencies (BCMA_POSSIBLE && BCMA && GPIOLIB)
warning: (BCM47XX_SSB) selects SSB_DRIVER_GPIO ... unmet direct
	dependencies (SSB_POSSIBLE && SSB && GPIOLIB)

which subsequently results in compile errors.

Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
Fixing a Kconfig issue in our nightly Jenkins build.

Gr. AvS
---
 arch/mips/bcm47xx/Kconfig |    3 +++
 1 file changed, 3 insertions(+)
Hauke Mehrtens - Jan. 4, 2013, 7:48 p.m.
On 01/04/2013 07:10 PM, Arend van Spriel wrote:
> The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
> respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
> options depend on GPIOLIB without explicitly selecting it
> so it results in a warning when GPIOLIB is not set:
> 
> scripts/kconfig/conf --oldconfig Kconfig
> warning: (BCM47XX_BCMA) selects BCMA_DRIVER_GPIO ... unmet direct
> 	dependencies (BCMA_POSSIBLE && BCMA && GPIOLIB)
> warning: (BCM47XX_SSB) selects SSB_DRIVER_GPIO ... unmet direct
> 	dependencies (SSB_POSSIBLE && SSB && GPIOLIB)
> 
> which subsequently results in compile errors.
> 
> Cc: Hauke Mehrtens <hauke@hauke-m.de>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> Fixing a Kconfig issue in our nightly Jenkins build.
> 
> Gr. AvS

Thanks for spotting and fixing this.

This should also go into 3.8.
This was a missing piece of a fix by Geert Uytterhoeven for an other bug
in Kconfig of bcma and ssb:
https://lkml.org/lkml/2012/12/16/68
https://lkml.org/lkml/2012/12/16/69

Hauke
Sergei Shtylyov - Jan. 5, 2013, 11:33 a.m.
Hello.

On 04-01-2013 22:10, Arend van Spriel wrote:

> The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
> respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
> options depend on GPIOLIB without explicitly selecting it
> so it results in a warning when GPIOLIB is not set:

> scripts/kconfig/conf --oldconfig Kconfig
> warning: (BCM47XX_BCMA) selects BCMA_DRIVER_GPIO ... unmet direct
> 	dependencies (BCMA_POSSIBLE && BCMA && GPIOLIB)
> warning: (BCM47XX_SSB) selects SSB_DRIVER_GPIO ... unmet direct
> 	dependencies (SSB_POSSIBLE && SSB && GPIOLIB)

> which subsequently results in compile errors.

> Cc: Hauke Mehrtens <hauke@hauke-m.de>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> Fixing a Kconfig issue in our nightly Jenkins build.

> Gr. AvS
> ---
>   arch/mips/bcm47xx/Kconfig |    3 +++
>   1 file changed, 3 insertions(+)

> diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
> index d7af29f..ba61192 100644
> --- a/arch/mips/bcm47xx/Kconfig
> +++ b/arch/mips/bcm47xx/Kconfig
> @@ -8,8 +8,10 @@ config BCM47XX_SSB
>   	select SSB_DRIVER_EXTIF
>   	select SSB_EMBEDDED
>   	select SSB_B43_PCI_BRIDGE if PCI
> +	select SSB_DRIVER_PCICORE if PCI

    This change doesn';t seem to be documented in your changelog. Maybe it's 
worth another patch?

WBR, Sergei
Arend van Spriel - Jan. 6, 2013, 9:13 p.m.
On 01/05/2013 12:33 PM, Sergei Shtylyov wrote:
> Hello.
> 
> On 04-01-2013 22:10, Arend van Spriel wrote:
> 
>> The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
>> respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
>> options depend on GPIOLIB without explicitly selecting it
>> so it results in a warning when GPIOLIB is not set:
> 
>> scripts/kconfig/conf --oldconfig Kconfig
>> warning: (BCM47XX_BCMA) selects BCMA_DRIVER_GPIO ... unmet direct
>>     dependencies (BCMA_POSSIBLE && BCMA && GPIOLIB)
>> warning: (BCM47XX_SSB) selects SSB_DRIVER_GPIO ... unmet direct
>>     dependencies (SSB_POSSIBLE && SSB && GPIOLIB)
> 
>> which subsequently results in compile errors.
> 
>> Cc: Hauke Mehrtens <hauke@hauke-m.de>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>> ---
>> Fixing a Kconfig issue in our nightly Jenkins build.
> 
>> Gr. AvS
>> ---
>>   arch/mips/bcm47xx/Kconfig |    3 +++
>>   1 file changed, 3 insertions(+)
> 
>> diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
>> index d7af29f..ba61192 100644
>> --- a/arch/mips/bcm47xx/Kconfig
>> +++ b/arch/mips/bcm47xx/Kconfig
>> @@ -8,8 +8,10 @@ config BCM47XX_SSB
>>       select SSB_DRIVER_EXTIF
>>       select SSB_EMBEDDED
>>       select SSB_B43_PCI_BRIDGE if PCI
>> +    select SSB_DRIVER_PCICORE if PCI
> 
>    This change doesn';t seem to be documented in your changelog. Maybe
> it's worth another patch?
> 
> WBR, Sergei
> 

Very observant. ;-) Yes. After fixing the other ones I got a warning on
that one. I could resubmit the change with a more generic description or
split it up as you suggest.

Ralf,

Please advice.

Gr. AvS
root - Jan. 16, 2013, 2:50 p.m.
On Sun, Jan 06, 2013 at 10:13:56PM +0100, Arend van Spriel wrote:

> >    This change doesn';t seem to be documented in your changelog. Maybe
> > it's worth another patch?
> > 
> > WBR, Sergei
> > 
> 
> Very observant. ;-) Yes. After fixing the other ones I got a warning on
> that one. I could resubmit the change with a more generic description or
> split it up as you suggest.
> 
> Ralf,
> 
> Please advice.

For simplicity's sake I'm going to split this myself BUT putting changes
that are not explained in changelog comments is a good way to get your
dear maintainer grumpy :)

  Ralf
Arend van Spriel - Jan. 17, 2013, 11:07 a.m.
> From: Arend van Spriel [arend@broadcom.com]
> Sent: Friday, January 04, 2013 7:10 PM
> 
> The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
> respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
> options depend on GPIOLIB without explicitly selecting it
> so it results in a warning when GPIOLIB is not set:

Hi Ralf

Are you still intending to take this patch or did it slip by?

Gr. AvS

> scripts/kconfig/conf --oldconfig Kconfig
> warning: (BCM47XX_BCMA) selects BCMA_DRIVER_GPIO ... unmet direct
>         dependencies (BCMA_POSSIBLE && BCMA && GPIOLIB)
> warning: (BCM47XX_SSB) selects SSB_DRIVER_GPIO ... unmet direct
>         dependencies (SSB_POSSIBLE && SSB && GPIOLIB)
> 
> which subsequently results in compile errors.
> 
> Cc: Hauke Mehrtens <hauke@hauke-m.de>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> Fixing a Kconfig issue in our nightly Jenkins build.
> 
> Gr. AvS
> ---
Hauke Mehrtens - Jan. 17, 2013, 12:57 p.m.
On 01/17/2013 12:07 PM, Arend Van Spriel wrote:
>> From: Arend van Spriel [arend@broadcom.com]
>> Sent: Friday, January 04, 2013 7:10 PM
>>
>> The Kconfig items BCM47XX_BCMA and BCM47XX_SSB selected
>> respectively BCMA_DRIVER_GPIO and SSB_DRIVER_GPIO. These
>> options depend on GPIOLIB without explicitly selecting it
>> so it results in a warning when GPIOLIB is not set:
> 
> Hi Ralf
> 
> Are you still intending to take this patch or did it slip by?
> 
> Gr. AvS

This was applied by Ralf in his tree for linux next integration [0] [1].

@Ralf could you please also send these patches to Linus for 3.8.

Hauke

[0]:
http://git.linux-mips.org/?p=ralf/upstream-sfr.git;a=commitdiff;h=a9e985783ed936376de9f27eff54e37d584fb855;hp=3d2d03247632920aa21b42a0b032a4ffd44ce15e
[1]:
http://git.linux-mips.org/?p=ralf/upstream-sfr.git;a=commitdiff;h=b26d9ac76b22f53f1553d63c676dc2e70a8e3157;hp=a9e985783ed936376de9f27eff54e37d584fb855
Arend van Spriel - Jan. 21, 2013, 9:40 a.m.
On 01/16/2013 03:50 PM, Ralf Baechle wrote:
> On Sun, Jan 06, 2013 at 10:13:56PM +0100, Arend van Spriel wrote:
> 
>>>    This change doesn';t seem to be documented in your changelog. Maybe
>>> it's worth another patch?
>>>
>>> WBR, Sergei
>>>
>>
>> Very observant. ;-) Yes. After fixing the other ones I got a warning on
>> that one. I could resubmit the change with a more generic description or
>> split it up as you suggest.
>>
>> Ralf,
>>
>> Please advice.
> 
> For simplicity's sake I'm going to split this myself BUT putting changes
> that are not explained in changelog comments is a good way to get your
> dear maintainer grumpy :)

Thanks, Ralf

Appreciated. Hope you can keep that smile ;-)

Regards,
Arend

>   Ralf
>

Patch

diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
index d7af29f..ba61192 100644
--- a/arch/mips/bcm47xx/Kconfig
+++ b/arch/mips/bcm47xx/Kconfig
@@ -8,8 +8,10 @@  config BCM47XX_SSB
 	select SSB_DRIVER_EXTIF
 	select SSB_EMBEDDED
 	select SSB_B43_PCI_BRIDGE if PCI
+	select SSB_DRIVER_PCICORE if PCI
 	select SSB_PCICORE_HOSTMODE if PCI
 	select SSB_DRIVER_GPIO
+	select GPIOLIB
 	default y
 	help
 	 Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
@@ -25,6 +27,7 @@  config BCM47XX_BCMA
 	select BCMA_HOST_PCI if PCI
 	select BCMA_DRIVER_PCI_HOSTMODE if PCI
 	select BCMA_DRIVER_GPIO
+	select GPIOLIB
 	default y
 	help
 	 Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.