From: Thierry Reding <thierry.reding@avionic-design•de>
To: Arnd Bergmann <arnd.bergmann@linaro•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sascha Hauer <s.hauer@pengutronix•de>
Subject: Re: linux-next: build failure after merge of the final tree (pwm tree related)
Date: Tue, 3 Jul 2012 10:11:38 +0200 [thread overview]
Message-ID: <20120703081138.GA25183@avionic-0098.mockup.avionic-design.de> (raw)
In-Reply-To: <201207030806.49561.arnd.bergmann@linaro.org>
[-- Attachment #1.1: Type: text/plain, Size: 1342 bytes --]
On Tue, Jul 03, 2012 at 08:06:49AM +0000, Arnd Bergmann wrote:
> On Tuesday 03 July 2012, Thierry Reding wrote:
> > On Tue, Jul 03, 2012 at 04:18:46PM +1000, Stephen Rothwell wrote:
> > > Hi Thierry,
> > >
> > > On Tue, 3 Jul 2012 08:11:15 +0200 Thierry Reding <thierry.reding@avionic-design•de> wrote:
> > > >
> > > > I don't see how that can happen. If you have CONFIG_TWL6030_PWM=y, then
> > > > you should also have CONFIG_HAVE_PWM=y, which would in turn conflict
> > > > with CONFIG_PWM=y.
> > > >
> > > > I'll have to fetch a powerpc toolchain and try to reproduce this.
> > >
> > > CONFIG_HAVE_PWM only exists on arm, mips and unicore32 ... so the "select
> > > HAVE_PWM" will not do anything on any other architecture.
> >
> > So one option would be to add HAVE_PWM on powerpc, or alternatively to
> > explicitly add a conflict to the TWL6030_PWM symbol (and any others that
> > implement the legacy API). I'd think the second alternative is
> > preferable and actually matches what Arnd proposed previously. Maybe
> > this was exactly the reason he suggested that solution in the first
> > place.
>
> It's not what I was thinking of explicitly, but it's a good
> reason nonetheless ;-)
I came up with the attached patch. What do you think? It fixes the
PowerPC allyesconfig issue for me.
Thierry
[-- Attachment #1.2: 0001-pwm-Conflict-with-legacy-PWM-API.patch --]
[-- Type: text/plain, Size: 1036 bytes --]
From 33859c48f1c771584312885bc37d14433bd2de7f Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design•de>
Date: Mon, 2 Jul 2012 21:29:45 +0200
Subject: [PATCH] pwm: Conflict with legacy PWM API
In order to avoid duplicate symbols with legacy PWM API implementations,
the new PWM framework needs to conflict with any of the existing legacy
implementations. This can be removed once all legacy implementations
have been moved to the PWM subsystem.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design•de>
---
drivers/pwm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 5227415..6e49f81 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,5 +1,6 @@
menuconfig PWM
bool "PWM Support"
+ depends on !MACH_JZ4740 && !PUV3_NB0916 && !TWL6030_PWM && !AB8500_PWM
help
This enables PWM support through the generic PWM framework.
You only need to enable this, if you also want to enable
--
1.7.11.1
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-07-03 8:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 7:48 linux-next: build failure after merge of the final tree (pwm tree related) Stephen Rothwell
2012-06-30 18:10 ` Thierry Reding
2012-06-30 19:20 ` Arnd Bergmann
2012-06-30 19:41 ` Thierry Reding
2012-06-30 20:12 ` Arnd Bergmann
2012-07-01 6:56 ` Thierry Reding
2012-07-03 5:43 ` Stephen Rothwell
2012-07-03 6:11 ` Thierry Reding
2012-07-03 6:18 ` Stephen Rothwell
2012-07-03 6:23 ` Thierry Reding
2012-07-03 8:06 ` Arnd Bergmann
2012-07-03 8:11 ` Thierry Reding [this message]
2012-07-03 8:59 ` Arnd Bergmann
2012-07-03 10:00 ` Thierry Reding
2012-07-03 11:06 ` Arnd Bergmann
2012-07-03 11:14 ` Thierry Reding
2012-07-03 8:23 ` Geert Uytterhoeven
2012-07-03 9:00 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120703081138.GA25183@avionic-0098.mockup.avionic-design.de \
--to=thierry.reding@avionic-design$(echo .)de \
--cc=arnd.bergmann@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox