From: ryan@bluewatersys.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] SPEAR3xx: Rename register/irq defines to remove naming conflicts
Date: Mon, 14 Jun 2010 17:36:28 +1200 [thread overview]
Message-ID: <4C15BFDC.70809@bluewatersys.com> (raw)
In-Reply-To: <4C15BB99.4060108@st.com>
Viresh KUMAR wrote:
> On 6/5/2010 11:35 AM, Ryan Mallon wrote:
>> Prefix register and irq defintions to remove naming conflicts between
>> the three SPEAr3xx platforms.
>>
>> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
>> ---
>> arch/arm/mach-spear3xx/include/mach/generic.h | 4 +-
>> arch/arm/mach-spear3xx/include/mach/irqs.h | 195 ++++++++++++------------
>> arch/arm/mach-spear3xx/include/mach/spear300.h | 26 ++--
>> arch/arm/mach-spear3xx/include/mach/spear310.h | 44 +++---
>> arch/arm/mach-spear3xx/include/mach/spear320.h | 50 +++---
>> arch/arm/mach-spear3xx/spear300.c | 65 ++++----
>> arch/arm/mach-spear3xx/spear310.c | 92 ++++++------
>> arch/arm/mach-spear3xx/spear320.c | 134 ++++++++--------
>> arch/arm/mach-spear3xx/spear3xx.c | 4 +-
>> 9 files changed, 308 insertions(+), 306 deletions(-)
>>
>> diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h
>> index af7e02c..48dfb9c 100644
>> --- a/arch/arm/mach-spear3xx/include/mach/generic.h
>> +++ b/arch/arm/mach-spear3xx/include/mach/generic.h
>> @@ -27,8 +27,8 @@
>> * Following GPT channels will be used as clock source and clockevent
>> */
>> #define SPEAR_GPT0_BASE SPEAR3XX_ML1_TMR_BASE
>> -#define SPEAR_GPT0_CHAN0_IRQ IRQ_CPU_GPT1_1
>> -#define SPEAR_GPT0_CHAN1_IRQ IRQ_CPU_GPT1_2
>> +#define SPEAR_GPT0_CHAN0_IRQ SPEAR3XX_IRQ_CPU_GPT1_1
>> +#define SPEAR_GPT0_CHAN1_IRQ SPEAR3XX_IRQ_CPU_GPT1_2
>>
<snip>
>
> We have kept it, the way it was intentionally. I don't understand why any
> conflicts will occur.
The goal of the patch series is to allow all a single kernel to have
support for all of the spear platforms, ie CONFIG_MACH_SPEAR300,
CONFIG_MACH_SPEAR310 and CONFIG_MACH_SPEAR320 can all be set.
The current code has duplicate defines in
arch/arm/mach-spear3xx/include/mach/spear3[012]0.h which means that
these three files cannot be included at once (they are included from
arch/arm/mach-spear3xx/include/mach/spear.h).
~Ryan
next prev parent reply other threads:[~2010-06-14 5:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 6:05 [PATCH 0/5] SPEAr3xx: Unify build of SPEAr3xx platforms Ryan Mallon
2010-06-05 6:05 ` [PATCH 1/5] SPEAr3xx: Make local structres static Ryan Mallon
2010-06-14 5:16 ` Viresh KUMAR
2010-06-14 5:31 ` Ryan Mallon
2010-06-14 5:41 ` Viresh KUMAR
2010-06-05 6:05 ` [PATCH 2/5] SPEAR3xx: Rename register/irq defines to remove naming conflicts Ryan Mallon
2010-06-14 5:18 ` Viresh KUMAR
2010-06-14 5:36 ` Ryan Mallon [this message]
2010-06-14 5:46 ` Viresh KUMAR
2010-06-14 10:17 ` Ryan Mallon
2010-08-10 5:12 ` viresh kumar
2010-08-10 20:50 ` Ryan Mallon
2010-08-11 9:14 ` viresh kumar
2010-08-11 20:43 ` Ryan Mallon
2010-08-12 4:40 ` viresh kumar
2010-06-05 6:05 ` [PATCH 3/5] SPEAr3xx: Rework pmx_dev code to remove conflicts Ryan Mallon
2010-06-14 5:21 ` Viresh KUMAR
2010-06-05 6:05 ` [PATCH 4/5] SPEAr3xx: Rework KConfig to allow all boards to be compiled in Ryan Mallon
2010-06-05 6:05 ` [PATCH 5/5] SPEAr3xx: Replace defconfigs with single unfied defconfig Ryan Mallon
2010-06-13 22:51 ` [PATCH 0/5] SPEAr3xx: Unify build of SPEAr3xx platforms Ryan Mallon
2010-06-15 5:32 ` Viresh KUMAR
2010-06-15 6:49 ` Ryan Mallon
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=4C15BFDC.70809@bluewatersys.com \
--to=ryan@bluewatersys.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).