linux-next: build failure after merge of the final tree (arm-soc tree related)

Commit Message

Olof Johansson Sept. 17, 2012, 2:11 p.m. UTC

Hi,

On Mon, Sep 17, 2012 at 09:26:15PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/mfd/twl-core.c:49:22: fatal error: plat/cpu.h: No such file or directory
> 
> Caused by commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal").
> 
> I have added the following patch to restrict this driver to ARM until it
> is fixed:
> 
> From: Stephen Rothwell <[e-mail]>
> Date: Mon, 17 Sep 2012 21:18:21 +1000
> Subject: [PATCH] ARM: retrict TWL4030_CORE to ARM while it is broken
> 
> Signed-off-by: Stephen Rothwell <[e-mail]>
> ---
>  drivers/mfd/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index df850c4..af5e5b7 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -257,6 +257,7 @@ config MENELAUS
>  config TWL4030_CORE
>  	bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
>  	depends on I2C=y && GENERIC_HARDIRQS
> +	depends on ARM
>  	select IRQ_DOMAIN
>  	help
>  	  Say yes here if you have TWL4030 / TWL6030 family chip on your board.

Gack. This will break on non-OMAP ARM platforms now too, so it needs to be
depends on ARCH_OMAP instead of ARM.

Tony, can I get an Acked-by so I can apply this to next/cleanup? Sam, if
you prefer to apply it yourself, let me know.


-Olof

From 571a231c7f38b720001e1c7c3d5fb08fe265d03b Mon Sep 17 00:00:00 2001
From: Olof Johansson <[e-mail]>
Date: Mon, 17 Sep 2012 07:05:04 -0700
Subject: [PATCH] MFD: make TWL4030_CORE depend on ARCH_OMAP

It uses OMAP-only header files, and since it's an OMAP companion chip
it doesn't really make sense to enable on other platforms.

Signed-off-by: Olof Johansson <[e-mail]>
---
 drivers/mfd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren Sept. 17, 2012, 5:23 p.m. UTC | #1

* Olof Johansson <[e-mail]> [120917 07:12]:
> Hi,
> 
> On Mon, Sep 17, 2012 at 09:26:15PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/mfd/twl-core.c:49:22: fatal error: plat/cpu.h: No such file or directory
> > 
> > Caused by commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal").
> > 
> > I have added the following patch to restrict this driver to ARM until it
> > is fixed:
> > 
> > From: Stephen Rothwell <[e-mail]>
> > Date: Mon, 17 Sep 2012 21:18:21 +1000
> > Subject: [PATCH] ARM: retrict TWL4030_CORE to ARM while it is broken
> > 
> > Signed-off-by: Stephen Rothwell <[e-mail]>
> > ---
> >  drivers/mfd/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> > index df850c4..af5e5b7 100644
> > --- a/drivers/mfd/Kconfig
> > +++ b/drivers/mfd/Kconfig
> > @@ -257,6 +257,7 @@ config MENELAUS
> >  config TWL4030_CORE
> >  	bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
> >  	depends on I2C=y && GENERIC_HARDIRQS
> > +	depends on ARM
> >  	select IRQ_DOMAIN
> >  	help
> >  	  Say yes here if you have TWL4030 / TWL6030 family chip on your board.
> 
> Gack. This will break on non-OMAP ARM platforms now too, so it needs to be
> depends on ARCH_OMAP instead of ARM.
> 
> Tony, can I get an Acked-by so I can apply this to next/cleanup? Sam, if
> you prefer to apply it yourself, let me know.

Sorry about this, this driver should work with other SoCs too, not just
ARM. I'll post a better fix until the cpu_is_omap usage is removed.

Regards,

Tony

Patch

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b1a1462..d48083b 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -256,7 +256,7 @@  config MENELAUS
 
 config TWL4030_CORE
 	bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
-	depends on I2C=y && GENERIC_HARDIRQS
+	depends on I2C=y && GENERIC_HARDIRQS && ARCH_OMAP
 	select IRQ_DOMAIN
 	help
 	  Say yes here if you have TWL4030 / TWL6030 family chip on your board.