* linux-next: build failure after merge of the final tree (arm-soc tree related)
@ 2012-09-17 11:26 Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
2012-09-17 14:29 ` Arnd Bergmann
0 siblings, 2 replies; 14+ messages in thread
From: Stephen Rothwell @ 2012-09-17 11:26 UTC (permalink / raw)
To: linux-arm-kernel
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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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.
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120917/4435ad6a/attachment.sig>
^ permalink raw reply related [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-09-17 11:26 linux-next: build failure after merge of the final tree (arm-soc tree related) Stephen Rothwell
@ 2012-09-17 14:11 ` Olof Johansson
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 14:29 ` Arnd Bergmann
1 sibling, 1 reply; 14+ messages in thread
From: Olof Johansson @ 2012-09-17 14:11 UTC (permalink / raw)
To: linux-arm-kernel
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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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 <olof@lixom.net>
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 <olof@lixom.net>
---
drivers/mfd/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
--
1.7.10.1.488.g05fbf7a
^ permalink raw reply related [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-09-17 14:11 ` Olof Johansson
@ 2012-09-17 17:23 ` Tony Lindgren
0 siblings, 0 replies; 14+ messages in thread
From: Tony Lindgren @ 2012-09-17 17:23 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> > 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-09-17 11:26 linux-next: build failure after merge of the final tree (arm-soc tree related) Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
@ 2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 17:22 ` Tony Lindgren
1 sibling, 1 reply; 14+ messages in thread
From: Arnd Bergmann @ 2012-09-17 14:29 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 17 September 2012, Stephen Rothwell wrote:
> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
Thanks!
If it requires plat/cpu.h, it should actually be limited to CONFIG_ARCH_OMAP,
otherwise we will get the same problem on non-OMAP ARM builds. From what
I can tell, the problem is the clocks_init function, which is the only
part that is not completely generic.
The trivial workaround would be to enclose the "#include <plat/cpu.h>"
statement in #ifdef CONFIG_ARCH_OMAP, but with the common clock code
in place, we should probably be able to come up with a better solution
that works independent of the omap platform.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-09-17 14:29 ` Arnd Bergmann
@ 2012-09-17 17:22 ` Tony Lindgren
2012-09-17 20:32 ` Tony Lindgren
0 siblings, 1 reply; 14+ messages in thread
From: Tony Lindgren @ 2012-09-17 17:22 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [120917 07:30]:
> On Monday 17 September 2012, Stephen Rothwell wrote:
> > 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").
Oops, sorry I screwed up there. That used to get included indirectly
earlier if SPARSE_IRQ was not set.
> > I have added the following patch to restrict this driver to ARM until it
> > is fixed:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
>
> Thanks!
>
> If it requires plat/cpu.h, it should actually be limited to CONFIG_ARCH_OMAP,
> otherwise we will get the same problem on non-OMAP ARM builds. From what
> I can tell, the problem is the clocks_init function, which is the only
> part that is not completely generic.
>
> The trivial workaround would be to enclose the "#include <plat/cpu.h>"
> statement in #ifdef CONFIG_ARCH_OMAP, but with the common clock code
> in place, we should probably be able to come up with a better solution
> that works independent of the omap platform.
There are patches coming to remove cpu_is_omap usage from drivers,
and until then we should just ifdef the plat/cpu.h include.
It is possible to use these kind of external PM chips with other
SoCs, they're just not omap related and that's why there drivers
have not had the Kconfig dependency. I'll post a patch for that.
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-09-17 17:22 ` Tony Lindgren
@ 2012-09-17 20:32 ` Tony Lindgren
0 siblings, 0 replies; 14+ messages in thread
From: Tony Lindgren @ 2012-09-17 20:32 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120917 10:25]:
> * Arnd Bergmann <arnd@arndb.de> [120917 07:30]:
> >
> > If it requires plat/cpu.h, it should actually be limited to CONFIG_ARCH_OMAP,
> > otherwise we will get the same problem on non-OMAP ARM builds. From what
> > I can tell, the problem is the clocks_init function, which is the only
> > part that is not completely generic.
> >
> > The trivial workaround would be to enclose the "#include <plat/cpu.h>"
> > statement in #ifdef CONFIG_ARCH_OMAP, but with the common clock code
> > in place, we should probably be able to come up with a better solution
> > that works independent of the omap platform.
>
> There are patches coming to remove cpu_is_omap usage from drivers,
> and until then we should just ifdef the plat/cpu.h include.
>
> It is possible to use these kind of external PM chips with other
> SoCs, they're just not omap related and that's why there drivers
> have not had the Kconfig dependency. I'll post a patch for that.
Looks like we can just remove the cpu_is_omap code with clock
aliases, patch posted with Subject:
[PATCH] mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: build failure after merge of the final tree (arm-soc tree related)
@ 2012-03-14 23:59 Stephen Rothwell
2012-03-15 0:20 ` Jason Cooper
2012-03-15 1:53 ` Paul Gortmaker
0 siblings, 2 replies; 14+ messages in thread
From: Stephen Rothwell @ 2012-03-14 23:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
After merging the final tree, today's linux-next build (powerpc
allmodconfig) failed like this:
drivers/ata/sata_mv.c:4185:1: error: '__mod_of_device_table' aliased to undefined symbol 'mvsdio_dt_ids'
Caused by commit f1e1e148c5cb ("ARM: kirkwood: sata_mv: add device tree
binding").
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/df18df76/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-14 23:59 Stephen Rothwell
@ 2012-03-15 0:20 ` Jason Cooper
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 1:53 ` Paul Gortmaker
1 sibling, 2 replies; 14+ messages in thread
From: Jason Cooper @ 2012-03-15 0:20 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 15, 2012 at 10:59:01AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allmodconfig) failed like this:
>
> drivers/ata/sata_mv.c:4185:1: error: '__mod_of_device_table' aliased to undefined symbol 'mvsdio_dt_ids'
>
> Caused by commit f1e1e148c5cb ("ARM: kirkwood: sata_mv: add device tree
> binding").
Stephen,
That's my mistake. I did a pull request for the wrong branch. Olof,
could you please drop the offending branch and I'll submit a new pull
request once I have a chance to test Arnd's irq patch?
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-15 0:20 ` Jason Cooper
@ 2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 16:39 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: Stephen Rothwell @ 2012-03-15 2:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
On Wed, 14 Mar 2012 20:20:20 -0400 Jason Cooper <jason@lakedaemon.net> wrote:
>
> On Thu, Mar 15, 2012 at 10:59:01AM +1100, Stephen Rothwell wrote:
> >
> > After merging the final tree, today's linux-next build (powerpc
> > allmodconfig) failed like this:
> >
> > drivers/ata/sata_mv.c:4185:1: error: '__mod_of_device_table' aliased to undefined symbol 'mvsdio_dt_ids'
> >
> > Caused by commit f1e1e148c5cb ("ARM: kirkwood: sata_mv: add device tree
> > binding").
>
> That's my mistake. I did a pull request for the wrong branch. Olof,
> could you please drop the offending branch and I'll submit a new pull
> request once I have a chance to test Arnd's irq patch?
I will revert that commit today.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/f3215000/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-15 0:20 ` Jason Cooper
2012-03-15 2:08 ` Stephen Rothwell
@ 2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 17:22 ` Jason Cooper
1 sibling, 1 reply; 14+ messages in thread
From: Arnd Bergmann @ 2012-03-15 16:39 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 15 March 2012, Jason Cooper wrote:
> That's my mistake. I did a pull request for the wrong branch. Olof,
> could you please drop the offending branch and I'll submit a new pull
> request once I have a chance to test Arnd's irq patch?
I reverted this in the for-next branch for now. The two initial patches
from the kirkwood/board branch are still present.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-15 16:39 ` Arnd Bergmann
@ 2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:32 ` Arnd Bergmann
0 siblings, 1 reply; 14+ messages in thread
From: Jason Cooper @ 2012-03-15 17:22 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 15, 2012 at 04:39:38PM +0000, Arnd Bergmann wrote:
> On Thursday 15 March 2012, Jason Cooper wrote:
> > That's my mistake. I did a pull request for the wrong branch. Olof,
> > could you please drop the offending branch and I'll submit a new pull
> > request once I have a chance to test Arnd's irq patch?
>
> I reverted this in the for-next branch for now. The two initial patches
> from the kirkwood/board branch are still present.
Okay, thanks. I've rebased onto next/boards and merged the
depends/irqdomain branch. I'm making progress, but not finished yet.
How is a pull-request done in the above scenario? is my merge commit
included in the series? what is the pull-request based on?
next/boards, or depends/irqdomain?
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-15 17:22 ` Jason Cooper
@ 2012-03-15 17:32 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-03-15 17:32 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 15 March 2012, Jason Cooper wrote:
> On Thu, Mar 15, 2012 at 04:39:38PM +0000, Arnd Bergmann wrote:
> > On Thursday 15 March 2012, Jason Cooper wrote:
> > > That's my mistake. I did a pull request for the wrong branch. Olof,
> > > could you please drop the offending branch and I'll submit a new pull
> > > request once I have a chance to test Arnd's irq patch?
> >
> > I reverted this in the for-next branch for now. The two initial patches
> > from the kirkwood/board branch are still present.
>
> Okay, thanks. I've rebased onto next/boards and merged the
> depends/irqdomain branch. I'm making progress, but not finished yet.
Ok. I hope we can still make it for v3.4, but I think it won't be
much of a problem if not -- it will get merged into linux-next
just after v3.4-rc1 in case we don't make it, and then you have
plenty of time to improve it further.
> How is a pull-request done in the above scenario? is my merge commit
> included in the series? what is the pull-request based on?
> next/boards, or depends/irqdomain?
You should base it on depends/irqdomain.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: build failure after merge of the final tree (arm-soc tree related)
2012-03-14 23:59 Stephen Rothwell
2012-03-15 0:20 ` Jason Cooper
@ 2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 2:05 ` Stephen Rothwell
1 sibling, 1 reply; 14+ messages in thread
From: Paul Gortmaker @ 2012-03-15 1:53 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 14, 2012 at 7:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allmodconfig) failed like this:
>
> drivers/ata/sata_mv.c:4185:1: error: '__mod_of_device_table' aliased to undefined symbol 'mvsdio_dt_ids'
>
> Caused by commit f1e1e148c5cb ("ARM: kirkwood: sata_mv: add device tree
> binding").
Looks like the same thing I reported in yesterday's triage that was
screwing sparc:
http://www.spinics.net/lists/sparclinux/msg09199.html
Odd that it only started screwing powerpc today though.
Paul.
--
> --
> Cheers,
> Stephen Rothwell ? ? ? ? ? ? ? ? ? ?sfr at canb.auug.org.au
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-09-17 20:32 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 11:26 linux-next: build failure after merge of the final tree (arm-soc tree related) Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 17:22 ` Tony Lindgren
2012-09-17 20:32 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 23:59 Stephen Rothwell
2012-03-15 0:20 ` Jason Cooper
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:32 ` Arnd Bergmann
2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 2:05 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).